Merge pull request #4732 from rjhancock/duplicate-script-config

Updated Adoptium URL, remove duplicate startup scripts, updated Sentry
MegaMek · Aug 28, 2024 · a57bcf8 · a57bcf8
2 parents bfeef18 + e9f9072
commit a57bcf8
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/MekHQ/build.gradle b/MekHQ/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'edu.sc.seis.launch4j' version '3.0.6'
     id 'jacoco'
     id 'java'
-    id "io.sentry.jvm.gradle" version "4.10.0"
+    id "io.sentry.jvm.gradle" version "4.11.0"
     id 'com.palantir.git-version' version '3.1.0'
 }
 
@@ -140,15 +140,6 @@ task stageFiles(type: Copy) {
     dependsOn gradle.includedBuild('megamek').task(':megamek:generateDynamicFiles')
     dependsOn gradle.includedBuild('megameklab').task(':megameklab:generateDynamicFiles')
 
-    dependsOn gradle.includedBuild('megamek').task(':megamek:stageFiles')
-    dependsOn gradle.includedBuild('megamek').task(':megamek:createStartScripts')
-
-    dependsOn gradle.includedBuild('megameklab').task(':megameklab:stageFiles')
-    dependsOn gradle.includedBuild('megameklab').task(':megameklab:createStartScripts')
-
-    dependsOn gradle.includedBuild('megamek').task(':megamek:createAllExecutables')
-    dependsOn gradle.includedBuild('megameklab').task(':megameklab:createAllExecutables')
-
     from projectDir
     include "${campaigns}/"
     include "${data}/fonts/"
@@ -306,23 +297,31 @@ launch4j {
     jarTask = project.tasks.jar
     windowTitle = 'MekHQ'
     internalName = 'MekHQ'
-    downloadUrl = 'https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium'
+    downloadUrl = 'https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium-(Eclipse-Temurin-Open-Source-Java)'
     supportUrl = 'https://megamek.org'
     copyright = '2024 MegaMek Development Team.'
     trademarks = 'MechWarrior, BattleMech, `Mech and Aerotech - The The Topps Company, Inc. Catalyst Game Labs - InMediaRes Productions, LLC.'
     companyName = "MegaMek Development Team"
     jreMinVersion = '17'
     dontWrapJar = true
-    messagesJreVersionError = 'We require a Java Runtime of version 17 or higher installed. https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium'
-    messagesJreNotFoundError = 'Go here for instructions on installing the correct version of Java: https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium'
+    messagesJreVersionError = 'We require a Java Runtime of version 17 or higher installed. https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium-(Eclipse-Temurin-Open-Source-Java)'
+    messagesJreNotFoundError = 'Go here for instructions on installing the correct version of Java: https://github.com/MegaMek/megamek/wiki/Updating-to-Adoptium-(Eclipse-Temurin-Open-Source-Java)'
 }
 
 tasks.register("packagePrepWork") {
     description = 'General Catch All for all distributions'
     dependsOn stageFiles
-    dependsOn createStartScripts
     dependsOn startScripts
+    dependsOn createStartScripts
     dependsOn createAllExecutables
+    dependsOn gradle.includedBuild('megamek').task(':megamek:stageFiles')
+    dependsOn gradle.includedBuild('megameklab').task(':megameklab:stageFiles')
+    dependsOn gradle.includedBuild('megamek').task(':megamek:startScripts')
+    dependsOn gradle.includedBuild('megameklab').task(':megameklab:startScripts')
+    dependsOn gradle.includedBuild('megamek').task(':megamek:createStartScripts')
+    dependsOn gradle.includedBuild('megameklab').task(':megameklab:createStartScripts')
+    dependsOn gradle.includedBuild('megamek').task(':megamek:createAllExecutables')
+    dependsOn gradle.includedBuild('megameklab').task(':megameklab:createAllExecutables')
 }
 
 distTar {