From ed5dd6355dfc731aee8019ab14c187f72319145c Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sat, 26 Nov 2011 15:57:59 +0000
Subject: [PATCH] - add automatic jbullet->bullet replacement to SDK (TODO:
 remove x86 libs? are natives correctly registered in the android project?)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8805 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../gde/android/MobileCompositeProvider.java  |  2 +-
 .../com/jme3/gde/android/mobile-targets.xml   | 28 +++++++++++++++++--
 .../gde/project/baselibs/jme3-android.xml     |  2 ++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java b/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
index ba5592fca..e3477caf8 100644
--- a/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
+++ b/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
@@ -57,7 +57,7 @@ public class MobileCompositeProvider implements ProjectCustomizer.CompositeCateg
     private class SavePropsListener implements ActionListener {
 
         private String extensionName = "mobile";
-        private String extensionVersion = "v0.13";
+        private String extensionVersion = "v0.14";
         private String[] extensionDependencies = new String[]{"jar", "-mobile-deployment"};
         private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies);
         private ProjectExtensionProperties properties;
diff --git a/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml b/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
index 32a4bd192..3e415eaaa 100644
--- a/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
+++ b/sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
@@ -23,20 +23,44 @@
     </target>
     
     <target name="-copy-android-libs" if="is.android.enabled">
-        <property name="libs.jme3-android" location="${libs.jme3-android.classpath}"/>
+        <!--property name="libs.jme3-android" location="${libs.jme3-android.classpath}"/-->
         <delete dir="mobile/libs" failonerror="false"/>
         <mkdir dir="mobile/libs"/>
         <copy todir="mobile/libs" verbose="false" flatten="true">
             <fileset dir="dist/lib/">
                 <exclude name="jMonkeyEngine3.jar"/>
                 <exclude name="jME3-lwjgl-natives.jar"/>
+                <exclude name="jME3-bullet-natives.jar"/>
+                <exclude name="jME3-jbullet.jar"/>
+                <exclude name="jME3-bullet.jar"/>
+                <exclude name="jbullet.jar"/>
+                <exclude name="stack-alloc.jar"/>
+                <exclude name="vecmath.jar"/>
                 <exclude name="lwjgl.jar"/>
                 <exclude name="jinput.jar"/>
             </fileset>
         </copy>
-        <copy file="${libs.jme3-android}" tofile="mobile/libs/jMonkeyEngine3.jar" verbose="false"/>
+
+        <copy todir="mobile/libs" flatten="true">
+            <mapper type="flatten" from="*jMonkeyEngine-android.jar" to="jMonkeyEngine.jar"/>
+            <path>
+                <pathelement path="${libs.jme3-android.classpath}"/>
+            </path>
+        </copy>
+        <antcall target="-delete-bullet-libs"/>
         <copy file="${dist.jar}" todir="mobile/libs/" verbose="false"/>
     </target>
+    
+    <target name="-delete-bullet-libs" depends="-test-bullet-included" unless="bulletIsIncluded">
+        <delete file="mobile/libs/jME3-bullet.jar"/>
+        <delete file="mobile/libs/jME3-bullet-natives-android.jar"/>
+    </target>
+    
+    <target name="-test-bullet-included">
+        <condition property="bulletIsIncluded">
+            <contains string="${javac.classpath}" substring="bullet.jar"/>
+        </condition>
+    </target>
 
     <target name="-flag-no-android">
         <property name="no.android.build" value="true"/>
diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml
index 8cf10852b..56e462664 100644
--- a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml
+++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml
@@ -11,6 +11,8 @@ and open the template in the editor.
     <volume>
         <type>classpath</type>
         <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-android.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet-natives-android.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>