[GEN][ZH] add superhackers release version to in-game options screen

fbraz3 · fbraz3 · commit 517791ebee15 · 2025-06-11T21:26:01.000-03:00
diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml
@@ -25,6 +25,10 @@ on:
         default: false
         type: boolean
         description: "Build extras"
+      release:
+        required: false
+        type: string
+        description: "Release build (true/false)"
 
 jobs:
   build:
@@ -35,6 +39,13 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
+      - uses: actions/checkout@v4
+      - name: Download version file
+        if: inputs.release == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: version_files
+
       - name: Cache VC6 Installation
         if: startsWith(inputs.preset, 'vc6')
         id: cache-vc6
diff --git a/.github/workflows/weekly-release.yml b/.github/workflows/weekly-release.yml
@@ -54,8 +54,46 @@ jobs:
             echo "changed=true" >> $GITHUB_OUTPUT
           fi
 
+  calculate-version:
+    name: Generate version files
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Create Version Files
+        run: |
+          BASE_TAG=$(cat .github/workflows/base-version.txt)
+          IFS='.' read -r major minor patch <<<"$BASE_TAG"
+          CURRENT_TAG=$(git tag --list "$major.$minor*" --sort=-v:refname | head -n1)
+          
+          if [ -z "$CURRENT_TAG" ]; then
+            CURRENT_TAG="$BASE_TAG"
+            NEXT_TAG="$BASE_TAG"
+          else
+            IFS='.' read -r major minor patch <<<"$CURRENT_TAG"
+            NEXT_TAG="$major.$minor.$((patch+1))"
+          fi
+          
+          echo "CURRENT_TAG: $CURRENT_TAG"
+          echo "NEXT_TAG: $NEXT_TAG"
+          
+          echo "$CURRENT_TAG" > current_tag.txt
+          echo "$NEXT_TAG" > next_tag.txt
+
+      - name: Upload version files
+        uses: actions/upload-artifact@v4
+        with:
+          name: version_files
+          path: |
+            next_tag.txt
+            current_tag.txt
+
   build-generals:
-    needs: detect-scm-changes
+    needs: [detect-scm-changes, calculate-version]
     if: needs.detect-scm-changes.outputs.changed == 'true'
     name: Build Generals${{ matrix.preset && '' }}
     strategy:
@@ -64,20 +102,23 @@ jobs:
           - preset: "vc6"
             tools: true
             extras: true
+            release: true
           - preset: "win32-vcpkg"
             tools: true
             extras: true
+            release: true
       fail-fast: false
     uses: ./.github/workflows/build-toolchain.yml
     with:
       game: "Generals"
       preset: ${{ matrix.preset }}
       tools: ${{ matrix.tools }}
       extras: ${{ matrix.extras }}
+      release: ${{ matrix.release }}
     secrets: inherit
 
   build-generalsmd:
-    needs: detect-scm-changes
+    needs: [detect-scm-changes, calculate-version]
     if: needs.detect-scm-changes.outputs.changed == 'true'
     name: Build GeneralsMD${{ matrix.preset && '' }}
     strategy:
@@ -86,16 +127,19 @@ jobs:
           - preset: "vc6"
             tools: true
             extras: true
+            release: true
           - preset: "win32"
             tools: true
             extras: true
+            release: true
       fail-fast: false
     uses: ./.github/workflows/build-toolchain.yml
     with:
       game: "GeneralsMD"
       preset: ${{ matrix.preset }}
       tools: ${{ matrix.tools }}
       extras: ${{ matrix.extras }}
+      release: ${{ matrix.release }}
     secrets: inherit
 
   create-release:
@@ -109,43 +153,40 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
+      - uses: actions/checkout@v4
+      - name: Download version file
+        uses: actions/download-artifact@v4
+        with:
+          name: version_files
+
       - name: Read base version
         id: base_version
         run: echo "base_version=$(cat .github/workflows/base-version.txt)" >> $GITHUB_OUTPUT
 
       - name: Get latest semver tag
         id: get_tag
-        run: |
-          BASE=${{ steps.base_version.outputs.base_version }}
-          IFS='.' read -r major minor patch <<<"$BASE"
-          TAG=$(git tag --list "$major.$minor*" --sort=-v:refname | head -n1)
-          echo "latest_tag=$TAG" >> $GITHUB_OUTPUT
+        run: echo "current_tag=$(cat current_tag.txt)" >> $GITHUB_OUTPUT
 
       - name: Calculate next version
         id: next_version
-        run: |
-          BASE=${{ steps.base_version.outputs.base_version }}
-          TAG=${{ steps.get_tag.outputs.latest_tag }}
-          if [ -z "$TAG" ]; then
-            NEXT_TAG="$BASE"
-          else
-            IFS='.' read -r major minor patch <<<"$TAG"
-            NEXT_TAG="$major.$minor.$((patch+1))"
-          fi
-          echo "next_tag=$NEXT_TAG" >> $GITHUB_OUTPUT 
+        run: echo "next_tag=$(cat next_tag.txt)" >> $GITHUB_OUTPUT
 
       - name: Collect commits since last release
         id: changelog
         run: |
-          TAG=${{ steps.get_tag.outputs.latest_tag }}
+          TAG=${{ steps.get_tag.outputs.current_tag }}
           if [ -z "$TAG" ]; then
-            echo "commits<<EOF" >> $GITHUB_OUTPUT
-            git log --pretty=format:"- %s" >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
+            {
+              echo "commits<<EOF"
+              git log --pretty=format:"- %s" | head -n10 | grep -v "Sync Generals repos"
+              echo "EOF"
+            } >> $GITHUB_OUTPUT
           else
-            echo "commits<<EOF" >> $GITHUB_OUTPUT
-            git log "$TAG"..HEAD --pretty=format:"- %s" |grep -v "Sync Generals repos" >> $GITHUB_OUTPUT
-            echo "EOF" >> $GITHUB_OUTPUT
+            {
+              echo "commits<<EOF"
+              git log "$TAG"..HEAD --pretty=format:"- %s" | grep -v "Sync Generals repos"
+              echo "EOF"
+            } >> $GITHUB_OUTPUT
           fi
 
       # Generals vc6
@@ -221,8 +262,8 @@ jobs:
 
             ### Known issues
 
-            - Fullscreen executable is currently broken. You must add the `-win` parameter to run the game in windowed mode.
-            
+            - Fullscreen execution can freeze the game. For that case, you should add the `-win` parameter to run the game in windowed mode. 
+
             ### Changelog
             ${{ steps.changelog.outputs.commits }}
           files: |
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
@@ -1077,6 +1077,7 @@ target_include_directories(g_gameengine PUBLIC
 
 target_include_directories(g_gameengine PRIVATE
     Include/Precompiled
+    ${CMAKE_BINARY_DIR}/Generals/Code/Main
 )
 
 target_link_libraries(g_gameengine PRIVATE
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -40,6 +40,7 @@
 #include "Common/GameLOD.h"
 #include "Common/Registry.h"
 #include "Common/version.h"
+#include "GeneratedVersion.h"
 
 #include "GameClient/ClientInstance.h"
 #include "GameClient/GameClient.h"
@@ -1426,7 +1427,9 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 	}
 	else
 	{
-		GadgetStaticTextSetText( labelVersion, versionString );
+		UnicodeString fullVersion;
+        fullVersion.format(L"%s - TheSuperHackers %s", versionString.str(), SUPERHACKERS_VERSION_WIDE);
+        GadgetStaticTextSetText(labelVersion, fullVersion);
 	}
 
 
diff --git a/Generals/Code/Main/CMakeLists.txt b/Generals/Code/Main/CMakeLists.txt
@@ -24,13 +24,32 @@ target_link_libraries(g_generals PRIVATE
     winmm
 )
 
+if(EXISTS "${CMAKE_SOURCE_DIR}/next_tag.txt")
+    file(READ "${CMAKE_SOURCE_DIR}/next_tag.txt" GAME_VERSION)
+    string(STRIP "${GAME_VERSION}" GAME_VERSION)
+    string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _ "${GAME_VERSION}")
+    set(VERSION_MAJOR "${CMAKE_MATCH_1}")
+    set(VERSION_MINOR "${CMAKE_MATCH_2}")
+    set(VERSION_BUILDNUM "${CMAKE_MATCH_3}")
+else()
+    if (IS_VS6_BUILD)
+        set(VERSION_MAJOR "1")
+        set(VERSION_MINOR "7")
+        set(VERSION_BUILDNUM "601")
+    else()
+        set(VERSION_MAJOR "1")
+        set(VERSION_MINOR "8")
+        set(VERSION_BUILDNUM "601")
+    endif()
+endif()
+
 # TODO Originally referred to build host and user, replace with git info perhaps?
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/GeneratedVersion.h
 "#pragma once
 
-#define VERSION_LOCALBUILDNUM 0
-#define VERSION_BUILDUSER \"Someone\"
-#define VERSION_BUILDLOC \"Someplace\"
+#define VERSION_BUILDUSER \"TheSuperHackers\"
+#define VERSION_BUILDLOC \"GitHub\"
+#define SUPERHACKERS_VERSION_WIDE L\"${GAME_VERSION}\"
 "
 )
 
@@ -39,18 +58,20 @@ if (IS_VS6_BUILD)
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/BuildVersion.h
 "#pragma once
 
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 7
-#define VERSION_BUILDNUM 601
+#define VERSION_MAJOR ${VERSION_MAJOR}
+#define VERSION_MINOR ${VERSION_MINOR}
+#define VERSION_BUILDNUM ${VERSION_BUILDNUM}
+#define VERSION_LOCALBUILDNUM 9001 // it's over 9000!
 "
 )
 else()
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/BuildVersion.h
 "#pragma once
 
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 8
-#define VERSION_BUILDNUM 601
+#define VERSION_MAJOR ${VERSION_MAJOR}
+#define VERSION_MINOR ${VERSION_MINOR}
+#define VERSION_BUILDNUM ${VERSION_BUILDNUM}
+#define VERSION_LOCALBUILDNUM 602
 "
 )
 endif()
diff --git a/GeneralsMD/Code/GameEngine/CMakeLists.txt b/GeneralsMD/Code/GameEngine/CMakeLists.txt
@@ -1156,6 +1156,7 @@ target_include_directories(z_gameengine PUBLIC
 
 target_include_directories(z_gameengine PRIVATE
     Include/Precompiled
+    ${CMAKE_BINARY_DIR}/GeneralsMD/Code/Main
 )
 
 target_link_libraries(z_gameengine PRIVATE
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -40,6 +40,7 @@
 #include "Common/GameLOD.h"
 #include "Common/Registry.h"
 #include "Common/version.h"
+#include "GeneratedVersion.h"
 
 #include "GameClient/ClientInstance.h"
 #include "GameClient/GameClient.h"
@@ -1492,7 +1493,9 @@ void OptionsMenuInit( WindowLayout *layout, void *userData )
 	}
 	else
 	{
-		GadgetStaticTextSetText( labelVersion, versionString );
+	    UnicodeString fullVersion;
+        fullVersion.format(L"%s - TheSuperHackers %s", versionString.str(), SUPERHACKERS_VERSION_WIDE);
+        GadgetStaticTextSetText(labelVersion, fullVersion);
 	}
 
 
diff --git a/GeneralsMD/Code/Main/CMakeLists.txt b/GeneralsMD/Code/Main/CMakeLists.txt
@@ -26,23 +26,37 @@ target_link_libraries(z_generals PRIVATE
     zi_always
 )
 
+if(EXISTS "${CMAKE_SOURCE_DIR}/next_tag.txt")
+    file(READ "${CMAKE_SOURCE_DIR}/next_tag.txt" GAME_VERSION)
+    string(STRIP "${GAME_VERSION}" GAME_VERSION)
+    string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" _ "${GAME_VERSION}")
+    set(VERSION_MAJOR "${CMAKE_MATCH_1}")
+    set(VERSION_MINOR "${CMAKE_MATCH_2}")
+    set(VERSION_BUILDNUM "${CMAKE_MATCH_3}")
+else()
+    set(VERSION_MAJOR "1")
+    set(VERSION_MINOR "4")
+    set(VERSION_BUILDNUM "601")
+endif()
+
 # TODO Originally referred to build host and user, replace with git info perhaps?
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/GeneratedVersion.h
 "#pragma once
 
-#define VERSION_LOCALBUILDNUM 0
-#define VERSION_BUILDUSER \"Someone\"
-#define VERSION_BUILDLOC \"Someplace\"
+#define VERSION_BUILDUSER \"TheSuperHackers\"
+#define VERSION_BUILDLOC \"GitHub\"
+#define SUPERHACKERS_VERSION_WIDE L\"${GAME_VERSION}\"
 "
 )
 
 # Based on original binary values for these variables.
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/BuildVersion.h
 "#pragma once
 
-#define VERSION_MAJOR 1
-#define VERSION_MINOR 4
-#define VERSION_BUILDNUM 601
+#define VERSION_MAJOR ${VERSION_MAJOR}
+#define VERSION_MINOR ${VERSION_MINOR}
+#define VERSION_BUILDNUM ${VERSION_BUILDNUM}
+#define VERSION_LOCALBUILDNUM 9001 // it's over 9000!
 "
 )
 

Original file line number	Diff line number	Diff line change
`@@ -1077,6 +1077,7 @@ target_include_directories(g_gameengine PUBLIC`
`1077`	`1077`
`1078`	`1078`	`target_include_directories(g_gameengine PRIVATE`
`1079`	`1079`	`Include/Precompiled`
	`1080`	`+ ${CMAKE_BINARY_DIR}/Generals/Code/Main`
`1080`	`1081`	`)`
`1081`	`1082`
`1082`	`1083`	`target_link_libraries(g_gameengine PRIVATE`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`#include "Common/GameLOD.h"`
`41`	`41`	`#include "Common/Registry.h"`
`42`	`42`	`#include "Common/version.h"`
	`43`	`+#include "GeneratedVersion.h"`
`43`	`44`
`44`	`45`	`#include "GameClient/ClientInstance.h"`
`45`	`46`	`#include "GameClient/GameClient.h"`
`@@ -1426,7 +1427,9 @@ void OptionsMenuInit( WindowLayout layout, void userData )`
`1426`	`1427`	`}`
`1427`	`1428`	`else`
`1428`	`1429`	`{`
`1429`		`- GadgetStaticTextSetText( labelVersion, versionString );`
	`1430`	`+ UnicodeString fullVersion;`
	`1431`	`+ fullVersion.format(L"%s - TheSuperHackers %s", versionString.str(), SUPERHACKERS_VERSION_WIDE);`
	`1432`	`+ GadgetStaticTextSetText(labelVersion, fullVersion);`
`1430`	`1433`	`}`
`1431`	`1434`
`1432`	`1435`
Original file line number	Diff line number	Diff line change
`@@ -1156,6 +1156,7 @@ target_include_directories(z_gameengine PUBLIC`
`1156`	`1156`
`1157`	`1157`	`target_include_directories(z_gameengine PRIVATE`
`1158`	`1158`	`Include/Precompiled`
	`1159`	`+ ${CMAKE_BINARY_DIR}/GeneralsMD/Code/Main`
`1159`	`1160`	`)`
`1160`	`1161`
`1161`	`1162`	`target_link_libraries(z_gameengine PRIVATE`