diff --git a/android/build.gradle b/android/build.gradle index 202558c172..e24bbab771 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -46,7 +46,7 @@ task deploy(type: Copy){ from "build/outputs/apk/release/android-release.apk" into "../deploy/" - rename("android-release.apk", appName + "-android-" + getVersionString() + ".apk") + rename("android-release.apk", "${generateDeployName('android')}.apk") } android{ diff --git a/build.gradle b/build.gradle index be4710374e..f6b7aa6cc6 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ allprojects{ ext{ versionNumber = '4' - versionModifier = 'beta' + versionModifier = 'release' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' gdxVersion = '1.9.10' @@ -57,11 +57,36 @@ allprojects{ } } + generateDeployName = { String platform -> + if(platform == "windows"){ + platform += "64" + } + platform = platform.capitalize() + + if(platform.endsWith("64") || platform.endsWith("32")){ + platform = "${platform.substring(0, platform.length() - 2)}-${platform.substring(platform.length() - 2)}bit" + } + + return "[${platform}]${getModifierString()}[${getNeatVersionString()}]${appName}.zip" + } + getVersionString = { String buildVersion = getBuildVersion() return "$versionNumber-$versionModifier-$buildVersion" } + getNeatVersionString = { + String buildVersion = getBuildVersion() + return "v$buildVersion" + } + + getModifierString = { + if(versionModifier != "release"){ + return "[${versionModifier.toUpperCase()}]" + } + return "" + } + getBuildVersion = { if(!project.hasProperty("buildversion")) return "custom build" return project.getProperties()["buildversion"] diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 464615b35b..5f19cec78d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -46,6 +46,7 @@ newgame = New Game none = minimap = Minimap close = Close +website = Website quit = Quit maps = Maps continue = Continue diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 652ad8f0a8..0840b6afeb 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -44,6 +44,7 @@ newgame = Новая игра none = <ничего> minimap = Мини-карта close = Закрыть +website = Веб-сайт quit = Выход maps = Карты continue = Продолжить diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 1be2029876..6f6dd9ec8f 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -101,7 +101,7 @@ public class MenuFragment extends Fragment{ join = new MobileButton("icon-add", isize, "$joingame", ui.join::show), editor = new MobileButton("icon-editor", isize, "$editor", ui.maps::show), tools = new MobileButton("icon-tools", isize, "$settings", ui.settings::show), - donate = new MobileButton("icon-donate", isize, "$donate", () -> Core.net.openURI(donationURL)), + donate = new MobileButton("icon-link", isize, "$website", () -> Core.net.openURI("https://anuke.itch.io/mindustry")), exit = new MobileButton("icon-exit", isize, "$quit", () -> Core.app.exit()); if(!Core.graphics.isPortrait()){ diff --git a/desktop-sdl/build.gradle b/desktop-sdl/build.gradle index 5d0b78ffca..006fda77da 100644 --- a/desktop-sdl/build.gradle +++ b/desktop-sdl/build.gradle @@ -51,7 +51,7 @@ task ikZip(type: Zip){ def filename = "$appName-${getTarget()}-${version}" from "build/libs/$filename" - archiveName = "$appName-${getTarget()}-${getVersionString()}.zip" + archiveName = "${generateDeployName(getTarget())}.zip" } task ikdist{ diff --git a/desktop/build.gradle b/desktop/build.gradle index 97449ed185..65139a81c3 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -169,7 +169,7 @@ task packrZip(){ task rzip(type: Zip){ from "packr-out/" - archiveName "$appName-${getPlatform()}-${getVersionString()}.zip" + archiveName "${generateDeployName(getPlatform().toString())}.zip" destinationDir(file("packr-export")) } diff --git a/server/build.gradle b/server/build.gradle index 8e7f98fafc..0118bb0f76 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -51,7 +51,7 @@ task dist(type: Jar){ task dzip(type: Zip){ from getServerFolder() - archiveName "$appName-server-${getVersionString()}.zip" + archiveName "${generateDeployName('server')}.zip" destinationDir(file("../deploy/")) finalizedBy 'cleanup'