- Added $(ORXFLAGS) as extra environment driven compile flags in prem…

…ake script - Added pre-build step to retrieve the current build number (hg only, won't work with git or package) - Updated setup.r to create placeholder orxBuild.h file if needed --HG-- branch : version_system
orx · Jan 5, 2017 · cf8d6e3 · cf8d6e3
1 parent 310e5fa
commit cf8d6e3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/.hgignore b/.hgignore
@@ -73,3 +73,4 @@ code/build/**
 tools/orxCrypt/build/**
 tools/orxFontGen/build/**
 tutorial/build/**
+code/include/base/orxBuild.h
diff --git a/code/build/premake4.lua b/code/build/premake4.lua
@@ -415,6 +415,7 @@ project "orxLIB"
     configuration {}
         targetdir ("../lib/dynamic")
         kind ("SharedLib")
+        buildoptions {"$(ORXFLAGS)"}
 
     configuration {"not xcode*", "*Core*"}
         targetdir ("../lib/static")
@@ -450,6 +451,7 @@ project "orxLIB"
 
     configuration {"linux"}
         defines {"_GNU_SOURCE"}
+        prebuildcommands {"hg log -l 1 --template \"#define __orxVERSION_BUILD__ {rev}\" > " .. copybase .. "/include/base/orxBuild.h 2> /dev/null"}
 
     configuration {"linux", "not *Core*"}
         links
@@ -504,6 +506,7 @@ project "orxLIB"
 
     configuration{"macosx"}
         buildoptions{"-Wno-deprecated-declarations", "-Wno-empty-body"}
+        prebuildcommands {"hg log -l 1 --template \"#define __orxVERSION_BUILD__ {rev}\" > " .. copybase .. "/include/base/orxBuild.h 2> /dev/null"}
 
     configuration {"macosx", "*Debug*"}
         linkoptions {"-install_name @executable_path/liborxd.dylib"}
@@ -542,6 +545,9 @@ project "orxLIB"
 
 -- Windows
 
+    configuration {"windows"}
+        prebuildcommands {"hg log -l 1 --template \"#define __orxVERSION_BUILD__ {rev}\" > " .. path.translate(copybase, "\\") .. "\\include\\base\\orxBuild.h 2> nul"}
+
     configuration {"windows", "not *Core*"}
         links
         {

diff --git a/code/build/rebol/setup.r b/code/build/rebol/setup.r
@@ -18,8 +18,9 @@ hg:             %.hg/
 hg-hook:        "update.orx"
 git:            %.git/
 git-hooks:      [%post-checkout %post-merge]
+build-file:     %code/include/base/orxBuild.h
 platform-data:  [
-    "windows"   ['premake "windows" 'config ["gmake" "codelite" "vs2012" "vs2013" "vs2015"]                                                                 ]
+    "windows"   ['premake "windows" 'config ["gmake" "codelite" "vs2013" "vs2015"]                                                                          ]
     "mac"       ['premake "mac"     'config ["gmake" "codelite" "xcode4"         ]                                                                          ]
     "linux"     ['premake "linux32" 'config ["gmake" "codelite"                  ] 'deps ["freeglut3-dev" "libsndfile1-dev" "libopenal-dev" "libxrandr-dev"]]
 ]
@@ -126,6 +127,14 @@ either req-ver = cur-ver [
 ]
 
 
+; Build file placeholder
+if not exists? build-file [
+    attempt [
+        write build-file {}
+    ]
+]
+
+
 ; Runs premake
 premake-path: dirize rejoin [premake-root platform-info/premake]
 premake: read premake-path

diff --git a/code/include/base/orxVersion.h b/code/include/base/orxVersion.h
@@ -45,6 +45,10 @@
 
 #include "base/orxType.h"
 
+#ifndef __orxVERSION_BUILD__
+#include "base/orxBuild.h"
+#endif /* __orxVERSION_BUILD__ */
+
 
 /** Version numbers
  */