From 2fd6d3bb2c615e2b32de9eb8b4895393343287c6 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Tue, 17 Nov 2020 20:09:00 -0800 Subject: [PATCH] Changed assets path to be relative to rootProject directory --- desktop/build.gradle | 16 ++++------------ ds1viewer/build.gradle | 7 ++++--- mpqviewer/build.gradle | 7 ++++--- server/d2gs/build.gradle | 7 ++++--- server/netty/build.gradle | 7 ++++--- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index a99896aa..249af8f5 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -4,8 +4,9 @@ import org.apache.tools.ant.taskdefs.condition.Os [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' +sourceSets.main.resources.srcDirs += [ rootProject.file('assets').path ] + project.ext.mainClassName = 'com.riiablo.DesktopLauncher' -project.ext.assetsDir = new File('../assets'); dependencies { implementation project(':core') @@ -22,27 +23,18 @@ task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName classpath = sourceSets.main.runtimeClasspath standardInput = System.in - workingDir = project.assetsDir + workingDir = rootProject.file('assets').path ignoreExitValue = true if(Os.isFamily(Os.FAMILY_MAC)) jvmArgs += "-XstartOnFirstThread" } -task debug(dependsOn: classes, type: JavaExec) { - main = project.mainClassName - classpath = sourceSets.main.runtimeClasspath - standardInput = System.in - workingDir = project.assetsDir - ignoreExitValue = true - debug = true -} - task dist(dependsOn: classes, type: Jar) { from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) from {configurations.compile.collect {zipTree(it)}} - from files(project.assetsDir); + from files(rootProject.file('assets').path); manifest { attributes 'Main-Class': project.mainClassName diff --git a/ds1viewer/build.gradle b/ds1viewer/build.gradle index cc6d7465..59545283 100644 --- a/ds1viewer/build.gradle +++ b/ds1viewer/build.gradle @@ -4,8 +4,9 @@ import org.apache.tools.ant.taskdefs.condition.Os [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' +sourceSets.main.resources.srcDirs += [ rootProject.file('assets').path ] + project.ext.mainClassName = 'com.riiablo.map.DS1Viewer' -project.ext.assetsDir = new File('../assets'); project.ext.visuiVersion = '1.4.0' dependencies { @@ -21,7 +22,7 @@ task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName classpath = sourceSets.main.runtimeClasspath standardInput = System.in - workingDir = project.assetsDir + workingDir = rootProject.file('assets').path ignoreExitValue = true if(Os.isFamily(Os.FAMILY_MAC)) @@ -32,7 +33,7 @@ task dist(dependsOn: classes, type: Jar) { from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) from { configurations.compile.collect { zipTree(it) } } - from files(project.assetsDir); + from files(rootProject.file('assets').path); manifest { attributes 'Main-Class': project.mainClassName diff --git a/mpqviewer/build.gradle b/mpqviewer/build.gradle index fe6cd1e7..c3362b1a 100644 --- a/mpqviewer/build.gradle +++ b/mpqviewer/build.gradle @@ -4,8 +4,9 @@ import org.apache.tools.ant.taskdefs.condition.Os [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' +sourceSets.main.resources.srcDirs += [ file('assets').path ] + project.ext.mainClassName = 'com.riiablo.mpq.MPQViewer' -project.ext.assetsDir = new File('assets'); project.ext.visuiVersion = '1.4.2' dependencies { @@ -21,7 +22,7 @@ task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName classpath = sourceSets.main.runtimeClasspath standardInput = System.in - workingDir = project.assetsDir + workingDir = file('assets').path ignoreExitValue = true if(Os.isFamily(Os.FAMILY_MAC)) @@ -32,7 +33,7 @@ task dist(dependsOn: classes, type: Jar) { from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) from {configurations.compile.collect {zipTree(it)}} - from files(project.assetsDir); + from files(file('assets').path); manifest { attributes 'Main-Class': project.mainClassName diff --git a/server/d2gs/build.gradle b/server/d2gs/build.gradle index 6868691c..3f90bbca 100644 --- a/server/d2gs/build.gradle +++ b/server/d2gs/build.gradle @@ -4,14 +4,15 @@ import org.apache.tools.ant.taskdefs.condition.Os [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' +sourceSets.main.resources.srcDirs += [ rootProject.file('assets').path ] + project.ext.mainClassName = 'com.riiablo.server.d2gs.D2GS' -project.ext.assetsDir = new File('../../assets'); task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName classpath = sourceSets.main.runtimeClasspath standardInput = System.in - workingDir = project.assetsDir + workingDir = rootProject.file('assets').path ignoreExitValue = true if(Os.isFamily(Os.FAMILY_MAC)) @@ -22,7 +23,7 @@ task dist(dependsOn: classes, type: Jar) { from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) from {configurations.compile.collect {zipTree(it)}} - from files(project.assetsDir); + from files(rootProject.file('assets').path); manifest { attributes 'Main-Class': project.mainClassName diff --git a/server/netty/build.gradle b/server/netty/build.gradle index 2101c4a6..cf7a9f4c 100644 --- a/server/netty/build.gradle +++ b/server/netty/build.gradle @@ -4,14 +4,15 @@ import org.apache.tools.ant.taskdefs.condition.Os [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' +sourceSets.main.resources.srcDirs += [ rootProject.file('assets').path ] + project.ext.mainClassName = 'com.riiablo.server.d2gs.Main' -project.ext.assetsDir = new File("../../assets"); task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName classpath = sourceSets.main.runtimeClasspath standardInput = System.in - workingDir = project.assetsDir + workingDir = rootProject.file('assets').path ignoreExitValue = true } @@ -19,7 +20,7 @@ task dist(dependsOn: classes, type: Jar) { from files(sourceSets.main.output.classesDirs) from files(sourceSets.main.output.resourcesDir) from {configurations.compile.collect {zipTree(it)}} - from files(project.assetsDir); + from files(rootProject.file('assets').path); manifest { attributes 'Main-Class': project.mainClassName