Merge pull request #28 from taysta/short-hash

Short git hash

.github/workflows/build.yml

@@ -40,10 +40,21 @@ jobs:
             platform: x64
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1.3.1
 
       - name: Create Build Environment
         run: cmake -E make_directory ${{ github.workspace }}/build
@@ -89,7 +100,18 @@ jobs:
         portable: [Non-Portable]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Create Build Environment
         run: |
@@ -155,7 +177,18 @@ jobs:
         portable: [Non-Portable]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        if: github.event_name == 'pull_request'
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - uses: actions/checkout@v4
+        if: github.event_name != 'pull_request'
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Create Build Environment
         run: |
@@ -205,7 +238,7 @@ jobs:
     needs: [msvc, ubuntu, macos]
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -236,7 +269,7 @@ jobs:
     needs: [msvc, ubuntu, macos]
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -291,7 +324,7 @@ jobs:
             zip: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 

CMakeLists.txt

@@ -323,10 +323,18 @@ else()
 	message(STATUS "SOURCE_DATE_EPOCH is set ($ENV{SOURCE_DATE_EPOCH}): SOURCE_DATE set to \"${SOURCE_DATE}\"")
 endif()
 
-# Current Git SHA1 hash
-include(GetGitRevisionDescription)
-get_git_head_revision(GIT_REFSPEC GIT_HASH)
-message(STATUS "Git revision is ${GIT_HASH}")
+# Current Git tag/version
+# ideally we would separate the hash suffix into its own variable, but sed is not available everywhere
+execute_process(
+	COMMAND "git" "describe" "--tag"
+	OUTPUT_VARIABLE GIT_TAG
+	RESULT_VARIABLE GIT_TAG_ERROR
+	OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(GIT_TAG_ERROR AND NOT GIT_TAG_ERROR EQUAL 0)
+	message(WARNING "Unable to determine Git tag")
+	set(GIT_TAG vUNKNOWN)
+endif()
+message(STATUS "Git tag is ${GIT_TAG}")
 
 configure_file(shared/qcommon/q_version.h.in shared/qcommon/q_version.h @ONLY)
 

codemp/cgame/CMakeLists.txt

@@ -25,6 +25,7 @@ set(MPCGameIncludeDirectories
 	"${MPDir}"
 	"${SharedDir}"
 	"${GSLIncludeDirectory}"
+	"${CMAKE_BINARY_DIR}/shared"
 	)
 if(WIN32)
 	set(MPCGameLibraries "odbc32" "odbccp32") # what are these even?
@@ -112,7 +113,7 @@ set(MPCGameCommonFiles
 	"${MPDir}/qcommon/q_shared.h"
 	"${MPDir}/qcommon/qfiles.h"
 	"${MPDir}/qcommon/tags.h"
-	
+
 	${SharedCommonFiles}
 	)
 source_group("common" FILES ${MPCGameCommonFiles})

codemp/client/cl_console.cpp

@@ -560,46 +560,6 @@ void Con_Init (void) {
 	Cmd_AddCommand( "clear", Con_Clear_f, "Clear console text" );
 	Cmd_AddCommand( "condump", Con_Dump_f, "Dump console text to file" );
 	Cmd_SetCommandCompletionFunc( "condump", Cmd_CompleteTxtName );
-
-	{//build version string for console
-		int day, year;
-		char month[4];
-
-		if (sscanf(SOURCE_DATE, "%s %i %i", month, &day, &year) == 3) {
-			int mm = 0;
-
-			//sry..
-			if (month[0] == 'J' && month[1] == 'a' && month[2] == 'n')
-				mm = 1;
-			else if (month[0] == 'F')
-				mm = 2;
-			else if (month[0] == 'M' && month[1] == 'a' && month[2] == 'r')
-				mm = 3;
-			else if (month[0] == 'A' && month[1] == 'p')
-				mm = 4;
-			else if (month[0] == 'M' && month[1] == 'a' && month[2] == 'y')
-				mm = 5;
-			else if (month[0] == 'J' && month[1] == 'u' && month[2] == 'n')
-				mm = 6;
-			else if (month[0] == 'J' && month[1] == 'u' && month[2] == 'l')
-				mm = 7;
-			else if (month[0] == 'A' && month[1] == 'u')
-				mm = 8;
-			else if (month[0] == 'S')
-				mm = 9;
-			else if (month[0] == 'O')
-				mm = 10;
-			else if (month[0] == 'N')
-				mm = 11;
-			else if (month[0] == 'D')
-				mm = 12;
-
-			Com_sprintf(version, sizeof(version), "EternalJK: [%02i/%02i/%04i]", mm, day, year);
-		}
-	}
-
-	if (!version[0])
-		Q_strncpyz(version, "EternalJK", sizeof(version));
 }
 
 /*
@@ -1017,7 +977,6 @@ void Con_DrawSolidConsole( float frac ) {
 		SCR_DrawSmallChar(cls.glconfig.vidWidth - (i - x) * con.charWidth, lines - (con.charHeight + con.charHeight / 2) + padding, ts[x]);
 	}
 
-
 	// draw the text
 	con.vislines = lines;
 	rows = (lines-con.charWidth)/con.charWidth;		// rows of text to draw

codemp/client/cl_main.cpp

@@ -31,6 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #include "qcommon/cm_public.h"
 #include "qcommon/MiniHeap.h"
 #include "qcommon/stringed_ingame.h"
+#include "qcommon/game_version.h"
 #include "cl_cgameapi.h"
 #include "cl_uiapi.h"
 #include "cl_lan.h"
@@ -1045,7 +1046,7 @@ void CL_RequestMotd( void ) {
 	Info_SetValueForKey( info, "challenge", cls.updateChallenge );
 	Info_SetValueForKey( info, "renderer", cls.glconfig.renderer_string );
 	Info_SetValueForKey( info, "rvendor", cls.glconfig.vendor_string );
-	Info_SetValueForKey( info, "version", com_version->string );
+	Info_SetValueForKey( info, "version", JK_VERSION_OLD " " PLATFORM_STRING " " SOURCE_DATE );
 
 	//If raven starts filtering for this, add this code back in
 #if 0