Possible lwjgl natives fix
This commit is contained in:
26
build.gradle
26
build.gradle
@@ -186,7 +186,7 @@ allprojects{
|
||||
maven{ url 'https://jitpack.io' }
|
||||
}
|
||||
|
||||
task clearCache{
|
||||
tasks.register('clearCache'){
|
||||
doFirst{
|
||||
delete{
|
||||
delete "$rootDir/core/assets/cache"
|
||||
@@ -273,7 +273,7 @@ project(":core"){
|
||||
|
||||
compileJava.options.fork = true
|
||||
|
||||
task preGen{
|
||||
tasks.register('preGen'){
|
||||
outputs.upToDateWhen{ false }
|
||||
generateLocales()
|
||||
writeVersion()
|
||||
@@ -281,7 +281,7 @@ project(":core"){
|
||||
writePlugins()
|
||||
}
|
||||
|
||||
task copyChangelog{
|
||||
tasks.register('copyChangelog'){
|
||||
doLast{
|
||||
def props = loadVersionProps()
|
||||
def androidVersion = props['androidBuildCode'].toInteger() - 2
|
||||
@@ -289,9 +289,9 @@ project(":core"){
|
||||
def notice = "[This is a truncated changelog, see Github for full notes]"
|
||||
def maxLength = 460
|
||||
|
||||
def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
|
||||
def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]") }
|
||||
def result = ""
|
||||
androidLogList.forEach{line ->
|
||||
androidLogList.forEach{ line ->
|
||||
if(result.length() + line.length() + 1 < maxLength){
|
||||
result += line + "\n"
|
||||
}
|
||||
@@ -305,19 +305,21 @@ project(":core"){
|
||||
}
|
||||
}
|
||||
|
||||
task sourcesJar(type: Jar, dependsOn: classes){
|
||||
tasks.register('sourcesJar', Jar){
|
||||
dependsOn classes
|
||||
archiveClassifier = 'sources'
|
||||
from sourceSets.main.allSource
|
||||
}
|
||||
|
||||
task assetsJar(type: Jar, dependsOn: ":tools:pack"){
|
||||
tasks.register('assetsJar', Jar){
|
||||
dependsOn ":tools:pack"
|
||||
archiveClassifier = 'assets'
|
||||
from files("assets"){
|
||||
exclude "config", "cache", "music", "sounds", "sprites/fallback"
|
||||
}
|
||||
}
|
||||
|
||||
task musicJar(type: Jar){
|
||||
tasks.register('musicJar', Jar){
|
||||
archiveClassifier = 'music'
|
||||
from files("assets"){
|
||||
include "music/*", "sounds/*"
|
||||
@@ -461,8 +463,8 @@ configure([":core", ":server"].collect{project(it)}){
|
||||
}
|
||||
}
|
||||
|
||||
task deployAll{
|
||||
task cleanDeployOutput{
|
||||
tasks.register('deployAll'){
|
||||
tasks.register('cleanDeployOutput'){
|
||||
doFirst{
|
||||
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----")
|
||||
@@ -484,11 +486,11 @@ task deployAll{
|
||||
}
|
||||
}
|
||||
|
||||
task resolveDependencies{
|
||||
tasks.register('resolveDependencies'){
|
||||
doLast{
|
||||
rootProject.allprojects{ project ->
|
||||
Set<Configuration> configurations = project.buildscript.configurations + project.configurations
|
||||
configurations.findAll{c -> c.canBeResolved}.forEach{c -> c.resolve()}
|
||||
configurations.findAll{ c -> c.canBeResolved }.forEach{ c -> c.resolve() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,8 @@ def JDK_DIR = "$System.env.JDK_DIR"
|
||||
def ICON_DIR = new File("$rootDir/core/assets/icons/icon.icns")
|
||||
def platforms = ["Linux64", "Windows64", "Windows32", "MacOS"]
|
||||
|
||||
task run(dependsOn: classes, type: JavaExec){
|
||||
tasks.register('run', JavaExec){
|
||||
dependsOn classes
|
||||
mainClass = project.mainClassName
|
||||
classpath = sourceSets.main.runtimeClasspath
|
||||
standardInput = System.in
|
||||
@@ -26,7 +27,7 @@ task run(dependsOn: classes, type: JavaExec){
|
||||
}
|
||||
|
||||
if(project.hasProperty("jvmArgs")){
|
||||
jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
|
||||
jvmArgs((List<String>) Eval.me(project.getProperties()["jvmArgs"]))
|
||||
}
|
||||
|
||||
if(project.hasProperty("dataDir")){
|
||||
@@ -38,14 +39,16 @@ task run(dependsOn: classes, type: JavaExec){
|
||||
}
|
||||
}
|
||||
|
||||
task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
|
||||
tasks.register('dist', Jar){
|
||||
dependsOn configurations.runtimeClasspath
|
||||
dependsOn ":desktop:processResources"
|
||||
|
||||
from files(sourceSets.main.output.classesDirs)
|
||||
from files(sourceSets.main.output.resourcesDir)
|
||||
from {configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }}
|
||||
from{ configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) } }
|
||||
from files(project.assetsDir)
|
||||
exclude("config/**")
|
||||
exclude("**hs_err**.log")
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
|
||||
//don't include steam shared libraries unless necessary
|
||||
@@ -70,7 +73,8 @@ if(!project.ext.hasSprites() && System.getenv("JITPACK") != "true"){
|
||||
|
||||
//this is only for local testing
|
||||
//add -Prelease -PversionModifier=steam as build properties
|
||||
task steamtest(dependsOn: dist){
|
||||
tasks.register('steamtest'){
|
||||
dependsOn dist
|
||||
doLast{
|
||||
copy{
|
||||
from "build/libs/Mindustry.jar"
|
||||
|
||||
@@ -26,4 +26,4 @@ org.gradle.caching=true
|
||||
org.gradle.internal.http.socketTimeout=100000
|
||||
org.gradle.internal.http.connectionTimeout=100000
|
||||
android.enableR8.fullMode=false
|
||||
archash=039b13f434
|
||||
archash=b5be655c5c
|
||||
|
||||
@@ -7,7 +7,8 @@ ext.getServerFolder = {
|
||||
return "../deploy/${appName}-server-${getVersionString()}"
|
||||
}
|
||||
|
||||
task run(dependsOn: classes, type: JavaExec){
|
||||
tasks.register('run', JavaExec){
|
||||
dependsOn classes
|
||||
mainClass = project.mainClassName
|
||||
classpath = sourceSets.main.runtimeClasspath
|
||||
standardInput = System.in
|
||||
@@ -17,11 +18,12 @@ task run(dependsOn: classes, type: JavaExec){
|
||||
args Eval.me(appArgs)
|
||||
}
|
||||
if(project.hasProperty("jvmArgs")){
|
||||
jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
|
||||
jvmArgs((List<String>) Eval.me(project.getProperties()["jvmArgs"]))
|
||||
}
|
||||
}
|
||||
|
||||
task debug(dependsOn: classes, type: JavaExec){
|
||||
tasks.register('debug', JavaExec){
|
||||
dependsOn classes
|
||||
mainClass = project.mainClassName
|
||||
classpath = sourceSets.main.runtimeClasspath
|
||||
standardInput = System.in
|
||||
@@ -30,10 +32,11 @@ task debug(dependsOn: classes, type: JavaExec){
|
||||
debug = true
|
||||
}
|
||||
|
||||
task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
|
||||
tasks.register('dist', Jar){
|
||||
dependsOn configurations.runtimeClasspath
|
||||
from files(sourceSets.main.output.classesDirs)
|
||||
from files(sourceSets.main.output.resourcesDir)
|
||||
from {configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }}
|
||||
from{ configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) } }
|
||||
from files(project.assetsDir)
|
||||
exclude("sprites/**")
|
||||
exclude("music/**")
|
||||
@@ -47,6 +50,7 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
|
||||
exclude("icons/icon.icns")
|
||||
exclude("icons/icon.ico")
|
||||
exclude("icons/icon_64.png")
|
||||
exclude("**hs_err**.log")
|
||||
|
||||
duplicatesStrategy = 'exclude'
|
||||
|
||||
@@ -55,7 +59,7 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
|
||||
}
|
||||
}
|
||||
|
||||
task dzip(type: Zip){
|
||||
tasks.register('dzip', Zip){
|
||||
from getServerFolder()
|
||||
archiveFileName = "${generateDeployName('server')}.zip"
|
||||
destinationDirectory = file("../deploy/")
|
||||
@@ -63,7 +67,7 @@ task dzip(type: Zip){
|
||||
finalizedBy 'cleanup'
|
||||
}
|
||||
|
||||
task cleanup{
|
||||
tasks.register('cleanup'){
|
||||
doLast{
|
||||
delete{
|
||||
delete getServerFolder()
|
||||
@@ -71,7 +75,7 @@ task cleanup{
|
||||
}
|
||||
}
|
||||
|
||||
task deploy{
|
||||
tasks.register('deploy'){
|
||||
dependsOn "dist"
|
||||
|
||||
finalizedBy 'dzip'
|
||||
|
||||
Reference in New Issue
Block a user