BUILD: Adding git commit ref to serverinfo (only for Travis automated…

… builds so far)

.travis.yml

@@ -72,6 +72,10 @@ before_install:
   # install python packages like meson, ninja etc...
   - pip3 install -r requirements.txt
 
+before_script:
+  # add current commit ref to include files for debugging ease
+  - sed -i "s/#define GIT_COMMIT.*$/$(git log -n 1 --format=format:"#define GIT_COMMIT \"%h\"" HEAD)/" include/g_local.h
+
 script:
   # build binary
   - meson build --buildtype=release --cross-file tools/cross-compilation/${OS}-${ARCH}.txt

include/g_local.h

@@ -38,11 +38,12 @@
 #include "player.h"
 
 #define MOD_NAME			("KTX")
-#define MOD_VERSION			("1.38")
+#define MOD_VERSION			("1.39-beta")
 #define MOD_BUILD_DATE		(__DATE__ ", " __TIME__)
 #define MOD_SERVERINFO_MOD_KEY		("ktxver")
 #define MOD_SERVERINFO_BUILD_KEY	("ktxbuild")
 #define MOD_URL    			("https://github.com/deurk/ktx")
+#define GIT_COMMIT "unknown"
 
 // qqshka - hmm, seems in C this is macros
 #undef max
@@ -305,8 +306,6 @@ int			get_scores2();
 gedict_t	*get_ed_scores1();
 gedict_t	*get_ed_scores2();
 
-int			build_number ();
-
 gedict_t	*get_ed_best1();
 gedict_t	*get_ed_best2();
 gedict_t	*get_ed_bestPow();

src/commands.c

@@ -1408,7 +1408,7 @@ void ShowVersion()
 	G_sprint(self, 2, "\n\235\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\237" "%s"
 					        "\235\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\236\237\n", redtext(MOD_NAME));
 
-	G_sprint(self, 2, "\n%s  %s, build %d\n", MOD_NAME, MOD_VERSION, build_number());
+	G_sprint(self, 2, "\n%s  %s (build %s)\n", MOD_NAME, MOD_VERSION, GIT_COMMIT);
 	G_sprint(self, 2, "Build date: %s\n", MOD_BUILD_DATE);
 
 

src/g_main.c

@@ -443,7 +443,7 @@ void G_InitGame( int levelTime, int randomSeed )
 
 	// put mod version in serverinfo
 	localcmd( "serverinfo \"%s\" \"%s\"\n", MOD_SERVERINFO_MOD_KEY, MOD_VERSION );
-	localcmd( "serverinfo \"%s\" \"%d\"\n", MOD_SERVERINFO_BUILD_KEY, build_number() );
+	localcmd( "serverinfo \"%s\" \"%s\"\n", MOD_SERVERINFO_BUILD_KEY, GIT_COMMIT );
 }
 
 void G_ShutDown()

src/g_utils.c

@@ -1725,19 +1725,6 @@ gedict_t *get_ed_scores2()
 	return ed_scores2;
 }
 
-// }
-
-// { version stuff
-
-// Matches build number with GIT revision number
-//TODO
-int build_number ()
-{
-	static int b = 0;
-	return b;
-}
-
-
 // }
 
 // { // autotrack stuff

src/motd.c

@@ -59,9 +59,9 @@ void PMOTDThink()
 	if ( strnull( buf ) )
 		strlcat(buf, "Welcome\n\n", sizeof(buf));
 
-	strlcat(buf, "\n€‚\n\n", sizeof(buf));
+	strlcat(buf, "\n�������\n\n", sizeof(buf));
 	strlcat(buf, va("Running %s %s (build %s)\nby %s\n\n", redtext(MOD_NAME),
-					dig3s("%s", MOD_VERSION), dig3s("%d", build_number()), redtext("KTX development team")), sizeof(buf));
+					dig3s("%s", MOD_VERSION), dig3s("%s", GIT_COMMIT), redtext("KTX development team")), sizeof(buf));
 	strlcat(buf, va("Website: %s\n", redtext(MOD_URL)), sizeof(buf));
 // qqshka - this info can be found in /about command
 //	strlcat(buf, va("Based on %s\n", redtext("Kombat teams 2.21")), sizeof(buf));