Repository: flex-asjs Updated Branches: refs/heads/feature-autobuild/example-maven-dirs 9b6e60cbb -> bc828bbd4
get Ant build to work with Maven folder structure Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bc828bbd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bc828bbd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bc828bbd Branch: refs/heads/feature-autobuild/example-maven-dirs Commit: bc828bbd4cf54835204b4bd871b77d4350360337 Parents: 3acf070 Author: Alex Harui <aha...@apache.org> Authored: Wed Nov 9 11:40:45 2016 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Wed Nov 9 11:44:39 2016 -0800 ---------------------------------------------------------------------- examples/build.xml | 2 ++ examples/build_example.xml | 12 ++++++------ examples/flexjs/FlexJSStore/build.xml | 10 +++++----- examples/flexjs/FlexJSStore_jquery/build.xml | 10 +++++----- examples/flexjs/MobileMap/build.xml | 15 +++++++++------ 5 files changed, 27 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc828bbd/examples/build.xml ---------------------------------------------------------------------- diff --git a/examples/build.xml b/examples/build.xml index 8cb1387..75aead4 100644 --- a/examples/build.xml +++ b/examples/build.xml @@ -87,6 +87,7 @@ <ant dir="${basedir}/flexjs/HelloWorld"/> <ant dir="${basedir}/flexjs/MapSearch"/> <ant dir="${basedir}/flexjs/MobileMap"/> + <ant dir="${basedir}/flexjs/MobileStocks"/> <ant dir="${basedir}/flexjs/MobileTrader"/> <ant dir="${basedir}/flexjs/ChartExample"/> <ant dir="${basedir}/flexjs/StorageExample"/> @@ -121,6 +122,7 @@ <ant dir="${basedir}/flexjs/HelloWorld" target="clean"/> <ant dir="${basedir}/flexjs/MapSearch" target="clean"/> <ant dir="${basedir}/flexjs/MobileTrader" target="clean"/> + <ant dir="${basedir}/flexjs/MobileStocks" target="clean"/> <ant dir="${basedir}/flexjs/MobileMap" target="clean"/> <ant dir="${basedir}/flexjs/ChartExample" target="clean"/> <ant dir="${basedir}/flexjs/StorageExample" target="clean"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc828bbd/examples/build_example.xml ---------------------------------------------------------------------- diff --git a/examples/build_example.xml b/examples/build_example.xml index 87657ad..bdecb12 100644 --- a/examples/build_example.xml +++ b/examples/build_example.xml @@ -107,7 +107,7 @@ then they would set theme_arg=-theme=<path to theme> --> <property name="theme_arg" value="-define=CONFIG::theme,false" /> <mxmlc fork="true" - file="${basedir}/src/${example}.mxml" + file="${basedir}/src/main/flex/${example}.mxml" output="${basedir}/bin-debug/${example}.swf"> <jvmarg line="${mxmlc.jvm.args}"/> <arg value="+flexlib=${basedir}/frameworks" /> @@ -157,7 +157,7 @@ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> <property name="theme_arg" value="-define=CONFIG::theme,false" /> <mxmlc fork="true" - file="${basedir}/src/${example}.mxml" + file="${basedir}/src/main/flex/${example}.mxml" output="${basedir}/bin-debug/${example}.swf"> <jvmarg line="${mxmlc.jvm.args}"/> <arg value="+flexlib=${basedir}/frameworks" /> @@ -199,7 +199,7 @@ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/> <property name="theme_arg" value="-define=CONFIG::theme,false" /> <mxmlc fork="true" - file="${basedir}/src/${example}.as" + file="${basedir}/src/main/flex/${example}.as" output="${basedir}/bin-debug/${example}.swf"> <jvmarg line="${mxmlc.jvm.args}"/> <arg value="+flexlib=${basedir}/frameworks" /> @@ -262,7 +262,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-closure-lib=${GOOG_HOME}" /> <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources" /> - <arg value="${basedir}/src/${example}.mxml" /> + <arg value="${basedir}/src/main/flex/${example}.mxml" /> </java> <fail> <condition> @@ -309,7 +309,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-closure-lib=${GOOG_HOME}" /> <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources" /> - <arg value="${basedir}/src/${example}.mxml" /> + <arg value="${basedir}/src/main/flex/${example}.mxml" /> </java> <fail> <condition> @@ -357,7 +357,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-closure-lib=${GOOG_HOME}" /> <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources" /> - <arg value="${basedir}/src/${example}.as" /> + <arg value="${basedir}/src/main/flex/${example}.as" /> </java> <fail> <condition> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc828bbd/examples/flexjs/FlexJSStore/build.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore/build.xml b/examples/flexjs/FlexJSStore/build.xml index 16f0aec..81cd3cb 100644 --- a/examples/flexjs/FlexJSStore/build.xml +++ b/examples/flexjs/FlexJSStore/build.xml @@ -33,20 +33,20 @@ <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> <mkdir dir="${basedir}/bin-debug/data" /> - <copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin-debug/data/catalog.json" /> + <copy file="${basedir}/src/main/resources/data/catalog.json" tofile="${basedir}/bin-debug/data/catalog.json" /> <mkdir dir="${basedir}/bin/js-debug/data" /> - <copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin/js-debug/data/catalog.json" /> + <copy file="${basedir}/src/main/resources/data/catalog.json" tofile="${basedir}/bin/js-debug/data/catalog.json" /> <mkdir dir="${basedir}/bin/js-release/data" /> - <copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin/js-release/data/catalog.json" /> + <copy file="${basedir}/src/main/resources/data/catalog.json" tofile="${basedir}/bin/js-release/data/catalog.json" /> <mkdir dir="${basedir}/bin/js-debug/assets" /> <copy todir="${basedir}/bin/js-debug/assets" > - <fileset dir="${basedir}/src/assets"> + <fileset dir="${basedir}/src/main/resources/assets"> <include name="**" /> </fileset> </copy> <mkdir dir="${basedir}/bin/js-release/assets" /> <copy todir="${basedir}/bin/js-release/assets" > - <fileset dir="${basedir}/src/assets"> + <fileset dir="${basedir}/src/main/resources/assets"> <include name="**" /> </fileset> </copy> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc828bbd/examples/flexjs/FlexJSStore_jquery/build.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/build.xml b/examples/flexjs/FlexJSStore_jquery/build.xml index 080b6bb..ac61b45 100644 --- a/examples/flexjs/FlexJSStore_jquery/build.xml +++ b/examples/flexjs/FlexJSStore_jquery/build.xml @@ -51,20 +51,20 @@ <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> <mkdir dir="${basedir}/bin-debug/data" /> - <copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin-debug/data/catalog.json" /> + <copy file="${basedir}/src/main/resources/data/catalog.json" tofile="${basedir}/bin-debug/data/catalog.json" /> <mkdir dir="${basedir}/bin/js-debug/data" /> - <copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin/js-debug/data/catalog.json" /> + <copy file="${basedir}/src/main/resources/data/catalog.json" tofile="${basedir}/bin/js-debug/data/catalog.json" /> <mkdir dir="${basedir}/bin/js-release/data" /> - <copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin/js-release/data/catalog.json" /> + <copy file="${basedir}/src/main/resources/data/catalog.json" tofile="${basedir}/bin/js-release/data/catalog.json" /> <mkdir dir="${basedir}/bin/js-debug/assets" /> <copy todir="${basedir}/bin/js-debug/assets" > - <fileset dir="${basedir}/src/assets"> + <fileset dir="${basedir}/src/main/resources/assets"> <include name="**" /> </fileset> </copy> <mkdir dir="${basedir}/bin/js-release/assets" /> <copy todir="${basedir}/bin/js-release/assets" > - <fileset dir="${basedir}/src/assets"> + <fileset dir="${basedir}/src/main/resources/assets"> <include name="**" /> </fileset> </copy> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc828bbd/examples/flexjs/MobileMap/build.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileMap/build.xml b/examples/flexjs/MobileMap/build.xml index 68403b6..ce2e376 100644 --- a/examples/flexjs/MobileMap/build.xml +++ b/examples/flexjs/MobileMap/build.xml @@ -23,6 +23,9 @@ <property name="FLEXJS_HOME" location="../../.."/> <property name="example" value="MobileMap" /> + <property name="swf.version" value="17" /> + <property name="playerglobal.version" value="11.4" /> + <property environment="env"/> <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> @@ -30,25 +33,25 @@ <include file="${basedir}/../../build_example.xml" /> - <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" > + <condition property="extlib_arg" value="-external-library-path=${FLEXJS_HOME}/js/libs/google_maps.swc" > <and> <not> <isset property="extlib_arg" /> </not> - <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" /> + <available file="${FLEXJS_HOME}/js/libs/google_maps.swc" type="file" /> </and> </condition> - <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/js.swc" > + <condition property="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../js/libs/google_maps.swc" > <and> <not> <isset property="extlib_arg" /> </not> - <available file="${FALCONJX_HOME}/../js/libs/js.swc" type="file" /> + <available file="${FALCONJX_HOME}/../js/libs/google_maps.swc" type="file" /> </and> </condition> - <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/> + <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/google_maps.swc"/> - <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}"> + <target name="main" depends="clean,build_example.compileair,build_example.compilejsair" description="Clean build of ${example}"> </target> <target name="cordova" description="Executes the Cordova build script to create Cordova app">