Merge pull request MegaMek#5658 from rjhancock/windows-ci-fix

Fix for Windows Build

.github/workflows/nightly-ci.yml

@@ -21,7 +21,7 @@ jobs:
     # Run this job once for each combination in the matrix below.
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
         java-distribution: [temurin]
         java-version: [17]
       fail-fast: false
@@ -61,17 +61,15 @@ jobs:
       # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
       - name: Upload Nix/Mac Releases
         uses: actions/upload-artifact@v4
-        if: always() && matrix.os == 'ubuntu-latest'
         with:
           name: mm-release-nix-mac-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
-          path: megamek/megamek/build/distributions/*.tar.gz
+          path: megamek/megamek/build/distributions/megamek-0*.tar.gz
 
       # Put the Windows Release in an artifact
       #
       # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
       - name: Upload Windows Release
         uses: actions/upload-artifact@v4
-        if: always() && matrix.os == 'windows-latest'
         with:
           name: mm-release-win-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
           path: megamek/megamek/build/distributions/megamek-windows-*.zip

.github/workflows/validate-namechanges.yml

@@ -44,7 +44,7 @@ jobs:
 
       - name: Build with Gradle
         working-directory: megamek
-        run: ./gradlew jar
+        run: ./gradlew build
 
       - name: Validate Name Changes
         working-directory: megamek

megamek/build.gradle

@@ -189,7 +189,7 @@ task stageFiles {
 task createStartScripts (type: CreateStartScripts) {
     description = 'Create shell script for generic distribution.'
     applicationName = 'mm'
-    mainClass = project.mainClassName
+    mainClass = application.mainClass
     outputDir = startScripts.outputDir
     classpath = jar.outputs.files + files(project.sourceSets.main.runtimeClasspath.files)
             .filter { it.name.endsWith(".jar") }
@@ -242,18 +242,26 @@ distributions {
 
 createExe {
     description = 'Create Windows executable that wraps MM jar'
-    mainClassName = project.mainClassName
+    mainClassName = application.mainClass
     outfile = 'MegaMek.exe'
+    def iniFile = 'MegaMek.l4j.ini'
     icon = "${projectDir}/data/images/misc/megamek.ico"
     jarTask = project.tasks.jar
-    downloadUrl = 'https://adoptium.net/temurin/releases/?os=windows&arch=x64'
+    downloadUrl = 'https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium'
     supportUrl = 'https://megamek.org'
     copyright = '2024 MegaMek Development Team'
     companyName = "MegaMek Development Team"
     outputs.file "${buildDir}/launch4j/${outfile}"
+    outputs.file "${buildDir}/launch4j/${iniFile}"
     jvmOptions = project.ext.mmJvmOptions
     jreMinVersion = '17'
     messagesJreNotFoundError = 'Go here for instructions on installing the correct version of Java: https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium'
+    doLast {
+        new File("${buildDir}/launch4j/${iniFile}").text = """# Launch4j runtime config
+# you can add arguments here that will be processed by the JVM at runtime
+${project.ext.mmJvmOptions.join('\n')}
+"""
+    }
 }
 
 windowsDistZip {