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

Removed lwjgl3 desktop module, sdl promoted to main module

Browse Source
This commit is contained in:
Anuken
2019-08-21 15:41:38 -04:00
parent 0553fb6b79
commit 9bf010e222
9 changed files with 114 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
desktop/build.gradle
View File

@@ -1,44 +1,28 @@
import com.badlogicgames.packr.Packr
import com.badlogicgames.packr.PackrConfig
apply plugin: "java"
sourceCompatibility = 1.8
sourceSets.main.java.srcDirs = ["src/"]
sourceSets.main.java.srcDirs = [ "src/" ]
project.ext.mainClassName = "io.anuke.mindustry.desktop.DesktopLauncher"
project.ext.assetsDir = new File("../core/assets")
def IKVM_DIR = System.env.IKVM_HOME
import com.badlogicgames.packr.Packr
import com.badlogicgames.packr.PackrConfig
def JDK_DIR = "$System.env.PACKR_DIR"
def ICON_DIR = new File("core/assets/icons/icon.icns")
/*
ext.getPlatform = {
def lc = project.hasProperty("platform") ? platform.toLowerCase() : ""
if(lc == "windows64"){
return PackrConfig.Platform.Windows64
}else if(lc == "windows32"){
return PackrConfig.Platform.Windows32
}else if(lc == "linux"){
return PackrConfig.Platform.Linux64
}else if(lc == "mac"){
return PackrConfig.Platform.MacOS
}else{
throw new InvalidUserDataException("Invalid platform. Set platform with -Pplatform=windows64/windows32/linux/mac")
}
}*/
task run(dependsOn: classes, type: JavaExec){
main = project.mainClassName
classpath = sourceSets.main.runtimeClasspath
standardInput = System.in
workingDir = project.assetsDir
if(System.getProperty("os.name").toLowerCase().contains("mac")){
jvmArgs "-XstartOnFirstThread"
}
ignoreExitValue = true
if(System.getProperty("os.name").toLowerCase().contains("mac")){
jvmArgs("-XstartOnFirstThread", "-Djava.awt.headless=true")
}
if(project.hasProperty("args")){
args Eval.me(project.getProperties()["args"])
}
@@ -48,43 +32,51 @@ task run(dependsOn: classes, type: JavaExec){
}
}
task debug(dependsOn: classes, type: JavaExec){
main = project.mainClassName
classpath = sourceSets.main.runtimeClasspath
standardInput = System.in
workingDir = project.assetsDir
ignoreExitValue = true
debug = true
}
["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)
task dist(type: Jar){
dependsOn classes
if(target.contains("windows")) exclude('**.so', "**.dylib")
if(target == "mac") exclude('**.so', "**.dll")
if(target == "linux") exclude('**.dll', "**.dylib")
archiveName = "$appName-${target}.jar"
writeVersion()
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
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"
doLast{
copy{
into "build/packr/"
rename("$appName-${platformName}.jar", "desktop.jar")
from "build/libs/$appName-${platformName}.jar"
}
delete{
delete "build/packr/output/"
}
if(platform == PackrConfig.Platform.Windows32 || platform == PackrConfig.Platform.Windows64){
copy{
into "packr-out/"
into "build/packr/output"
from "${JDK_DIR}/templates/${platform.toString().toLowerCase()}"
}
copy{
into "packr-out/"
rename("desktop-release.jar", "desktop.jar")
from "../desktop-sdl/build/libs/desktop.jar"
into "build/packr/output/jre"
rename("$appName-${platformName}.jar", "desktop.jar")
from "build/libs/$appName-${platformName}.jar"
}
}else{
def config = new PackrConfig()
@@ -94,10 +86,10 @@ PackrConfig.Platform.values().each{ platform ->
verbose = true
bundleIdentifier = getPackage() + ".mac"
iconResource = ICON_DIR
outDir = file("packr-out/")
outDir = file("build/packr/output")
mainClass = project.ext.mainClassName
classpath = ["desktop-sdl/build/libs/desktop.jar"]
removePlatformLibs = ["desktop-sdl/build/libs/desktop.jar"]
classpath = ["desktop/build/packr/desktop.jar"]
removePlatformLibs = ["desktop/build/packr/desktop.jar"]
vmArgs = ["Djava.net.preferIPv4Stack=true"]
minimizeJre = "desktop/packr_minimize.json"
@@ -110,28 +102,44 @@ PackrConfig.Platform.values().each{ platform ->
new Packr().pack(config)
if(platform == PackrConfig.Platform.MacOS){
if(platform == PackrConfig.Platform.Linux64){
copy{
into "packr-out/" + appName + ".app/Contents/"
from "packr-out/Contents/"
into "build/packr/output/jre/"
from "build/packr/output/desktop.jar"
}
delete{
delete "packr-out/Contents/"
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){
copy{
into "build/packr/${appName}.app/Contents/"
from "build/packr/Contents/"
}
delete{
delete "build/packr/Contents/"
}
}
}
task "zip${platform.toString()}"(type: Zip){
from "packr-out/"
archiveName "${generateDeployName(platform.toString())}.zip"
destinationDir(file("packr-export"))
}
finalizedBy 'rzip'
delete "packr-out/"
}
task "zip${platform.toString()}"(type: Zip){
from "build/packr/output"
archiveName "${generateDeployName(platform.toString())}.zip"
destinationDir(file("../deploy"))
doLast{
delete{
delete "build/packr/"
}
}
}
finalizedBy "zip${platform.toString()}"
}
}