aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2022-06-13 21:23:09 +0200
committerDan Engelbrecht <[email protected]>2022-06-13 21:23:09 +0200
commita7b67de26eecd719f5754815beb17bc8fe10ed6c (patch)
tree1110a951b8716a85caff6e2a51cbd0a843d77ee4
parentautomate bump version (diff)
downloadzen-a7b67de26eecd719f5754815beb17bc8fe10ed6c.tar.xz
zen-a7b67de26eecd719f5754815beb17bc8fe10ed6c.zip
read VERSION.txt in zencore:on_load
-rw-r--r--xmake.lua6
-rw-r--r--zencore/xmake.lua6
2 files changed, 9 insertions, 3 deletions
diff --git a/xmake.lua b/xmake.lua
index de63f205b..4e2f150a1 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,9 +1,9 @@
-- Copyright Epic Games, Inc. All Rights Reserved.
set_configvar("ZEN_SCHEMA_VERSION", 3) -- changed cas oplog format (p3rl)
-local zenversion = os.getenv("ZEN_VERSION") or "0.0.0"
-zenversion = string.gsub(zenversion, "^v", "")
-set_version(zenversion, { build = "%Y%m%d%H%M" })
+-- local zenversion = os.getenv("ZEN_VERSION") or "0.0.0"
+-- zenversion = string.gsub(zenversion, "^v", "")
+-- set_version(zenversion, { build = "%Y%m%d%H%M" })
add_requires(
"vcpkg::asio",
diff --git a/zencore/xmake.lua b/zencore/xmake.lua
index 63e874ac5..1e7a06080 100644
--- a/zencore/xmake.lua
+++ b/zencore/xmake.lua
@@ -4,6 +4,12 @@ target('zencore')
set_kind("static")
add_headerfiles("**.h")
add_configfiles("include/zencore/config.h.in")
+ add_configfiles("VERSION.txt", {onlycopy = true})
+ on_load(function (target)
+ local version = io.readfile("VERSION.txt")
+ version = version:match'^%s*v(.*%S)' or ''
+ target:set("version", version, { build = "%Y%m%d%H%M" })
+ end)
set_configdir("include/zencore")
add_files("**.cpp")
add_includedirs("include", {public=true})