Add multi-platform build support for x86_64 and ARM64

SercanKaraoglu · SercanKaraoglu · commit e7180471b814 · 2025-10-25T00:20:49.000+02:00
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
@@ -71,8 +71,8 @@ jobs:
           path: mock-trading-server/target/release/mock-trading-server
           retention-days: 7
 
-  cpp-client:
-    name: Build C++ Client
+  cpp-client-linux:
+    name: Build C++ Client (Linux)
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -100,10 +100,52 @@ jobs:
       - name: Upload binary
         uses: actions/upload-artifact@v4
         with:
-          name: cpp-client-binary
+          name: cpp-client-linux-binary
           path: cpp-client/build/*
           retention-days: 7
 
+  cpp-client-windows:
+    name: Build C++ Client (Windows)
+    runs-on: windows-latest
+    defaults:
+      run:
+        working-directory: cpp-client
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+      
+      - name: Setup vcpkg
+        run: |
+          git clone https://github.com/Microsoft/vcpkg.git ../vcpkg
+          cd ../vcpkg
+          .\bootstrap-vcpkg.bat
+          .\vcpkg integrate install
+      
+      - name: Install dependencies (static)
+        run: |
+          cd ../vcpkg
+          .\vcpkg install openssl:x64-windows-static zlib:x64-windows-static
+      
+      - name: Configure CMake
+        shell: bash
+        run: |
+          cmake -B build \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \
+            -DVCPKG_TARGET_TRIPLET=x64-windows-static
+      
+      - name: Build (static linking)
+        run: cmake --build build --config Release
+      
+      - name: Upload binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: cpp-client-windows-binary
+          path: cpp-client/build/Release/hft_client.exe
+          retention-days: 7
+
   cdk-infrastructure:
     name: Build CDK Infrastructure
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -186,51 +186,152 @@ jobs:
           name: rust-windows
           path: mock-trading-server-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.exe
 
-  build-cpp:
-    name: Build C++ Client
+  build-cpp-linux:
+    name: Build C++ Client (Linux)
     runs-on: ubuntu-latest
-    container: public.ecr.aws/amazonlinux/amazonlinux:2023
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+            platform: linux/amd64
+            container: public.ecr.aws/amazonlinux/amazonlinux:2023
+          - arch: aarch64
+            platform: linux/arm64
+            container: public.ecr.aws/amazonlinux/amazonlinux:2023
     steps:
-      - name: Install build tools
-        run: |
-          yum install -y gcc-c++ make git tar gzip boost-devel openssl-devel python3-pip zlib-devel
-          # Install newer CMake (AL2023 has 3.22, but we need 3.27+)
-          pip3 install cmake --upgrade
-          # Ensure cmake from pip is in PATH
-          export PATH="/usr/local/bin:$HOME/.local/bin:$PATH"
-          echo "/usr/local/bin" >> $GITHUB_PATH
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-          cmake --version
+      - name: Set up QEMU
+        if: matrix.arch == 'aarch64'
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+      
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+      
+      - name: Get version
+        id: get_version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
       
+      - name: Build in container
+        run: |
+          docker run --rm --platform ${{ matrix.platform }} \
+            -v ${{ github.workspace }}:/workspace \
+            -w /workspace \
+            ${{ matrix.container }} \
+            bash -c '
+              yum install -y gcc-c++ make git tar gzip openssl-devel python3-pip zlib-devel
+              pip3 install cmake --upgrade
+              export PATH="/usr/local/bin:$HOME/.local/bin:$PATH"
+              cd cpp-client
+              cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+              cmake --build build --config Release
+              cd build
+              tar -czf ../../cpp-client-${{ steps.get_version.outputs.VERSION }}-linux-${{ matrix.arch }}.tar.gz hft_client
+            '
+      
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cpp-linux-${{ matrix.arch }}
+          path: cpp-client-${{ steps.get_version.outputs.VERSION }}-linux-${{ matrix.arch }}.tar.gz
+
+  build-cpp-macos:
+    name: Build C++ Client (macOS)
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: macos-13
+            arch: x86_64
+          - os: macos-14
+            arch: arm64
+    steps:
       - name: Checkout code
         uses: actions/checkout@v5
         with:
           submodules: recursive
       
+      - name: Install dependencies
+        run: |
+          brew install cmake openssl@3
+      
       - name: Get version
         id: get_version
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
       
       - name: Build
         working-directory: cpp-client
         run: |
-          cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+          export OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)
+          cmake -B build \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DOPENSSL_ROOT_DIR=$OPENSSL_ROOT_DIR
           cmake --build build --config Release
       
       - name: Create tarball
         run: |
           cd cpp-client/build
-          tar -czf ../../cpp-client-${{ steps.get_version.outputs.VERSION }}.tar.gz .
+          tar -czf ../../cpp-client-${{ steps.get_version.outputs.VERSION }}-macos-${{ matrix.arch }}.tar.gz hft_client
+      
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cpp-macos-${{ matrix.arch }}
+          path: cpp-client-${{ steps.get_version.outputs.VERSION }}-macos-${{ matrix.arch }}.tar.gz
+
+  build-cpp-windows:
+    name: Build C++ Client (Windows)
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+      
+      - name: Setup vcpkg
+        run: |
+          git clone https://github.com/Microsoft/vcpkg.git
+          cd vcpkg
+          .\bootstrap-vcpkg.bat
+          .\vcpkg integrate install
+      
+      - name: Install dependencies (static)
+        run: |
+          cd vcpkg
+          .\vcpkg install openssl:x64-windows-static zlib:x64-windows-static
+      
+      - name: Get version
+        id: get_version
+        shell: bash
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
       
-      - name: Upload tarball
+      - name: Build (static linking)
+        shell: bash
+        working-directory: cpp-client
+        run: |
+          cmake -B build \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \
+            -DVCPKG_TARGET_TRIPLET=x64-windows-static
+          cmake --build build --config Release
+      
+      - name: Create archive
+        shell: bash
+        run: |
+          cd cpp-client/build/Release
+          7z a ../../../cpp-client-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.zip hft_client.exe
+      
+      - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: cpp-client
-          path: cpp-client-${{ steps.get_version.outputs.VERSION }}.tar.gz
+          name: cpp-windows-x86_64
+          path: cpp-client-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.zip
 
   create-release:
     name: Create GitHub Release
-    needs: [build-java, build-rust-linux, build-rust-macos, build-rust-windows, build-cpp]
+    needs: [build-java, build-rust-linux, build-rust-macos, build-rust-windows, build-cpp-linux, build-cpp-macos, build-cpp-windows]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -284,8 +385,8 @@ jobs:
           ### 📦 Components
           
           - **Java Trading Client** - ✅ Cross-platform (all architectures)
-          - **Rust Mock Server** - ✅ Linux (x86_64 & ARM64), macOS (Intel & Apple Silicon), Windows
-          - **C++ Client** - ✅ Linux x86_64
+          - **Rust Mock Server** - ✅ Linux (x86_64 & ARM64/Graviton), macOS (Intel & Apple Silicon), Windows
+          - **C++ Client** - ✅ Multi-platform: Linux (x86_64 & ARM64/Graviton), macOS (Intel & Apple Silicon), Windows
           - **Configuration Samples** - 📝 All config files with documentation
           
           ### 🚀 Quick Start
@@ -300,6 +401,33 @@ jobs:
           java -jar ExchangeFlow-${{ steps.get_version.outputs.VERSION }}.jar
           \`\`\`
           
+          **C++ Client (choose your platform):**
+          - **Linux x86_64:** 
+            \`\`\`bash
+            tar -xzf cpp-client-${{ steps.get_version.outputs.VERSION }}-linux-x86_64.tar.gz
+            ./hft_client
+            \`\`\`
+          - **Linux ARM64 (Graviton2/3/4):** 
+            \`\`\`bash
+            tar -xzf cpp-client-${{ steps.get_version.outputs.VERSION }}-linux-aarch64.tar.gz
+            ./hft_client
+            \`\`\`
+          - **macOS Intel:** 
+            \`\`\`bash
+            tar -xzf cpp-client-${{ steps.get_version.outputs.VERSION }}-macos-x86_64.tar.gz
+            ./hft_client
+            \`\`\`
+          - **macOS Apple Silicon:** 
+            \`\`\`bash
+            tar -xzf cpp-client-${{ steps.get_version.outputs.VERSION }}-macos-arm64.tar.gz
+            ./hft_client
+            \`\`\`
+          - **Windows:** 
+            \`\`\`powershell
+            Expand-Archive cpp-client-${{ steps.get_version.outputs.VERSION }}-windows-x86_64.zip
+            .\\hft_client.exe
+            \`\`\`
+          
           **Rust Server (choose your platform):**
           - **Linux x86_64:** \`./mock-trading-server-${{ steps.get_version.outputs.VERSION }}-linux-x86_64\`
           - **Linux ARM64 (Graviton):** \`./mock-trading-server-${{ steps.get_version.outputs.VERSION }}-linux-aarch64\`
diff --git a/cpp-client/CMakeLists.txt b/cpp-client/CMakeLists.txt
@@ -4,13 +4,38 @@ project(hft_client)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Set minimum policy version to allow older CMake syntax in dependencies
+set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+
+# Define ASIO_STANDALONE globally BEFORE fetching any dependencies
+# This ensures WebSocket++ uses standalone ASIO instead of Boost.Asio
+add_compile_definitions(ASIO_STANDALONE)
+
+# Force WebSocket++ to use C++11 standard library instead of Boost
+# This prevents WebSocket++ from trying to include boost headers
+add_compile_definitions(_WEBSOCKETPP_CPP11_RANDOM_DEVICE_)
+add_compile_definitions(_WEBSOCKETPP_CPP11_TYPE_TRAITS_)
+add_compile_definitions(_WEBSOCKETPP_CPP11_FUNCTIONAL_)
+add_compile_definitions(_WEBSOCKETPP_CPP11_SYSTEM_ERROR_)
+add_compile_definitions(_WEBSOCKETPP_CPP11_MEMORY_)
+
+# Windows-specific: Fix byte ambiguity between Windows SDK and std::byte
+if(WIN32)
+  add_compile_definitions(_HAS_STD_BYTE=0)
+endif()
+
 # Include FetchContent
 include(FetchContent)
 
-# Find Boost
-find_package(Boost 1.74.0 REQUIRED COMPONENTS system)
+# Fetch standalone ASIO (replaces Boost.Asio to avoid version compatibility issues)
+FetchContent_Declare(
+    asio
+    GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
+    GIT_TAG asio-1-30-2
+)
+FetchContent_MakeAvailable(asio)
 
-# Fetch WebSocket++
+# Fetch WebSocket++ (configured to use standalone ASIO via ASIO_STANDALONE definition)
 FetchContent_Declare(
     websocketpp
     GIT_REPOSITORY https://github.com/zaphoyd/websocketpp.git
@@ -50,26 +75,42 @@ add_executable(${PROJECT_NAME}
     Logger.h
 )
 
+# Add Windows resource file with version information
+if(WIN32)
+    target_sources(${PROJECT_NAME} PRIVATE hft_client.rc)
+endif()
+
 # Set include directories for the target
 target_include_directories(${PROJECT_NAME}
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${websocketpp_SOURCE_DIR}
+    ${asio_SOURCE_DIR}/asio/include
     ${OPENSSL_INCLUDE_DIR}
     ${hdr_histogram_SOURCE_DIR}/src
     ${hdr_histogram_SOURCE_DIR}/include
-    ${Boost_INCLUDE_DIRS}
 )
 
-# Link libraries
+# Define ASIO_STANDALONE to use standalone ASIO instead of Boost.Asio
+# Force WebSocket++ to use C++11 standard library instead of Boost
+target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+    ASIO_STANDALONE
+    _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
+    _WEBSOCKETPP_CPP11_TYPE_TRAITS_
+    _WEBSOCKETPP_CPP11_FUNCTIONAL_
+    _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+    _WEBSOCKETPP_CPP11_MEMORY_
+)
+
+# Link libraries (no Boost needed with standalone ASIO)
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
     OpenSSL::SSL
     OpenSSL::Crypto
     hdr_histogram_static
     nlohmann_json::nlohmann_json
-    Boost::system
 )
 
 # Additional compiler warnings
diff --git a/cpp-client/ExchangeClient.cpp b/cpp-client/ExchangeClient.cpp
@@ -108,11 +108,11 @@ void ExchangeClient::disconnect() {
     }
 }
 
-std::shared_ptr<boost::asio::ssl::context> ExchangeClient::tls_init_handler() {
-    std::shared_ptr<boost::asio::ssl::context> ctx = std::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv12_client);
+std::shared_ptr<asio::ssl::context> ExchangeClient::tls_init_handler() {
+    std::shared_ptr<asio::ssl::context> ctx = std::make_shared<asio::ssl::context>(asio::ssl::context::tlsv12_client);
     try {
-        boost::system::error_code ec;
-        ctx->set_options(boost::asio::ssl::context::default_workarounds, ec);
+        asio::error_code ec;
+        ctx->set_options(asio::ssl::context::default_workarounds, ec);
         if (ec) {
             std::cout << "Error setting SSL options: " << ec.message() << std::endl;
         }
@@ -140,4 +140,4 @@ void ExchangeClient::addBalances(const std::string& qt) {
     } catch (const std::exception& e) {
         logger("Error: " + std::string(e.what()));
     }
-}
+}
diff --git a/cpp-client/ExchangeClient.h b/cpp-client/ExchangeClient.h
diff --git a/cpp-client/hft_client.rc b/cpp-client/hft_client.rc

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,11 @@ void ExchangeClient::disconnect() {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`-std::shared_ptr<boost::asio::ssl::context> ExchangeClient::tls_init_handler() {`
`112`		`- std::shared_ptr<boost::asio::ssl::context> ctx = std::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv12_client);`
	`111`	`+std::shared_ptr<asio::ssl::context> ExchangeClient::tls_init_handler() {`
	`112`	`+ std::shared_ptr<asio::ssl::context> ctx = std::make_shared<asio::ssl::context>(asio::ssl::context::tlsv12_client);`
`113`	`113`	`try {`
`114`		`- boost::system::error_code ec;`
`115`		`- ctx->set_options(boost::asio::ssl::context::default_workarounds, ec);`
	`114`	`+ asio::error_code ec;`
	`115`	`+ ctx->set_options(asio::ssl::context::default_workarounds, ec);`
`116`	`116`	`if (ec) {`
`117`	`117`	`std::cout << "Error setting SSL options: " << ec.message() << std::endl;`
`118`	`118`	`}`
`@@ -140,4 +140,4 @@ void ExchangeClient::addBalances(const std::string& qt) {`
`140`	`140`	`} catch (const std::exception& e) {`
`141`	`141`	`logger("Error: " + std::string(e.what()));`
`142`	`142`	`}`
`143`		`-}`
	`143`	`+}`