Fix build

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

.gitlab/generate-package.php

@@ -489,9 +489,11 @@
     ABI_NO: "<?= $abi_no ?>"
     PHP_VERSION: "<?= $major_minor ?>"
     GIT_STRATEGY: clone
-    GIT_CONFIG_COUNT: 1
+    GIT_CONFIG_COUNT: 2
     GIT_CONFIG_KEY_0: core.longpaths
     GIT_CONFIG_VALUE_0: true
+    GIT_CONFIG_KEY_1: core.symlinks
+    GIT_CONFIG_VALUE_1: true
     CONTAINER_NAME: ${CI_JOB_NAME_SLUG}-${CI_JOB_ID}
   script: |
     # Make sure we actually fail if a command fails
@@ -1054,9 +1056,11 @@
   stage: verify
   tags: [ "windows-v2:2019"]
   variables:
-    GIT_CONFIG_COUNT: 1
+    GIT_CONFIG_COUNT: 2
     GIT_CONFIG_KEY_0: core.longpaths
     GIT_CONFIG_VALUE_0: true
+    GIT_CONFIG_KEY_1: core.symlinks
+    GIT_CONFIG_VALUE_1: true
   needs:
     - job: "package extension windows"
       artifacts: true

.gitlab/generate-tracer.php

@@ -116,9 +116,11 @@ function before_script_steps() {
       - PHP_MAJOR_MINOR: <?= json_encode($windows_minor_major_targets) ?>
 
   variables:
-    GIT_CONFIG_COUNT: 1
+    GIT_CONFIG_COUNT: 2
     GIT_CONFIG_KEY_0: core.longpaths
     GIT_CONFIG_VALUE_0: true
+    GIT_CONFIG_KEY_1: core.symlinks
+    GIT_CONFIG_VALUE_1: true
     CONTAINER_NAME: $CI_JOB_NAME_SLUG
     GIT_STRATEGY: clone
     IMAGE: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows"

Cargo.lock

@@ -48,7 +48,7 @@ RUN_TESTS_CMD := DD_SERVICE= DD_ENV= REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJ
 
 C_FILES = $(shell find components components-rs ext src/dogstatsd zend_abstract_interface -name '*.c' -o -name '*.h' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_FILES = $(shell find tests/ext -name '*.php*' -o -name '*.inc' -o -name '*.json' -o -name '*.yaml' -o -name 'CONFLICTS' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
-RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{datadog-alloc,build-common,datadog-crashtracker,datadog-crashtracker-ffi,data-pipeline,ddcommon,ddcommon-ffi,ddsketch,ddtelemetry,ddtelemetry-ffi,dogstatsd-client,datadog-ipc,datadog-ipc-macros,datadog-library-config,datadog-library-config-ffi,datadog-live-debugger,datadog-live-debugger-ffi,datadog-log,datadog-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,spawn_worker,tinybytes,tools/sidecar_mockgen,datadog-trace-*,Cargo.toml} -type f \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs")
+RUST_FILES = $(BUILD_DIR)/Cargo.toml $(BUILD_DIR)/Cargo.lock $(shell find components-rs -name '*.c' -o -name '*.rs' -o -name 'Cargo.toml' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' ) $(shell find libdatadog/{datadog-alloc,build-common,datadog-crashtracker,datadog-crashtracker-ffi,data-pipeline,ddcommon,ddcommon-ffi,ddsketch,ddtelemetry,ddtelemetry-ffi,dogstatsd-client,datadog-ipc,datadog-ipc-macros,datadog-library-config,datadog-library-config-ffi,datadog-live-debugger,datadog-live-debugger-ffi,datadog-log,datadog-remote-config,datadog-sidecar,datadog-sidecar-ffi,datadog-sidecar-macros,spawn_worker,tinybytes,tools/{cc_utils,sidecar_mockgen},datadog-trace-*,Cargo.toml} \( -type l -o -type f \) \( -path "*/src*" -o -path "*/examples*" -o -path "*Cargo.toml" -o -path "*/build.rs" -o -path "*/tests/dataservice.rs" -o -path "*/tests/service_functional.rs" \) -not -path "*/datadog-ipc/build.rs" -not -path "*/datadog-sidecar-ffi/build.rs")
 ALL_OBJECT_FILES = $(C_FILES) $(RUST_FILES) $(BUILD_DIR)/Makefile
 TEST_OPCACHE_FILES = $(shell find tests/opcache -name '*.php*' -o -name '.gitkeep' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
 TEST_STUB_FILES = $(shell find tests/ext -type d -name 'stubs' -exec find '{}' -type f \; | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )

Makefile

@@ -4,7 +4,7 @@ name = "php_sidecar_mockgen"
 version = "0.1.0"
 
 [dependencies]
-ddcommon = { path = "../../libdatadog/ddcommon" }
+cc_utils = { path = "../../libdatadog/tools/cc_utils" }
 current_platform = "0.2.0"
 sidecar_mockgen = { path = "../../libdatadog/tools/sidecar_mockgen" }
 

components-rs/php_sidecar_mockgen/Cargo.toml

@@ -1,7 +1,7 @@
 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021-Present Datadog, Inc.
 
-pub use ddcommon::cc_utils::cc;
+pub use cc_utils::cc;
 pub use sidecar_mockgen::generate_mock_symbols;
 use std::path::Path;
 use std::{env, fs, process};
@@ -58,7 +58,7 @@ fn main() {
             cc_build.target(current_platform::CURRENT_PLATFORM);
         }
 
-        ddcommon::cc_utils::ImprovedBuild::new()
+        cc_utils::ImprovedBuild::new()
             .set_cc_builder(cc_build)
             .file("mock_php_syms.c")
             .link_dynamically("dl")