From 0e11b40bb2b573a9355211d0c5b72176abe854dc Mon Sep 17 00:00:00 2001 From: Kirk Klobe Date: Wed, 22 Mar 2023 21:06:03 -0500 Subject: [PATCH 1/2] add version to meson.build 'project()' Meson projects which use tracy as a subproject and specify a version for the dependency will fail due to an undefined version number. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 690938f9..c7e443fa 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('tracy', ['cpp']) +project('tracy', ['cpp'], version: '0.9.1') if get_option('tracy_enable') add_project_arguments('-DTRACY_ENABLE', language : 'cpp') From 70afa6c62cd00ea25acc9b208fd39f4404b1d353 Mon Sep 17 00:00:00 2001 From: Kirk Klobe Date: Thu, 23 Mar 2023 07:55:03 -0500 Subject: [PATCH 2/2] update make-build.sh to change meson.build version --- extra/make-build.sh | 2 ++ extra/update-meson-version.sh | 13 +++++++++++++ 2 files changed, 15 insertions(+) mode change 100644 => 100755 extra/make-build.sh create mode 100755 extra/update-meson-version.sh diff --git a/extra/make-build.sh b/extra/make-build.sh old mode 100644 new mode 100755 index 39e5a586..94db083c --- a/extra/make-build.sh +++ b/extra/make-build.sh @@ -3,6 +3,8 @@ rm -rf tracy-build mkdir tracy-build +./update-meson-version.sh + if [ ! -f vswhere.exe ]; then wget https://github.com/microsoft/vswhere/releases/download/2.8.4/vswhere.exe fi diff --git a/extra/update-meson-version.sh b/extra/update-meson-version.sh new file mode 100755 index 00000000..913eb357 --- /dev/null +++ b/extra/update-meson-version.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +version_header="../public/common/TracyVersion.hpp" + +major=$(grep -o -E 'Major = [0-9]+' "$version_header" | awk -F '= ' '{print $2}') +minor=$(grep -o -E 'Minor = [0-9]+' "$version_header" | awk -F '= ' '{print $2}') +patch=$(grep -o -E 'Patch = [0-9]+' "$version_header" | awk -F '= ' '{print $2}') + +version="${major}.${minor}.${patch}" + +# the extension is required for macOS's outdated sed +sed -i.bak "s/version: '[0-9]*\.[0-9]*\.[0-9]*'/version: '$version'/g" ../meson.build +rm ../meson.build.bak