From 72a4282dc09a060109f7cb66e44fc6e3ac557381 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sat, 12 Nov 2011 00:10:48 +0000
Subject: [PATCH] - make FreeForm project for android code - change build
 process to move back class files after creating separate jar files

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8654 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/build.xml                         |  7 ++-
 engine/src/android/nbproject/project.xml | 72 ++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 engine/src/android/nbproject/project.xml

diff --git a/engine/build.xml b/engine/build.xml
index 46b02289e..55837279c 100644
--- a/engine/build.xml
+++ b/engine/build.xml
@@ -24,7 +24,7 @@
     
     <!-- compiles the android jar for jME3 -->
     <target name="-compile-android" description="builds the jMonkeyEngine3 distribution for android">
-        <echo message="Compiling Android jMonkeyEngin3.jar"/>
+        <echo message="Compiling Android jMonkeyEngine3.jar"/>
         <path id="android-classpath">
             <pathelement path="lib/android/android.jar"/>
             <pathelement path="build/classes"/>
@@ -37,7 +37,7 @@
                 srcdir="src/android"
                 destdir="build/android"
                 classpathref="android-classpath"
-                excludes="**/OGLESRenderer.java,**/TestsActivity.java,**/AboutActivity.java"/>
+                excludes="**/OGLESRenderer.java,**/TestsActivity.java,**/AboutActivity.java,nbproject/**"/>
     </target>
     
     <!--this target creates the separate jar files for jme3 and modifies the classpath to include them-->
@@ -48,11 +48,14 @@
         <move file="build/classes/jme3test" todir="build/testclasses/" failonerror="false"/>
         <move file="build/classes/jme3game" todir="build/testclasses/" failonerror="false"/>
         <jar jarfile="build/jME3-test.jar" basedir="build/testclasses/" compress="true"/>
+        <move file="build/testclasses/jme3test" todir="build/classes/" failonerror="false"/>
+        <move file="build/testclasses/jme3game" todir="build/classes/" failonerror="false"/>
 
         <!--separate jbullet physics classes-->
         <mkdir dir="build/jbullet/com/jme3/"/>
         <move file="build/classes/com/jme3/bullet" todir="build/jbullet/com/jme3/" failonerror="false"/>
         <jar jarfile="build/jME3-jbullet.jar" basedir="build/jbullet/" compress="true"/>
+        <move file="build/jbullet/com/jme3/bullet" todir="build/classes/com/jme3/" failonerror="false"/>
 
         <!--separate assets-->
         <jar jarfile="build/jME3-testdata.jar" basedir="src/test-data" compress="true"/>
diff --git a/engine/src/android/nbproject/project.xml b/engine/src/android/nbproject/project.xml
new file mode 100644
index 000000000..124bfda04
--- /dev/null
+++ b/engine/src/android/nbproject/project.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ant.freeform</type>
+    <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>jMonkeyEngine3 - Android</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <!-- Do not use Project Properties customizer when editing this file manually. -->
+            <name>jMonkeyEngine3 - Android</name>
+            <properties>
+                <property name="ant.script">../../build.xml</property>
+            </properties>
+            <folders>
+                <source-folder>
+                    <label>Source Packages</label>
+                    <type>java</type>
+                    <location>.</location>
+                    <encoding>MacRoman</encoding>
+                </source-folder>
+            </folders>
+            <ide-actions>
+                <action name="build">
+                    <script>${ant.script}</script>
+                    <target>jar</target>
+                </action>
+                <action name="clean">
+                    <script>${ant.script}</script>
+                    <target>clean</target>
+                </action>
+                <action name="javadoc">
+                    <script>${ant.script}</script>
+                    <target>javadoc</target>
+                </action>
+                <action name="run">
+                    <script>${ant.script}</script>
+                    <target>run</target>
+                </action>
+                <action name="rebuild">
+                    <script>${ant.script}</script>
+                    <target>clean</target>
+                    <target>jar</target>
+                </action>
+            </ide-actions>
+            <view>
+                <items>
+                    <source-folder style="packages">
+                        <label>Source Packages</label>
+                        <location>.</location>
+                    </source-folder>
+                    <source-file>
+                        <location>${ant.script}</location>
+                    </source-file>
+                </items>
+                <context-menu>
+                    <ide-action name="build"/>
+                    <ide-action name="rebuild"/>
+                    <ide-action name="clean"/>
+                    <ide-action name="javadoc"/>
+                    <ide-action name="run"/>
+                </context-menu>
+            </view>
+        </general-data>
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
+            <compilation-unit>
+                <package-root>.</package-root>
+                <classpath mode="compile">../../lib/android/android.jar:../../dist/jMonkeyEngine3.jar</classpath>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+        </java-data>
+    </configuration>
+</project>