From aab1fa1ba2b0f2df3db7f60b01034e83ef571418 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 19 Mar 2024 19:30:52 +0300 Subject: [PATCH] wscript: move gitversion load to libpublic, define XASH_BUILD_BRANCH, use unknown-{commit,branch} if detecting git version was failed --- public/wscript | 4 +++- wscript | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/wscript b/public/wscript index e12c34f0..170af699 100644 --- a/public/wscript +++ b/public/wscript @@ -12,7 +12,9 @@ def options(opt): return def configure(conf): - conf.define('XASH_BUILD_COMMIT', conf.env.GIT_VERSION if conf.env.GIT_VERSION else 'notset') + conf.load('gitversion') + conf.define('XASH_BUILD_COMMIT', conf.env.GIT_VERSION if conf.env.GIT_VERSION else 'unknown-commit') + conf.define('XASH_BUILD_BRANCH', conf.env.GIT_BRANCH if conf.env.GIT_BRANCH else 'unknown-branch') def build(bld): bld(name = 'sdk_includes', export_includes = '. ../common ../pm_shared ../engine') diff --git a/wscript b/wscript index 4237c466..460ea9d3 100644 --- a/wscript +++ b/wscript @@ -181,7 +181,7 @@ def configure(conf): if conf.env.COMPILER_CC == 'msvc': conf.load('msvc_pdb') - conf.load('msvs msdev subproject gitversion clang_compilation_database strip_on_install waf_unit_test enforce_pic cmake') + conf.load('msvs msdev subproject clang_compilation_database strip_on_install waf_unit_test enforce_pic cmake') # Force XP compatibility, all build targets should add subsystem=bld.env.MSVC_SUBSYSTEM if conf.env.MSVC_TARGETS[0] == 'x86':