Browse Source

tag nightly builds

Thomas la Cour 11 months ago
parent
commit
6298b23e07
2 changed files with 5 additions and 1 deletions
  1. 1 1
      build.bat
  2. 4 0
      misc/odin.rc

+ 1 - 1
build.bat

@@ -68,7 +68,7 @@ set compiler_defines= -DODIN_VERSION_RAW=\"%odin_version_raw%\"
 rem fileversion is defined as {Major,Minor,Build,Private: u16} so a bit limited
 rem fileversion is defined as {Major,Minor,Build,Private: u16} so a bit limited
 set rc_flags=-nologo ^
 set rc_flags=-nologo ^
 -DV1=%V1% -DV2=%V2% -DV3=%V3% -DV4=%V4% ^
 -DV1=%V1% -DV2=%V2% -DV3=%V3% -DV4=%V4% ^
--DVF=%odin_version_full%
+-DVF=%odin_version_full% -Dnightly=%nightly%
 
 
 if not exist .git\ goto skip_git_hash
 if not exist .git\ goto skip_git_hash
 for /f "tokens=1,2" %%i IN ('git show "--pretty=%%cd %%h" "--date=format:%%Y-%%m" --no-patch --no-notes HEAD') do (
 for /f "tokens=1,2" %%i IN ('git show "--pretty=%%cd %%h" "--date=format:%%Y-%%m" --no-patch --no-notes HEAD') do (

+ 4 - 0
misc/odin.rc

@@ -30,6 +30,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 #ifndef GIT_SHA
 #ifndef GIT_SHA
 #define GIT_SHA 0
 #define GIT_SHA 0
 #endif
 #endif
+#ifndef NIGHTLY
+#define NIGHTLY 0
+#endif
 
 
 #define Q(x) #x
 #define Q(x) #x
 #define QUOTE(x) Q(x)
 #define QUOTE(x) Q(x)
@@ -62,6 +65,7 @@ BEGIN
             VALUE "Comments", QUOTE(git-sha: GIT_SHA)
             VALUE "Comments", QUOTE(git-sha: GIT_SHA)
 			// custom values
 			// custom values
             VALUE "GitSha", QUOTE(GIT_SHA)
             VALUE "GitSha", QUOTE(GIT_SHA)
+            VALUE "NightlyBuild", QUOTE(NIGHTLY)
         END
         END
     END
     END
     BLOCK "VarFileInfo"
     BLOCK "VarFileInfo"