diff --git a/build-profiling-ffi.sh b/build-profiling-ffi.sh index 0cccf849fc..0647160296 100755 --- a/build-profiling-ffi.sh +++ b/build-profiling-ffi.sh @@ -136,17 +136,27 @@ cp -v LICENSE LICENSE-3rdparty.yml NOTICE "$destdir/" datadog_profiling_ffi="datadog-profiling-ffi" -FEATURES="--features crashtracker-collector,crashtracker-receiver,cbindgen,datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/demangler" +FEATURES=( + "cbindgen" + "crashtracker-collector" + "crashtracker-receiver" + "data-pipeline-ffi" + "datadog-profiling-ffi/ddtelemetry-ffi" + "datadog-profiling-ffi/demangler" +) if [[ "$symbolizer" -eq 1 ]]; then - FEATURES="--features crashtracker-collector,crashtracker-receiver,cbindgen,datadog-profiling-ffi/ddtelemetry-ffi,cbindgen,datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/demangler,symbolizer" + FEATURES+=("symbolizer") fi if [[ ! -z ${ARG_FEATURES} ]]; then - FEATURES="$FEATURES,$ARG_FEATURES" + FEATURES+=($ARG_FEATURES) fi +FEATURES=$(IFS=, ; echo "${FEATURES[*]}") +echo "Building for features: $FEATURES" + # build inside the crate to use the config.toml file -( cd profiling-ffi && DESTDIR="$destdir" cargo build ${FEATURES} --release --target "${target}") +( cd profiling-ffi && DESTDIR="$destdir" cargo build --features $FEATURES --release --target "${target}" ) # Remove _ffi suffix when copying shared_library_name="${library_prefix}datadog_profiling_ffi${shared_library_suffix}" diff --git a/windows/build-artifacts.ps1 b/windows/build-artifacts.ps1 index b1ae159682..a6d3b80dd3 100644 --- a/windows/build-artifacts.ps1 +++ b/windows/build-artifacts.ps1 @@ -21,11 +21,21 @@ if (![System.IO.Path]::IsPathRooted($output_dir)) { Write-Host "Building project into $($output_dir)" -ForegroundColor Magenta # build inside the crate to use the config.toml file +$features = @( + "data-pipeline-ffi", + "datadog-profiling-ffi/crashtracker-collector", + "datadog-profiling-ffi/crashtracker-receiver", + "datadog-profiling-ffi/ddtelemetry-ffi", + "datadog-profiling-ffi/demangler" +) -join "," + +Write-Host "Building for features: $features" -ForegroundColor Magenta + pushd profiling-ffi -Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target i686-pc-windows-msvc --release --target-dir $output_dir } -Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target i686-pc-windows-msvc --target-dir $output_dir } -Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target x86_64-pc-windows-msvc --release --target-dir $output_dir } -Invoke-Call -ScriptBlock { cargo build --features datadog-profiling-ffi/ddtelemetry-ffi,datadog-profiling-ffi/crashtracker-receiver,datadog-profiling-ffi/crashtracker-collector,datadog-profiling-ffi/demangler --target x86_64-pc-windows-msvc --target-dir $output_dir } +Invoke-Call -ScriptBlock { cargo build --features $features --target i686-pc-windows-msvc --release --target-dir $output_dir } +Invoke-Call -ScriptBlock { cargo build --features $features --target i686-pc-windows-msvc --target-dir $output_dir } +Invoke-Call -ScriptBlock { cargo build --features $features --target x86_64-pc-windows-msvc --release --target-dir $output_dir } +Invoke-Call -ScriptBlock { cargo build --features $features --target x86_64-pc-windows-msvc --target-dir $output_dir } popd Write-Host "Building tools" -ForegroundColor Magenta