chore: add build script for releases (#29)

Author: michaeloliverx

.github/workflows/build.yml

@@ -1,10 +1,22 @@
-name: Build
+name: Build and Release
 
 on:
   pull_request:
     types: [opened, reopened, synchronize, closed]
     branches:
       - main
+  workflow_dispatch:
+    inputs:
+      prerelease:
+        description: 'Is this a pre-release?'
+        required: true
+        type: boolean
+        default: false
+
+# Add permissions needed for creating releases
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   install:
@@ -13,6 +25,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch all history for proper commit counting
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -63,5 +77,29 @@ jobs:
           Start-Process -FilePath "xbox360_sdk.exe" -ArgumentList "/U", "/T full" -Wait
 
       - name: Build Plugin
+        id: build
         run: |
-          C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe "iw3xe.sln"
+          # Get commit count
+          $commitCount = git rev-list --count HEAD
+          echo "BUILD_NUMBER=$commitCount" >> $env:GITHUB_OUTPUT
+          
+          # Build using build.py which will use the same commit count
+          python build.py
+          
+          echo "ZIP_FILE=iw3xe-${commitCount}.zip" >> $env:GITHUB_OUTPUT
+        shell: pwsh
+      
+      - name: Create Release
+        if: github.event_name == 'workflow_dispatch'
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: v${{ steps.build.outputs.BUILD_NUMBER }}
+          name: Release v${{ steps.build.outputs.BUILD_NUMBER }}
+          draft: false
+          prerelease: ${{ github.event.inputs.prerelease }}
+          generate_release_notes: true
+          files: |
+            build/${{ steps.build.outputs.ZIP_FILE }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -31,6 +31,7 @@ bld/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
+build/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/

build.py

@@ -0,0 +1,95 @@
+import os
+import subprocess
+import shutil
+
+# Configuration
+SOLUTION_FILE = "iw3xe.sln"
+MSBUILD_PATH = r"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe"
+BINARY_PATH = r"build\Release\bin\iw3xe.xex"
+STAGING_DIR = r"build\staging"
+RESOURCES_PATH = r"resources\xenia"
+GAME_TITLE_ID = "415607E6"
+
+
+def count_commits():
+    try:
+        result = subprocess.run(
+            ["git", "rev-list", "--count", "HEAD"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+
+        # Get the commit count from the command output
+        commit_count = result.stdout.strip()
+
+        print(f"Total number of commits in the current branch: {commit_count}")
+        return commit_count
+    except Exception as e:
+        print(f"An error occurred: {e}")
+        exit(1)
+
+
+# Ensure MSBuild exists
+if not os.path.exists(MSBUILD_PATH):
+    print(f"ERROR: MSBuild not found at {MSBUILD_PATH}")
+    exit(1)
+
+VERSION_HEADER_PATH = r"src\version.h"
+BUILD_NUMBER = count_commits()
+
+print("Generating version.h with build metadata...")
+with open(VERSION_HEADER_PATH, "w") as version_file:
+    version_file.write("// Auto-generated version header\n")
+    version_file.write("#pragma once\n\n")
+    version_file.write(f"#define BUILD_NUMBER {BUILD_NUMBER}\n")
+
+result = subprocess.run([MSBUILD_PATH, SOLUTION_FILE], stdout=subprocess.DEVNULL)
+if result.returncode != 0:
+    print("ERROR: Build failed.")
+    exit(result.returncode)
+else:
+    print("Build succeeded.")
+
+print("Creating clean staging directory...")
+if os.path.exists(STAGING_DIR):
+    shutil.rmtree(STAGING_DIR)
+os.makedirs(STAGING_DIR, exist_ok=True)
+
+
+if os.path.exists(RESOURCES_PATH):
+    # Copy the entire xenia directory and its contents to the staging directory
+    shutil.copytree(RESOURCES_PATH, os.path.join(STAGING_DIR, "xenia"))
+    print("Resources copied successfully")
+else:
+    print(f"Resources directory not found at {RESOURCES_PATH}")
+    exit(1)
+
+print("Copying binary to staging directory...")
+shutil.copy2(
+    BINARY_PATH,
+    os.path.join(STAGING_DIR, "xenia", "plugins", GAME_TITLE_ID, "iw3xe.xex"),
+)
+
+
+print("Copying mods/codjumper to staging/raw directory...")
+MODS_PATH = r"mods\codjumper"
+RAW_DIR = os.path.join(STAGING_DIR, "raw")
+if os.path.exists(MODS_PATH):
+    os.makedirs(RAW_DIR, exist_ok=True)
+    shutil.copytree(MODS_PATH, RAW_DIR, dirs_exist_ok=True)
+    print("Mods copied successfully to staging/raw")
+else:
+    print(f"Mods directory not found at {MODS_PATH}")
+    exit(1)
+
+
+PROJECT_NAME = "iw3xe"
+ZIP_FILE_NAME = f"{PROJECT_NAME}-{BUILD_NUMBER}.zip"
+STAGING_ZIP_PATH = os.path.join("build", ZIP_FILE_NAME)
+
+print("Zipping the staging folder...")
+shutil.make_archive(
+    base_name=STAGING_ZIP_PATH.replace(".zip", ""), format="zip", root_dir=STAGING_DIR
+)
+print(f"Staging folder zipped successfully to {STAGING_ZIP_PATH}")

src/game/mp_main.cpp

@@ -15,6 +15,7 @@
 #include "../detour.h"
 #include "../filesystem.h"
 #include "../xboxkrnl.h"
+#include "../version.h"
 
 // Structure to hold data for the active keyboard request
 struct KeyboardRequest
@@ -1800,11 +1801,15 @@ namespace mp
     {
         const char *branding = "IW3xe";
         const char *build = __DATE__ " " __TIME__;
+        char brandingWithBuild[256];
+
+        // Combine branding and build number
+        _snprintf(brandingWithBuild, sizeof(brandingWithBuild), "%s (Build %d)", branding, BUILD_NUMBER);
 
         static Font_s *font = (Font_s *)R_RegisterFont("fonts/consoleFont");
         float color[4] = {1.0, 1.0, 1.0, 0.4};
 
-        R_AddCmdDrawText(branding, 256, font, 10, 20, 1.0, 1.0, 0.0, color, 0);
+        R_AddCmdDrawText(brandingWithBuild, 256, font, 10, 20, 1.0, 1.0, 0.0, color, 0);
         R_AddCmdDrawText(build, 256, font, 10, 40, 1.0, 1.0, 0.0, color, 0);
     }
 

src/version.h

@@ -0,0 +1,4 @@
+// Auto-generated version header
+#pragma once
+
+#define BUILD_NUMBER 0