AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-03 20:48:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #4970 - Removed MacOS release due to problems

Browse Source
This commit is contained in:
yairm210 2021-08-23 20:35:20 +03:00
parent 8ef0dc99e9
commit a0e0cccea8
2 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/buildAndDeploy.yml vendored
View File

@ -126,9 +126,11 @@ jobs:
./gradlew desktop:packrWindows32
./butler push deploy/Unciv-Windows32.zip yairm210/unciv:Windows32 --userversion ${{steps.tag.outputs.tag}}
wget -q -O jre-macOS.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz
./gradlew desktop:packrMacOS
./butler push deploy/Unciv-MacOS.zip yairm210/unciv:MacOS --userversion ${{steps.tag.outputs.tag}}
# MacOS bundles correctly but does not run as intended, see https://github.com/yairm210/Unciv/issues/4970
# Disabled until this can be checked by sommeone who actually has a Mac computer
# wget -q -O jre-macOS.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz
# ./gradlew desktop:packrMacOS
# ./butler push deploy/Unciv-MacOS.zip yairm210/unciv:MacOS --userversion ${{steps.tag.outputs.tag}}
wget -q -O jdk-windows-64.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip
./gradlew desktop:packrWindows64

42
desktop/build.gradle.kts
View File

@ -1,11 +1,6 @@
import com.badlogicgames.packr.Packr
import com.badlogicgames.packr.PackrConfig
import com.unciv.build.BuildConfig
import groovy.util.Node
import groovy.util.XmlNodePrinter
import groovy.util.XmlParser
import java.io.FileWriter
import java.io.PrintWriter
plugins {
@ -77,10 +72,6 @@ for(platform in PackrConfig.Platform.values()) {
val config = PackrConfig()
config.platform = platform
if (platform == PackrConfig.Platform.Linux32 || platform == PackrConfig.Platform.Linux64)
config.jdk = "jdk-linux-64.zip"
// take the jdk straight from the building linux computer
if (platform == PackrConfig.Platform.Windows64)
config.jdk = "jdk-windows-64.zip" // see how we download and name this in travis yml
if (platform == PackrConfig.Platform.Windows32)
@ -120,8 +111,9 @@ for(platform in PackrConfig.Platform.values()) {
// Requires that both packr and the linux jre are downloaded, as per buildAndDeploy.yml, "Upload to itch.io"
if (platform == PackrConfig.Platform.Linux64 || platform == PackrConfig.Platform.MacOS) {
val jdkFile = if (platform == PackrConfig.Platform.Linux64) "jre-linux-64.tar.gz"
else "jre-macOS.tar.gz"
val jdkFile =
if (platform == PackrConfig.Platform.Linux64) "jre-linux-64.tar.gz"
else "jre-macOS.tar.gz"
val platformNameForPackrCmd =
if (platform == PackrConfig.Platform.Linux64) "linux64"
else "mac"
@ -152,31 +144,3 @@ tasks.register<Zip>("zipLinuxFilesForJar") {
from(file("linuxFilesForJar"))
destinationDirectory.set(deployFolder)
}
tasks.register("packr") {
for(platform in PackrConfig.Platform.values())
finalizedBy("packr$platform")
}
eclipse {
project {
name = "${BuildConfig.appName}-desktop"
linkedResource(mapOf("name" to "assets", "type" to "2", "location" to "PARENT-1-PROJECT_LOC/android/assets"))
}
}
tasks.register("afterEclipseImport") {
description = "Post processing after project generation"
group = "IDE"
doLast {
val classpath = XmlParser().parse(file(".classpath"))
Node(classpath, "classpathentry", mapOf("kind" to "src", "path" to "assets"))
val writer = FileWriter(file(".classpath"))
val printer = XmlNodePrinter(PrintWriter(writer))
printer.isPreserveWhitespace = true
printer.print(classpath)
}
}