fix up android cordova builds
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dd489a47 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dd489a47 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dd489a47 Branch: refs/heads/release0.8.0 Commit: dd489a471150f905ddf245c18bfbf772e964298f Parents: c521608 Author: Alex Harui <[email protected]> Authored: Wed May 31 16:34:39 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Wed May 31 16:34:39 2017 -0700 ---------------------------------------------------------------------- cordova-build.xml | 8 ++++---- examples/build_example.xml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dd489a47/cordova-build.xml ---------------------------------------------------------------------- diff --git a/cordova-build.xml b/cordova-build.xml index 56768f6..f9101ff 100644 --- a/cordova-build.xml +++ b/cordova-build.xml @@ -40,7 +40,7 @@ --> - <target name="main" depends="find.cordova.mac,create, copyfiles" description="Creates the Cordova app if needed, compiles the FlexJS app, copies the results to Cordova app"> + <target name="main" depends="find.cordova.mac,create,copyfiles" description="Creates the Cordova app if needed, compiles the FlexJS app, copies the results to Cordova app"> </target> <!-- Set up properties and conditions --> @@ -147,7 +147,7 @@ <available file="${android.platform}" type="dir" property="platform.loaded" /> </target> - <target name="load-platform.android" depends="check-platform.android" unless="platform.loaded"> + <target name="load-platform.android" depends="find.cordova.mac,check-platform.android" unless="platform.loaded"> <exec executable="${cordova.executable}" dir="${cordova.target.dir}"> <env key="PATH" path="${app.path}:${cordova.path}"/> <arg value="platform" /> @@ -165,7 +165,7 @@ <available file="${ios.platform}" type="dir" property="platform.loaded" /> </target> - <target name="load-platform.ios" depends="check-platform.ios" unless="platform.loaded"> + <target name="load-platform.ios" depends="find.cordova.mac,check-platform.ios" unless="platform.loaded"> <exec executable="${cordova.executable}" dir="${cordova.target.dir}"> <env key="PATH" path="${app.path}:${cordova.path}"/> <arg value="platform" /> @@ -241,4 +241,4 @@ </target> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dd489a47/examples/build_example.xml ---------------------------------------------------------------------- diff --git a/examples/build_example.xml b/examples/build_example.xml index d6d5a9d..ab2c62c 100644 --- a/examples/build_example.xml +++ b/examples/build_example.xml @@ -370,7 +370,8 @@ <target name="compile.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova"> <property name="mobile.platform" value="android" /> - <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="run.${mobile.platform}" /> + <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="main" /> + <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="load-platform.${mobile.platform}" /> </target> <target name="run.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova">
