From ca76754889244eed407860b9cc7c953822b22004 Mon Sep 17 00:00:00 2001 From: iwgeric Date: Sun, 29 Mar 2015 23:02:05 -0400 Subject: [PATCH] SDK: Add missing global library for android native bullet --- sdk/build.gradle | 31 ++++++++++--------- .../baselibs/jme3-bullet-native-android.xml | 19 ++++++++++++ .../com/jme3/gde/project/baselibs/layer.xml | 1 + 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet-native-android.xml diff --git a/sdk/build.gradle b/sdk/build.gradle index 55722cbfb..745b878c6 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -25,17 +25,18 @@ dependencies { corelibs project(':jme3-niftygui') corelibs project(':jme3-plugins') corelibs project(':jme3-terrain') - + optlibs project(':jme3-bullet') optlibs project(':jme3-jogl') optlibs project(':jme3-android') optlibs project(':jme3-ios') optlibs project(':jme3-android-native') optlibs project(':jme3-bullet-native') + optlibs project(':jme3-bullet-native-android') testdatalibs project(':jme3-testdata') examplelibs project(':jme3-examples') - + } artifacts { @@ -97,7 +98,7 @@ task createBaseXml(dependsOn: configurations.corelibs) <<{ "jme3-core-baselibs and jme3-core-libraries" def jmeJarFiles = [] // jme3 jar files def externalJarFiles = [] // external jar files - + // collect jar files project.configurations.corelibs.dependencies.each {dep -> // collect external jar files @@ -120,7 +121,7 @@ task createBaseXml(dependsOn: configurations.corelibs) <<{ def packages = [] jmeJarFiles.each{jarFile -> ZipFile file = new ZipFile(jarFile) - file.entries().each { entry -> + file.entries().each { entry -> if(entry.name.endsWith('.class')){ // TODO: "/" works on windows? def pathPart = entry.name.substring(0,entry.name.lastIndexOf('/')) @@ -129,14 +130,14 @@ task createBaseXml(dependsOn: configurations.corelibs) <<{ packages.add(classPath) } } - } + } } - + // collect library packages def extPackages = [] externalJarFiles.each{jarFile -> ZipFile file = new ZipFile(jarFile) - file.entries().each { entry -> + file.entries().each { entry -> if(entry.name.endsWith('.class')){ // TODO: "/" works on windows? def pathPart = entry.name.substring(0,entry.name.lastIndexOf('/')) @@ -145,9 +146,9 @@ task createBaseXml(dependsOn: configurations.corelibs) <<{ extPackages.add(classPath) } } - } + } } - + def writer = new StringWriter() def xml = new MarkupBuilder(writer) xml.mkp.xmlDeclaration(version:'1.0') @@ -252,7 +253,7 @@ task copyProjectLibs(dependsOn: [configurations.corelibs, configurations.testdat into "jme3-project-libraries/release/libs/" } } - + project.configurations.testdatalibs.dependencies.each {dep -> // copy jme3 test data to jme3-project-testdata dep.dependencyProject.configurations.archives.allArtifacts.each{ artifact-> @@ -281,10 +282,10 @@ def makeFile(builder, nameR) { builder.file(name:nameR, url:nameR) } task createProjectXml(dependsOn: configurations.corelibs) <<{ description "Creates needed J2SE library and layer XML files in jme3-project-baselibs" - - def eol = System.properties.'line.separator' + + def eol = System.properties.'line.separator' def j2seLibraries = [] // created J2SE library descriptors - + // for each dependency in corelibs.. def deps = [] deps.addAll(project.configurations.corelibs.dependencies) @@ -315,7 +316,7 @@ task createProjectXml(dependsOn: configurations.corelibs) <<{ def libraryWriter = new StringWriter() def libraryXml = new MarkupBuilder(libraryWriter) // xml.mkp.xmlDeclaration(version:'1.0') - libraryWriter << '' << eol + libraryWriter << '' << eol libraryWriter << '' << eol libraryXml.library(version:"1.0", encoding: "UTF-8"){ makeName(libraryXml, "${dep.dependencyProject.name}") @@ -352,7 +353,7 @@ task createProjectXml(dependsOn: configurations.corelibs) <<{ def layerWriter = new StringWriter() def layerXml = new MarkupBuilder(layerWriter) // layerXml.mkp.xmlDeclaration(version:'1.0') - layerWriter << '' << eol + layerWriter << '' << eol layerWriter << '' << eol layerXml.filesystem{ folder(name:"org-netbeans-api-project-libraries"){ diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet-native-android.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet-native-android.xml new file mode 100644 index 000000000..083970e02 --- /dev/null +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-bullet-native-android.xml @@ -0,0 +1,19 @@ + + + + jme3-bullet-native-android + j2se + com.jme3.gde.project.baselibs.Bundle + + classpath + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-bullet-native-android-3.1.0-snapshot-github.jar!/ + + + src + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-bullet-native-android-3.1.0-snapshot-github-sources.jar!/ + + + javadoc + jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-bullet-native-android-3.1.0-snapshot-github-javadoc.jar!/ + + \ No newline at end of file diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml index 1a7e7bf0e..837ff7e16 100644 --- a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/layer.xml @@ -20,6 +20,7 @@ + \ No newline at end of file