From 3532a77643c9da4b095f3e9433d606c1edbe4c2c Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 13 Jan 2025 19:06:39 +0300 Subject: [PATCH] public: move git commit and branch private to libpublic --- public/wscript | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/wscript b/public/wscript index 3a360212..f453f34b 100644 --- a/public/wscript +++ b/public/wscript @@ -67,8 +67,6 @@ def options(opt): def configure(conf): # private to libpublic 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') conf.env.VALIDATE_TARGET = conf.options.VALIDATE_TARGET # need to expose it for everyone using libpublic headers @@ -122,7 +120,8 @@ def build(bld): bld.stlib(source = bld.path.ant_glob('*.c'), target = 'public', - use = 'sdk_includes werror') + use = 'sdk_includes werror', + defines = ['XASH_BUILD_COMMIT=\"%s\"' % bld.env.GIT_VERSION, 'XASH_BUILD_BRANCH=\"%s\"' % bld.env.GIT_BRANCH]) if bld.env.TESTS: if bld.env.VALIDATE_TARGET: