From ec5dced517edaac6ad87f6f54c4d226d0df0bbad Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Wed, 30 Nov 2011 16:06:48 +0000
Subject: [PATCH] SDK: - add direct starting of android apps from build script
 - add android device log to SDK run output log

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8831 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../gde/android/MobileCompositeProvider.java  |  2 +-
 .../com/jme3/gde/android/mobile-targets.xml   | 51 ++++++++++++++++---
 2 files changed, 46 insertions(+), 7 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 e3477caf8..d17c2aca8 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.14";
+        private String extensionVersion = "v0.15";
         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 dea450b58..1198f6db1 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,6 +1,13 @@
+    <condition property="android-adb-name" value="${file.separator}platform-tools${file.separator}adb.exe" else="${file.separator}platform-tools${file.separator}adb">
+        <os family="windows" />
+    </condition>
+    
     <target name="run-android" depends="-flag-no-android, jar, -test-android-enabled, -copy-android-libs" if="is.android.enabled">
+        <echo>Building debug android application version.</echo>
         <ant dir="mobile" target="debug"/>
+        <antcall target="-start-android-device"/>
         <ant dir="mobile" target="installd"/>
+        <antcall target="-run-android-device"/>
     </target>
     
     <target name="clean-android">
@@ -16,12 +23,6 @@
         </copy>
     </target>
     
-    <target name="-test-android-enabled">
-        <condition property="is.android.enabled">
-            <istrue value="${mobile.android.enabled}"/>
-        </condition>
-    </target>
-    
     <target name="-copy-android-libs" if="is.android.enabled">
         <!--property name="libs.jme3-android" location="${libs.jme3-android.classpath}"/-->
         <echo>Copying application libraries to android project.</echo>
@@ -71,6 +72,44 @@
         </condition>
     </target>
 
+    <target name="-start-android-device">
+        <property file="mobile/local.properties"/>
+        <exec executable="${sdk.dir}${android-adb-name}" failonerror="true">
+            <arg value="start-server"/>
+        </exec>
+        <echo>Waiting for device to be ready.. Connect your device or start the emulator if not done yet.</echo>
+        <exec executable="${sdk.dir}${android-adb-name}" failonerror="true">
+            <arg value="wait-for-device"/>
+        </exec>
+    </target>
+    
+    <target name="-run-android-device">
+        <property file="mobile/local.properties"/>
+        <exec executable="${sdk.dir}${android-adb-name}" failonerror="true">
+            <arg value="logcat"/>
+            <arg value="-c"/>
+        </exec>
+        <exec executable="${sdk.dir}${android-adb-name}" failonerror="true">
+            <arg value="shell"/>
+            <arg value="am start -n ${mobile.android.package}/.MainActivity"/>
+        </exec>
+        <echo>Logging android device output, cancel build or stop device to stop logging.</echo>
+        <exec executable="${sdk.dir}${android-adb-name}" failonerror="true">
+            <arg value="logcat"/>
+            <arg value="-s"/>
+            <arg value="AndroidRuntime:E"/>
+            <arg value="System.out:I"/>
+            <arg value="System.err:W"/>
+            <arg value="NSLog:*"/>
+        </exec>
+    </target>
+    
+    <target name="-test-android-enabled">
+        <condition property="is.android.enabled">
+            <istrue value="${mobile.android.enabled}"/>
+        </condition>
+    </target>
+    
     <target name="-flag-no-android">
         <property name="no.android.build" value="true"/>
     </target>
\ No newline at end of file