Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finalized build scripts

Browse Source
This commit is contained in:
Anuken
2019-08-21 15:34:01 -04:00
parent 4bb6a25055
commit 0553fb6b79
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -318,7 +318,7 @@ project(":net"){
task deployAll{ task deployAll{
task cleanDeployOutput{ task cleanDeployOutput{
doFirst{ doFirst{
if("${getBuildVersion()}" == "custom build") throw new IllegalArgumentException("----\n\nSET A BUILD NUMBER FIRST!\n\n----") if("${getBuildVersion()}" == "custom build" || "${getBuildVersion()}" == "") throw new IllegalArgumentException("----\n\nSET A BUILD NUMBER FIRST!\n\n----")
if(!project.hasProperty("release")) throw new IllegalArgumentException("----\n\nSET THE RELEASE PROJECT PROPERTY FIRST!\n\n----") if(!project.hasProperty("release")) throw new IllegalArgumentException("----\n\nSET THE RELEASE PROJECT PROPERTY FIRST!\n\n----")
delete{ delete{

19
desktop-sdl/build.gradle
View File

@@ -118,7 +118,7 @@ PackrConfig.Platform.values().each{ platform ->
} }
copy{ copy{
into "build/packr/output" into "build/packr/output/jre"
rename("$appName-${platformName}.jar", "desktop.jar") rename("$appName-${platformName}.jar", "desktop.jar")
from "build/libs/$appName-${platformName}.jar" from "build/libs/$appName-${platformName}.jar"
} }
@@ -136,7 +136,7 @@ PackrConfig.Platform.values().each{ platform ->
removePlatformLibs = ["desktop-sdl/build/packr/desktop.jar"] removePlatformLibs = ["desktop-sdl/build/packr/desktop.jar"]
vmArgs = ["Djava.net.preferIPv4Stack=true"] vmArgs = ["Djava.net.preferIPv4Stack=true"]
minimizeJre = "../desktop/packr_minimize.json" minimizeJre = "desktop/packr_minimize.json"
jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip" jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip"
if(platform == PackrConfig.Platform.MacOS){ if(platform == PackrConfig.Platform.MacOS){
@@ -146,9 +146,22 @@ PackrConfig.Platform.values().each{ platform ->
new Packr().pack(config) new Packr().pack(config)
if(platform == PackrConfig.Platform.Linux64){
copy{
into "build/packr/output/jre/"
from "build/packr/output/desktop.jar"
}
delete{
delete "build/packr/output/desktop.jar"
}
file("build/packr/output/config.json").text = file("build/packr/output/config.json").text.replace("desktop.jar", "jre/desktop.jar")
}
if(platform == PackrConfig.Platform.MacOS){ if(platform == PackrConfig.Platform.MacOS){
copy{ copy{
into "build/packr/" + appName + ".app/Contents/" into "build/packr/${appName}.app/Contents/"
from "build/packr/Contents/" from "build/packr/Contents/"
} }