Skip to content

Commit 864dd92

Browse files
committed
Fix build on macos (probs with case insensitivity)
1 parent 575faf4 commit 864dd92

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ compile_rust.sh @Datadog/libdatadog-apm
1717
# Release files
1818
Cargo.lock @DataDog/apm-php @DataDog/profiling-php @Datadog/libdatadog-apm
1919
package.xml @DataDog/apm-php @DataDog/profiling-php @Datadog/asm-php
20-
VERSION @DataDog/apm-php @DataDog/profiling-php @Datadog/asm-php
20+
VERSION.txt @DataDog/apm-php @DataDog/profiling-php @Datadog/asm-php

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ASSUME_COMPILED := ${DD_TRACE_ASSUME_COMPILED}
3535
MAX_TEST_PARALLELISM ?= $(shell nproc)
3636
ALL_TEST_ENV_OVERRIDE := $(shell [ -n "${DD_TRACE_DOCKER_DEBUG}" ] && echo DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1) DD_TRACE_GIT_METADATA_ENABLED=0 DD_CRASHTRACKER_RECEIVER_TIMEOUT_MS=15000
3737

38-
VERSION := $(shell cat VERSION)
38+
VERSION := $(shell cat VERSION.txt)
3939

4040
INI_DIR := $(shell ASAN_OPTIONS=detect_leaks=0 php -d ddtrace.disable=1 -i | awk -F"=>" '/Scan this dir for additional .ini files/ {print $$2}')
4141
INI_FILE := $(INI_DIR)/ddtrace.ini
File renamed without changes.

appsec/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ endforeach()
1010

1111
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules")
1212

13-
file(READ "../VERSION" appsec_version)
13+
file(READ "../VERSION.txt" appsec_version)
1414
string(STRIP "${appsec_version}" appsec_version)
1515
set(CMAKE_APPSEC_VERSION ${appsec_version})
1616
string(REGEX MATCH "^[^+a-z]*" appsec_short_version "${appsec_version}")

appsec/cmake/ddtrace.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ add_custom_target(ddtrace_exports
3535
)
3636
endif()
3737

38-
file(READ "${CMAKE_SOURCE_DIR}/../VERSION" VERSION_CONTENTS)
38+
file(READ "${CMAKE_SOURCE_DIR}/../VERSION.txt" VERSION_CONTENTS)
3939
string(STRIP "${VERSION_CONTENTS}" PHP_DDTRACE_VERSION)
4040
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/gen_ddtrace/ext")
4141
set(VERSION_H_PATH "${CMAKE_BINARY_DIR}/gen_ddtrace/ext/version.h")
@@ -46,7 +46,7 @@ add_custom_command(
4646
COMMAND ${CMAKE_COMMAND} -E remove -f "${VERSION_H_PATH}"
4747
COMMAND ${CMAKE_COMMAND} -E touch "${VERSION_H_PATH}"
4848
COMMAND printf "\\#ifndef PHP_DDTRACE_VERSION\\\\n\\#define PHP_DDTRACE_VERSION \"%s\"\\\\n\\#endif" "'\"${PHP_DDTRACE_VERSION}\"'" >> "${VERSION_H_PATH}"
49-
DEPENDS "${CMAKE_SOURCE_DIR}/../VERSION"
49+
DEPENDS "${CMAKE_SOURCE_DIR}/../VERSION.txt"
5050
COMMENT "Generating version.h"
5151
)
5252
add_custom_target(update_version_h ALL DEPENDS "${VERSION_H_PATH}")

profiling/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ fn main() {
2323
}
2424

2525
// Read the version from the VERSION file
26-
let version = fs::read_to_string("../VERSION")
26+
let version = fs::read_to_string("../VERSION.txt")
2727
.expect("Failed to read VERSION file")
2828
.trim()
2929
.to_string();
3030
println!("cargo:rustc-env=PROFILER_VERSION={version}");
31-
println!("cargo:rerun-if-changed=../VERSION");
31+
println!("cargo:rerun-if-changed=../VERSION.txt");
3232

3333
let php_config_includes = std::str::from_utf8(php_config_includes_output.stdout.as_slice())
3434
.expect("`php-config`'s stdout to be valid utf8");

0 commit comments

Comments
 (0)