diff --git a/.travis.yml b/.travis.yml index 171280c268..f0586c145c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ deploy: api_key: secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg= file: - - desktop/build/libs/desktop-release.jar + - desktop/build/libs/Mindustry.jar - server/build/libs/server-release.jar on: repo: Anuken/Mindustry diff --git a/README.md b/README.md index 791a99452b..b0ec7c49e3 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, --- Gradle may take up to several minutes to download files. Be patient.
-After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds. +After building, the output .JAR file should be in `/desktop/build/libs/Mindustry.jar` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds. ### Downloads diff --git a/desktop/build.gradle b/desktop/build.gradle index 26392656d2..db32ac4599 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -32,35 +32,32 @@ task run(dependsOn: classes, type: JavaExec){ } } -["Windows", "Linux", "Mac", "All"].each{ target -> - task "dist$target"(type: Jar, dependsOn: classes){ - from files(sourceSets.main.output.classesDirs) - from files(sourceSets.main.output.resourcesDir) - from {configurations.compile.collect {zipTree(it)}} - from files(project.assetsDir) - if(target.contains("windows")) exclude('**.so', "**.dylib") - if(target == "mac") exclude('**.so', "**.dll") - if(target == "linux") exclude('**.dll', "**.dylib") - archiveName = "$appName-${target}.jar" +task dist(type: Jar, dependsOn: classes){ + from files(sourceSets.main.output.classesDirs) + from files(sourceSets.main.output.resourcesDir) + from {configurations.compile.collect {zipTree(it)}} + from files(project.assetsDir) - manifest{ - attributes 'Main-Class': project.mainClassName - } + archiveName = "${appName}.jar" + + manifest{ + attributes 'Main-Class': project.mainClassName } } + PackrConfig.Platform.values().each{ platform -> task "packr${platform.toString()}"{ def platformName = platform.toString().replace('64', '').replace('32', '').replace('MacOS', 'Mac') - dependsOn "dist$platformName" + dependsOn dist doLast{ copy{ into "build/packr/" - rename("$appName-${platformName}.jar", "desktop.jar") - from "build/libs/$appName-${platformName}.jar" + rename("${appName}.jar", "desktop.jar") + from "build/libs/${appName}.jar" } delete{ @@ -75,8 +72,8 @@ PackrConfig.Platform.values().each{ platform -> copy{ into "build/packr/output/jre" - rename("$appName-${platformName}.jar", "desktop.jar") - from "build/libs/$appName-${platformName}.jar" + rename("${appName}.jar", "desktop.jar") + from "build/libs/${appName}.jar" } }else{ def config = new PackrConfig()