From 7354d9def1e764ed4b440033e8ae95dcd12162a6 Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Thu, 8 Sep 2011 00:44:10 +0000
Subject: [PATCH] SDK: - avoid double build for android when running
 application

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8216 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../com/jme3/gde/android/MobileCompositeProvider.java  |  2 +-
 .../src/com/jme3/gde/android/mobile-targets.xml        | 10 ++++++----
 2 files changed, 7 insertions(+), 5 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 d0142acf9..fbb44d558 100644
--- a/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
+++ b/sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
@@ -62,7 +62,7 @@ public class MobileCompositeProvider implements ProjectCustomizer.CompositeCateg
     private class SavePropsListener implements ActionListener {
 
         private String extensionName = "mobile";
-        private String extensionVersion = "v0.10";
+        private String extensionVersion = "v0.11";
         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 47d0cbe71..947f089c7 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
@@ -1,4 +1,4 @@
-    <target name="run-android" depends="jar, -test-android-enabled, -copy-android-libs" if="is.android.enabled">
+    <target name="run-android" depends="-flag-no-android, jar, -test-android-enabled, -copy-android-libs" if="is.android.enabled">
         <ant dir="mobile" target="install"/>
     </target>
     
@@ -6,10 +6,9 @@
         <ant dir="mobile" target="clean"/>
     </target>
     
-    <target name="-mobile-deployment" depends="-test-android-enabled, -copy-android-libs" if="is.android.enabled">
+    <target name="-mobile-deployment" depends="-test-android-enabled, -copy-android-libs" if="is.android.enabled" unless="no.android.build">
         <ant dir="mobile" target="release"/>
         <copy todir="dist" verbose="false" flatten="true">
-            <!--exclude jme3 test data from core-->
             <fileset dir="mobile/bin/">
                 <include name="**/*.apk"/>
             </fileset>
@@ -25,7 +24,6 @@
     <target name="-copy-android-libs" if="is.android.enabled">
         <property name="libs.jme3-android" location="${libs.jme3-android.classpath}"/>
         <copy todir="mobile/libs" verbose="false" flatten="true">
-            <!--exclude jme3 test data from core-->
             <fileset dir="dist/lib/">
                 <exclude name="jMonkeyEngine3.jar"/>
                 <exclude name="jME3-lwjgl-natives.jar"/>
@@ -35,4 +33,8 @@
         </copy>
         <copy file="${libs.jme3-android}" tofile="mobile/libs/jMonkeyEngine3.jar" verbose="false"/>
         <copy file="${dist.jar}" todir="mobile/libs/" verbose="false"/>
+    </target>
+
+    <target name="-flag-no-android">
+        <property name="no.android.build" value="true"/>
     </target>
\ No newline at end of file