windows support

Author: danielsn

.github/workflows/test.yml

@@ -257,6 +257,12 @@ jobs:
         run: |
           cd examples/cxx
           .\build-and-run-crashinfo.ps1
+      - name: "Test building CXX bindings - Profiling (Windows)"
+        shell: pwsh
+        if: matrix.platform == 'windows-latest'
+        run: |
+          cd examples/cxx
+          .\build-profiling.ps1
 
   cross-centos7:
     name: build and test using cross - on centos7

.gitignore

@@ -25,5 +25,7 @@ docker-sync.yml
 libtest.so
 libtest_cpp.so
 examples/cxx/crashinfo
+examples/cxx/crashinfo.exe
 examples/cxx/profiling
+examples/cxx/profiling.exe
 profile.pprof

examples/cxx/README.md

@@ -48,10 +48,17 @@ Windows:
 Demonstrates building profiling data using the CXX bindings for `libdd-profiling`.
 
 **Build and run:**
+
+Unix (Linux/macOS):
 ```bash
 ./build-profiling.sh
 ```
 
+Windows:
+```powershell
+.\build-profiling.ps1
+```
+
 **Key features:**
 - Type-safe API for building profiles
 - Support for samples, locations, mappings, and labels
@@ -61,6 +68,17 @@ Demonstrates building profiling data using the CXX bindings for `libdd-profiling
 - Exception-based error handling
 - Modern C++20 syntax with designated initializers and `std::format`
 
+## Build Scripts
+
+The examples use a consolidated build system:
+
+- **Unix (Linux/macOS)**: `build-and-run.sh <crate-name> <example-name>`
+- **Windows**: `build-and-run.ps1 -CrateName <crate-name> -ExampleName <example-name>`
+
+Convenience wrappers are provided for each example:
+- `build-and-run-crashinfo.sh` / `build-and-run-crashinfo.ps1`
+- `build-profiling.sh` / `build-profiling.ps1`
+
 ## Requirements
 
 - C++20 or later

examples/cxx/build-and-run-crashinfo.ps1

@@ -1,159 +1,7 @@
 # Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 # SPDX-License-Identifier: Apache-2.0
 
-# Build and run the CXX crashinfo example on Windows
-$ErrorActionPreference = "Stop"
-
+# Build and run the CXX crashinfo example
 $SCRIPT_DIR = Split-Path -Parent $MyInvocation.MyCommand.Path
-$PROJECT_ROOT = (Get-Item (Join-Path $SCRIPT_DIR ".." "..")).FullName
-Set-Location $PROJECT_ROOT
-
-Write-Host "🔨 Building libdd-crashtracker with cxx feature..." -ForegroundColor Cyan
-cargo build -p libdd-crashtracker --features cxx --release
-
-Write-Host "🔍 Finding CXX bridge headers..." -ForegroundColor Cyan
-$CXX_BRIDGE_INCLUDE = Get-ChildItem -Path "target\release\build\libdd-crashtracker-*\out\cxxbridge\include" -Directory -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-$CXX_BRIDGE_CRATE = Get-ChildItem -Path "target\release\build\libdd-crashtracker-*\out\cxxbridge\crate" -Directory -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-$RUST_CXX_INCLUDE = Get-ChildItem -Path "target\release\build\cxx-*\out" -Directory -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-
-if (-not $CXX_BRIDGE_INCLUDE -or -not $CXX_BRIDGE_CRATE -or -not $RUST_CXX_INCLUDE) {
-    Write-Host "❌ Error: Could not find CXX bridge directories" -ForegroundColor Red
-    exit 1
-}
-
-Write-Host "📁 CXX include: $CXX_BRIDGE_INCLUDE" -ForegroundColor Green
-Write-Host "📁 CXX crate: $CXX_BRIDGE_CRATE" -ForegroundColor Green
-Write-Host "📁 Rust CXX: $RUST_CXX_INCLUDE" -ForegroundColor Green
-
-# Check if we have MSVC (cl.exe) or MinGW (g++/clang++)
-# Note: Prefer MSVC on Windows as it's the default Rust toolchain
-$MSVC = Get-Command cl.exe -ErrorAction SilentlyContinue
-$GPP = Get-Command g++.exe -ErrorAction SilentlyContinue
-$CLANGPP = Get-Command clang++.exe -ErrorAction SilentlyContinue
-
-# Auto-detect which toolchain Rust used by checking which library exists
-# Note: On Windows, Rust still uses 'lib' prefix even for MSVC .lib files
-$HAS_MSVC_LIB = Test-Path (Join-Path $PROJECT_ROOT "target\release\libdd_crashtracker.lib")
-$HAS_GNU_LIB = (Test-Path (Join-Path $PROJECT_ROOT "target\release\libdd_crashtracker.a")) -or `
-               (Test-Path (Join-Path $PROJECT_ROOT "target\release\liblibdd_crashtracker.a"))
-
-if ($HAS_MSVC_LIB -and $MSVC) {
-    $USE_MSVC = $true
-    Write-Host "Detected MSVC Rust toolchain" -ForegroundColor Cyan
-} elseif ($HAS_GNU_LIB -and ($GPP -or $CLANGPP)) {
-    $USE_MSVC = $false
-    Write-Host "Detected GNU Rust toolchain" -ForegroundColor Cyan
-} elseif ($MSVC) {
-    $USE_MSVC = $true
-    Write-Host "Defaulting to MSVC (library not found yet, will check after)" -ForegroundColor Yellow
-} elseif ($GPP -or $CLANGPP) {
-    $USE_MSVC = $false
-    Write-Host "Defaulting to GNU toolchain (library not found yet, will check after)" -ForegroundColor Yellow
-} else {
-    Write-Host "❌ Error: No C++ compiler found. Please install MSVC (via Visual Studio) or MinGW/LLVM" -ForegroundColor Red
-    exit 1
-}
-
-Write-Host "🔨 Finding libraries..." -ForegroundColor Cyan
-# Note: Rust library naming varies by platform and toolchain
-if ($USE_MSVC) {
-    # MSVC: libdd_crashtracker.lib (Rust keeps the lib prefix even on Windows)
-    $CRASHTRACKER_LIB = Join-Path $PROJECT_ROOT "target\release\libdd_crashtracker.lib"
-    $CXX_BRIDGE_LIB = Get-ChildItem -Path "target\release\build\libdd-crashtracker-*\out" -Filter "libdd-crashtracker-cxx.lib" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-} else {
-    # MinGW: Try both possible naming patterns
-    $CRASHTRACKER_LIB_1 = Join-Path $PROJECT_ROOT "target\release\libdd_crashtracker.a"
-    $CRASHTRACKER_LIB_2 = Join-Path $PROJECT_ROOT "target\release\liblibdd_crashtracker.a"
-    
-    if (Test-Path $CRASHTRACKER_LIB_1) {
-        $CRASHTRACKER_LIB = $CRASHTRACKER_LIB_1
-    } elseif (Test-Path $CRASHTRACKER_LIB_2) {
-        $CRASHTRACKER_LIB = $CRASHTRACKER_LIB_2
-    } else {
-        $CRASHTRACKER_LIB = $CRASHTRACKER_LIB_1  # Use this for error message
-    }
-    
-    # Try both naming patterns for CXX bridge
-    $CXX_BRIDGE_LIB = Get-ChildItem -Path "target\release\build\libdd-crashtracker-*\out" -Filter "libdd-crashtracker-cxx.a" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-    if (-not $CXX_BRIDGE_LIB) {
-        $CXX_BRIDGE_LIB = Get-ChildItem -Path "target\release\build\libdd-crashtracker-*\out" -Filter "liblibdd-crashtracker-cxx.a" -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
-    }
-}
-
-if (-not (Test-Path $CRASHTRACKER_LIB)) {
-    Write-Host "❌ Error: Could not find libdd-crashtracker library at $CRASHTRACKER_LIB" -ForegroundColor Red
-    if (-not $MSVC) {
-        Write-Host "Searched for: libdd_crashtracker.a and liblibdd_crashtracker.a" -ForegroundColor Yellow
-        Write-Host "Files in target/release/:" -ForegroundColor Yellow
-        Get-ChildItem -Path "target\release" -Filter "*crashtracker*" | Select-Object -First 10 | ForEach-Object { Write-Host "  $_" -ForegroundColor Gray }
-    }
-    exit 1
-}
-
-if (-not $CXX_BRIDGE_LIB) {
-    if ($USE_MSVC) {
-        Write-Host "❌ Error: Could not find CXX bridge library (looking for libdd-crashtracker-cxx.lib)" -ForegroundColor Red
-    } else {
-        Write-Host "❌ Error: Could not find CXX bridge library" -ForegroundColor Red
-        Write-Host "Searched for: libdd-crashtracker-cxx.a and liblibdd-crashtracker-cxx.a" -ForegroundColor Yellow
-    }
-    exit 1
-}
-
-Write-Host "📚 Crashtracker library: $CRASHTRACKER_LIB" -ForegroundColor Green
-Write-Host "📚 CXX bridge library: $CXX_BRIDGE_LIB" -ForegroundColor Green
-
-Write-Host "🔨 Compiling C++ example..." -ForegroundColor Cyan
-
-if ($USE_MSVC) {
-    Write-Host "Using MSVC compiler" -ForegroundColor Yellow
-    
-    # MSVC compilation
-    cl.exe /std:c++20 /EHsc `
-        /I"$CXX_BRIDGE_INCLUDE" `
-        /I"$CXX_BRIDGE_CRATE" `
-        /I"$RUST_CXX_INCLUDE" `
-        /I"$PROJECT_ROOT" `
-        examples\cxx\crashinfo.cpp `
-        "$CRASHTRACKER_LIB" `
-        "$CXX_BRIDGE_LIB" `
-        ws2_32.lib advapi32.lib userenv.lib ntdll.lib bcrypt.lib `
-        /Fe:examples\cxx\crashinfo.exe
-    
-    if ($LASTEXITCODE -ne 0) {
-        Write-Host "❌ Compilation failed" -ForegroundColor Red
-        exit 1
-    }
-} elseif ($GPP -or $CLANGPP) {
-    $COMPILER = if ($GPP) { "g++" } else { "clang++" }
-    Write-Host "Using $COMPILER compiler" -ForegroundColor Yellow
-    
-    # MinGW/Clang compilation - needs proper library ordering and Rust std lib
-    & $COMPILER -std=c++20 `
-        -I"$CXX_BRIDGE_INCLUDE" `
-        -I"$CXX_BRIDGE_CRATE" `
-        -I"$RUST_CXX_INCLUDE" `
-        -I"$PROJECT_ROOT" `
-        examples/cxx/crashinfo.cpp `
-        "$CXX_BRIDGE_LIB" `
-        "$CRASHTRACKER_LIB" `
-        -lws2_32 -ladvapi32 -luserenv -lntdll -lbcrypt -lgcc_eh -lpthread `
-        -o examples/cxx/crashinfo.exe
-    
-    if ($LASTEXITCODE -ne 0) {
-        Write-Host "❌ Compilation failed" -ForegroundColor Red
-        exit 1
-    }
-}
-
-Write-Host "🚀 Running example..." -ForegroundColor Cyan
-& ".\examples\cxx\crashinfo.exe"
-
-if ($LASTEXITCODE -ne 0) {
-    Write-Host "❌ Example failed with exit code $LASTEXITCODE" -ForegroundColor Red
-    exit 1
-}
-
-Write-Host ""
-Write-Host "✅ Success!" -ForegroundColor Green
-
+& "$SCRIPT_DIR\build-and-run.ps1" -CrateName "libdd-crashtracker" -ExampleName "crashinfo"
+exit $LASTEXITCODE

examples/cxx/build-and-run-crashinfo.sh

@@ -3,67 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Build and run the CXX crashinfo example
-set -e
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
-cd "$PROJECT_ROOT"
-
-echo "🔨 Building libdd-crashtracker with cxx feature..."
-cargo build -p libdd-crashtracker --features cxx --release
-
-echo "🔍 Finding CXX bridge headers..."
-CXX_BRIDGE_INCLUDE=$(find target/release/build/libdd-crashtracker-*/out/cxxbridge/include -type d 2>/dev/null | head -n 1)
-CXX_BRIDGE_CRATE=$(find target/release/build/libdd-crashtracker-*/out/cxxbridge/crate -type d 2>/dev/null | head -n 1)
-RUST_CXX_INCLUDE=$(find target/release/build/cxx-*/out -type d 2>/dev/null | head -n 1)
-
-if [ -z "$CXX_BRIDGE_INCLUDE" ] || [ -z "$CXX_BRIDGE_CRATE" ] || [ -z "$RUST_CXX_INCLUDE" ]; then
-    echo "❌ Error: Could not find CXX bridge directories"
-    exit 1
-fi
-
-echo "📁 CXX include: $CXX_BRIDGE_INCLUDE"
-echo "📁 CXX crate: $CXX_BRIDGE_CRATE"
-echo "📁 Rust CXX: $RUST_CXX_INCLUDE"
-
-echo "🔨 Finding libraries..."
-CRASHTRACKER_LIB="$PROJECT_ROOT/target/release/liblibdd_crashtracker.a"
-CXX_BRIDGE_LIB=$(find target/release/build/libdd-crashtracker-*/out -name "liblibdd-crashtracker-cxx.a" | head -n 1)
-
-if [ ! -f "$CRASHTRACKER_LIB" ]; then
-    echo "❌ Error: Could not find libdd-crashtracker library at $CRASHTRACKER_LIB"
-    exit 1
-fi
-
-if [ ! -f "$CXX_BRIDGE_LIB" ]; then
-    echo "❌ Error: Could not find CXX bridge library"
-    exit 1
-fi
-
-echo "📚 Crashtracker library: $CRASHTRACKER_LIB"
-echo "📚 CXX bridge library: $CXX_BRIDGE_LIB"
-
-echo "🔨 Compiling C++ example..."
-# Platform-specific linker flags
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM_LIBS="-framework Security -framework CoreFoundation"
-else
-    PLATFORM_LIBS=""
-fi
-
-c++ -std=c++20 \
-    -I"$CXX_BRIDGE_INCLUDE" \
-    -I"$CXX_BRIDGE_CRATE" \
-    -I"$RUST_CXX_INCLUDE" \
-    -I"$PROJECT_ROOT" \
-    examples/cxx/crashinfo.cpp \
-    "$CRASHTRACKER_LIB" \
-    "$CXX_BRIDGE_LIB" \
-    -lpthread -ldl $PLATFORM_LIBS \
-    -o examples/cxx/crashinfo
-
-echo "🚀 Running example..."
-./examples/cxx/crashinfo
-
-echo ""
-echo "✅ Success!"
+exec "$SCRIPT_DIR/build-and-run.sh" libdd-crashtracker crashinfo