Skip to content

Commit

Permalink
Merge pull request #2570 from Windchild292/dev_Windchild_2569
Browse files Browse the repository at this point in the history
2569: Adding userdata to the build script
  • Loading branch information
Windchild292 authored May 4, 2021
2 parents 4963c60 + f322922 commit 132b80e
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions MekHQ/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ mainClassName = 'mekhq.MekHQ'

ext {
jvmOptions = ['-Xmx1024m']
userdata='userdata'
data = 'data'
conf = 'mmconf'
log = 'logs'
Expand Down Expand Up @@ -179,6 +180,7 @@ task stageFiles(type: Copy) {
include "${data}/stratconfacilities/"
include "${project.ext.plugins}/"
include "${campaigns}/"
include "${userdata}/"
include 'license.txt'
include 'SubmitBug.html'

Expand Down Expand Up @@ -363,7 +365,7 @@ createExe {
jar = "${project.tasks.getByName("jar").archiveFile.get()}"
icon = "${projectDir}/data/images/misc/mekhq.ico"
internalName = 'MekHQ'
classpath = ["lib/${mmJar.archiveFileName.get()}", "lib/${mmlJar.archiveFileName.get()}"] + project.sourceSets.main.runtimeClasspath.files
classpath = ["lib/${mmJar.archiveFileName.get()}", "lib/${mmlJar.archiveFileName.get()}"] + project.sourceSets.main.runtimeClasspath.files
.findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek")}
.collect { "${lib}/${it.name}" }
def inifile = outfile.replace('.exe', '.l4j.ini')
Expand All @@ -382,7 +384,7 @@ task createMMExe (type: Launch4jLibraryTask, dependsOn: mmJar) {
outfile = 'MegaMek.exe'
mainClassName = 'megamek.MegaMek'
jar = "lib/${mmJar.archiveFileName.get()}"
classpath = project.sourceSets.main.runtimeClasspath.files
classpath = project.sourceSets.main.runtimeClasspath.files
.findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek")}
.collect { "${lib}/${it.name}" }
icon = "${mmDir}/megamek/data/images/misc/megamek.ico"
Expand All @@ -404,7 +406,7 @@ task createMMLExe (type: Launch4jLibraryTask, dependsOn: mmlJar) {
outfile = 'MegaMekLab.exe'
mainClassName = 'megameklab.com.MegaMekLab'
jar = "lib/${mmlJar.archiveFileName.get()}"
classpath = ["lib/${mmJar.archiveFileName.get()}"] + project.sourceSets.main.runtimeClasspath.files
classpath = ["lib/${mmJar.archiveFileName.get()}"] + project.sourceSets.main.runtimeClasspath.files
.findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek")}
.collect { "${lib}/${it.name}" }
icon = "${mmlDir}/data/images/misc/megameklab.ico"
Expand Down

0 comments on commit 132b80e

Please sign in to comment.