Repository: flex-asjs Updated Branches: refs/heads/develop eb3a8b125 -> afdc5f446
use maven target folder if exists Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/afdc5f44 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/afdc5f44 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/afdc5f44 Branch: refs/heads/develop Commit: afdc5f4460cb9817801416edd83ccad3d2023db1 Parents: eb3a8b1 Author: Alex Harui <aha...@apache.org> Authored: Fri Oct 21 22:19:17 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Fri Oct 21 22:19:17 2016 -0700 ---------------------------------------------------------------------- cordova-build.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/afdc5f44/cordova-build.xml ---------------------------------------------------------------------- diff --git a/cordova-build.xml b/cordova-build.xml index 5217dbc..786be15 100644 --- a/cordova-build.xml +++ b/cordova-build.xml @@ -24,7 +24,8 @@ . /* run ANT here */ ./src/<APP>.mxml /* The main application MXML tag */ - ./bin/js-debug /* The result of building APP.mxml via mxmlc + ./bin/js-debug /* The result of building APP.mxml via mxmlc, or + ./target/javascript/bin/js-debug /* The result of building APP.mxml via maven ./app/<APP> /* The Cordova application directory 1. This ANT script will build the template Cordova app/APP if it does not @@ -55,6 +56,10 @@ <isset property="projectdir" /> </not> </condition> + <condition property="target" value="target/javascript"> + <available file="${projectdir}/target/javascript/bin/js-debug" type="dir" /> + </condition> + <property name="target" value="." /> <condition property="platform.android" value="android"> <not> @@ -121,7 +126,7 @@ <target name="copyfiles" depends="purge"> <echo message="Copying files from project" /> <copy todir="${cordova.target.dir}/www"> - <fileset dir="${projectdir}/bin/js-debug" /> + <fileset dir="${projectdir}/${target}/bin/js-debug" /> </copy> </target> @@ -166,7 +171,7 @@ --> <target name="check-fileplugin"> - <property name="storage.file" value="${projectdir}/bin/js-debug/org/apache/flex/storage/IPermanentStorage.js" /> + <property name="storage.file" value="${projectdir}/${target}/bin/js-debug/org/apache/flex/storage/IPermanentStorage.js" /> <available file="${storage.file}" type="file" property="file.plugin.needed" /> </target>
