Merge branch 'main' into bidir-test

.github/actions/setup-dependencies/action.yml

@@ -24,17 +24,26 @@ runs:
       shell: bash
       if: runner.os == 'macOS'
 
-    # Python3 is already installed though Homebrew
     - name: Install brew dependencies
-      run: brew install ruby node php lmdb mcpp || true
+      run: brew install node php lmdb mcpp || true
       shell: bash
       if: runner.os == 'macOS'
 
-    - name: Add Ruby and Python interpreters from brew to PATH
-      run: |
-        echo "$(brew --prefix ruby)/bin" >> $GITHUB_PATH
-        echo "$(brew --prefix python3)/bin" >> $GITHUB_PATH
-      shell: bash
+    # - name: Add Ruby and Python interpreters from brew to PATH
+    #   run: |
+    #     echo "$(brew --prefix ruby)/bin" >> $GITHUB_PATH
+    #     echo "$(brew --prefix python3)/bin" >> $GITHUB_PATH
+    #   shell: bash
+    #   if: runner.os == 'macOS'
+
+    - uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+      if: runner.os == 'macOS'
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "3.3"
       if: runner.os == 'macOS'
 
     - name: Install testing dependencies from pip

.github/workflows/docs.yml

@@ -10,7 +10,6 @@ on:
 
 jobs:
   ci:
-
     runs-on: macos-15
     steps:
       - name: Checkout repository
@@ -27,9 +26,6 @@ jobs:
       - name: Install doxygen and graphviz (a dependency of Doxygen for generating diagrams)
         run: brew install doxygen graphviz || true
 
-      - name: Install virtualenv for Python
-        run: pipx install virtualenv
-
       - name: Install docfx for C# API reference
         run: brew install docfx
 
@@ -66,11 +62,8 @@ jobs:
         run: |
           make -C ../../cpp slice2py Ice IceDiscovery IceLocatorDiscovery
           make -C ../
-          virtualenv .venv
-          source .venv/bin/activate
           pip install -r requirements.txt
           make html
-          deactivate
 
       - name: Generate API reference for Swift
         run: |

cpp/include/DataStorm/Config.h

@@ -0,0 +1,26 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef DATASTORM_CONFIG_H
+#define DATASTORM_CONFIG_H
+
+#include "Ice/Config.h"
+
+#if !defined(ICE_BUILDING_DATASTORM) && defined(DATASTORM_API_EXPORTS)
+#    define ICE_BUILDING_DATASTORM
+#endif
+
+#if defined(_MSC_VER) && !defined(ICE_BUILDING_DATASTORM)
+#    pragma comment(lib, ICE_LIBNAME("DataStorm")) // Automatically link with DataStorm[D].lib
+#endif
+
+#ifndef DATASTORM_API
+#    if defined(DATASTORM_API_EXPORTS)
+#        define DATASTORM_API ICE_DECLSPEC_EXPORT
+#    else
+#        define DATASTORM_API ICE_DECLSPEC_IMPORT
+#    endif
+#endif
+
+#endif