From 270703ca584a746f3aff03704b0d82e8e760f018 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sat, 12 Nov 2011 00:44:14 +0000
Subject: [PATCH] - change bullet native build process and project

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8657 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/build.xml                        | 11 ++++++++++-
 engine/src/bullet/native/build.xml      |  2 +-
 engine/src/bullet/nbproject/project.xml |  7 +++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/engine/build.xml b/engine/build.xml
index 90a756716..146517229 100644
--- a/engine/build.xml
+++ b/engine/build.xml
@@ -104,10 +104,19 @@
     </target>
 
     <!-- compiles the *native binary* of the native bullet version (read bullet-native-build.txt for more info) -->
-    <target name="build-bullet-natives" description="uses native build tools to build the bulletjme binary (read bullet-native-build.txt for more info)">
+    <target name="build-bullet-natives" description="uses native build tools to build the bulletjme binary (read bullet-native-build.txt for more info)" depends="jar">
         <ant antfile="src/bullet/native/build.xml" target="build-bullet-natives"/>
     </target>
     
+    <target name="run-bullet-native" description="runs the jMonkeyEngine3 demos using native bullet">
+        <copy file="dist/opt/native-bullet/lib/jME3-bullet-natives.jar" todir="dist/lib" failonerror="false"/>
+        <copy file="dist/opt/native-bullet/lib/jME3-bullet.jar" todir="dist/lib" failonerror="false"/>
+        <delete file="dist/lib/jME3-jbullet.jar" failonerror="false"/>
+        <exec executable="java" dir="dist">
+            <arg line="-jar jMonkeyEngine3.jar"/>
+        </exec>
+    </target>
+    
     <!-- overrides javadoc generation to only include relevant classes -->
     <target depends="init" if="have.sources" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
diff --git a/engine/src/bullet/native/build.xml b/engine/src/bullet/native/build.xml
index 5d8cec521..1658bda11 100644
--- a/engine/src/bullet/native/build.xml
+++ b/engine/src/bullet/native/build.xml
@@ -50,7 +50,7 @@
     <target name="build-bullet-natives" description="builds the native bullet library for the platform being run on" depends="-create-folders, create-native-headers, -nativelib-osx, -nativelib-windows, -nativelib-linux, -nativelib-solaris">
         <echo message="Updating native jME3-bullet-natives.jar"/>
         <zip basedir="${bullet.output.base}/jarcontent" file="${bullet.output.base}/jME3-bullet-natives.jar" compress="true"/>
-        <copy file="${bullet.output.base}/jME3-bullet-natives.jar" todir="dist/lib"/>
+        <copy file="${bullet.output.base}/jME3-bullet-natives.jar" todir="dist/opt/native-bullet/lib/"/>
     </target>
     
     <target name="create-native-headers" description="creates the native headers">
diff --git a/engine/src/bullet/nbproject/project.xml b/engine/src/bullet/nbproject/project.xml
index 0197dd268..5f5eaf189 100644
--- a/engine/src/bullet/nbproject/project.xml
+++ b/engine/src/bullet/nbproject/project.xml
@@ -22,7 +22,6 @@
             <ide-actions>
                 <action name="build">
                     <script>${ant.script}</script>
-                    <target>jar</target>
                     <target>build-bullet-natives</target>
                 </action>
                 <action name="clean">
@@ -32,9 +31,12 @@
                 <action name="rebuild">
                     <script>${ant.script}</script>
                     <target>clean</target>
-                    <target>jar</target>
                     <target>build-bullet-natives</target>
                 </action>
+                <action name="run">
+                    <script>${ant.script}</script>
+                    <target>run-bullet-native</target>
+                </action>
             </ide-actions>
             <view>
                 <items>
@@ -50,6 +52,7 @@
                     <ide-action name="build"/>
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
+                    <ide-action name="run"/>
                 </context-menu>
             </view>
             <subprojects/>