sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- avoid double build for android when running application

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8216 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-09-08 00:44:10 +00:00
parent f2de85a7a2
commit 7354d9def1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java
View File

@ -62,7 +62,7 @@ public class MobileCompositeProvider implements ProjectCustomizer.CompositeCateg
private class SavePropsListener implements ActionListener { private class SavePropsListener implements ActionListener {
private String extensionName = "mobile"; private String extensionName = "mobile";
private String extensionVersion = "v0.10"; private String extensionVersion = "v0.11";
private String[] extensionDependencies = new String[]{"jar", "-mobile-deployment"}; private String[] extensionDependencies = new String[]{"jar", "-mobile-deployment"};
private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies); private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies);
private ProjectExtensionProperties properties; private ProjectExtensionProperties properties;

10
sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml
View File

@ -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"/> <ant dir="mobile" target="install"/>
</target> </target>
@ -6,10 +6,9 @@
<ant dir="mobile" target="clean"/> <ant dir="mobile" target="clean"/>
</target> </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"/> <ant dir="mobile" target="release"/>
<copy todir="dist" verbose="false" flatten="true"> <copy todir="dist" verbose="false" flatten="true">
<!--exclude jme3 test data from core-->
<fileset dir="mobile/bin/"> <fileset dir="mobile/bin/">
<include name="**/*.apk"/> <include name="**/*.apk"/>
</fileset> </fileset>
@ -25,7 +24,6 @@
<target name="-copy-android-libs" if="is.android.enabled"> <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}"/>
<copy todir="mobile/libs" verbose="false" flatten="true"> <copy todir="mobile/libs" verbose="false" flatten="true">
<!--exclude jme3 test data from core-->
<fileset dir="dist/lib/"> <fileset dir="dist/lib/">
<exclude name="jMonkeyEngine3.jar"/> <exclude name="jMonkeyEngine3.jar"/>
<exclude name="jME3-lwjgl-natives.jar"/> <exclude name="jME3-lwjgl-natives.jar"/>
@ -35,4 +33,8 @@
</copy> </copy>
<copy file="${libs.jme3-android}" tofile="mobile/libs/jMonkeyEngine3.jar" verbose="false"/> <copy file="${libs.jme3-android}" tofile="mobile/libs/jMonkeyEngine3.jar" verbose="false"/>
<copy file="${dist.jar}" todir="mobile/libs/" 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> </target>