sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed classes location while building natives (JDK11 Support) (#1073)

Browse Source 
* Fixed classes location while building natives
* Fix minor formating issue
This commit is contained in:
Trevor Flynn 2019-04-20 10:43:16 -07:00 committed by Stephen Gold
parent 41f88cd5eb
commit 9c1452b63b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-android-native/decode.gradle
View File

@ -3,6 +3,7 @@ String stbiUrl = 'https://raw.githubusercontent.com/nothings/stb/master/stb_imag
// Working directories for the ndk build. // Working directories for the ndk build.
String decodeBuildDir = "${buildDir}" + File.separator + 'decode' String decodeBuildDir = "${buildDir}" + File.separator + 'decode'
String decodeClassesBuildDir = "${buildDir}" + File.separator + 'decode_classes'
String decodeBuildJniDir = decodeBuildDir + File.separator + 'jni' String decodeBuildJniDir = decodeBuildDir + File.separator + 'jni'
String decodeBuildLibsDir = decodeBuildDir + File.separator + 'libs' String decodeBuildLibsDir = decodeBuildDir + File.separator + 'libs'
@ -57,6 +58,7 @@ task generateJavahHeaders(type: Exec) {
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac') executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac')
args '-h', decodeSourceDir args '-h', decodeSourceDir
args "@$projectDir/java_classes.jtxt" args "@$projectDir/java_classes.jtxt"
args '-d', decodeClassesBuildDir
} }
// Copy jME Android native files to jni directory // Copy jME Android native files to jni directory

2
jme3-android-native/openalsoft.gradle
View File

@ -9,6 +9,7 @@ String openALSoftFolder = 'openal-soft-e5016f8'
//Working directories for the ndk build. //Working directories for the ndk build.
String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft' String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft'
String openalsoftClassesBuildDir = "${buildDir}" + File.separator + 'openalsoft_classes'
String openalsoftBuildJniDir = openalsoftBuildDir + File.separator + 'jni' String openalsoftBuildJniDir = openalsoftBuildDir + File.separator + 'jni'
String openalsoftBuildLibsDir = openalsoftBuildDir + File.separator + 'libs' String openalsoftBuildLibsDir = openalsoftBuildDir + File.separator + 'libs'
@ -84,6 +85,7 @@ task generateOpenAlSoftHeaders(type:Exec, dependsOn: copyJmeOpenALSoft) {
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac') executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac')
args '-h', openalsoftJmeAndroidPath args '-h', openalsoftJmeAndroidPath
args "@$projectDir/java_classes.jtxt" args "@$projectDir/java_classes.jtxt"
args '-d', openalsoftClassesBuildDir
} }
task buildOpenAlSoftNativeLib(type: Exec, dependsOn: generateOpenAlSoftHeaders) { task buildOpenAlSoftNativeLib(type: Exec, dependsOn: generateOpenAlSoftHeaders) {

7
jme3-bullet/build.gradle
View File

@ -2,6 +2,8 @@ if (!hasProperty('mainClass')) {
ext.mainClass = '' ext.mainClass = ''
} }
String classBuildDir = "${buildDir}" + File.separator + 'classes'
sourceSets { sourceSets {
main { main {
java { java {
@ -27,13 +29,10 @@ task generateNativeHeaders(type: Exec, dependsOn: classes) {
def nativeIncludes = new File(project(":jme3-bullet-native").projectDir, "src/native/cpp") def nativeIncludes = new File(project(":jme3-bullet-native").projectDir, "src/native/cpp")
def filesList = "\"" + files0.join("\"\n\"") + "\"\n\"" + files1.join("\"\n\"") + "\"\n\"" + files2.join("\"\n\"") + "\"\n\"" + files3.join("\"\n\"") + "\"\n\"" + files4.join("\"\n\"") + "\"\n\"" + files5.join("\"\n\"") + "\"" def filesList = "\"" + files0.join("\"\n\"") + "\"\n\"" + files1.join("\"\n\"") + "\"\n\"" + files2.join("\"\n\"") + "\"\n\"" + files3.join("\"\n\"") + "\"\n\"" + files4.join("\"\n\"") + "\"\n\"" + files5.join("\"\n\"") + "\""
new File("$projectDir/java_classes.jtxt").text = filesList.replaceAll(java.util.regex.Pattern.quote("\\"), java.util.regex.Matcher.quoteReplacement("/")) new File("$projectDir/java_classes.jtxt").text = filesList.replaceAll(java.util.regex.Pattern.quote("\\"), java.util.regex.Matcher.quoteReplacement("/"))
//project.logger.lifecycle("Files: " + files0.size())
//project.logger.lifecycle("Files: " + files1.size())
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac') executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac')
args "-h", nativeIncludes args "-h", nativeIncludes
//args "-classpath", classpath
args "@$projectDir/java_classes.jtxt" args "@$projectDir/java_classes.jtxt"
//args classes.split(",").collect { it.trim() } args '-d', classBuildDir
} }
assemble.dependsOn(generateNativeHeaders) assemble.dependsOn(generateNativeHeaders)