refactor Ant builds to use dual mode
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/80e61d8e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/80e61d8e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/80e61d8e Branch: refs/heads/dual Commit: 80e61d8e3489bc013dabe0f95f13dccc75150507 Parents: 64afd41 Author: Alex Harui <[email protected]> Authored: Tue Feb 14 10:15:04 2017 -0800 Committer: Alex Harui <[email protected]> Committed: Tue Feb 14 10:15:04 2017 -0800 ---------------------------------------------------------------------- frameworks/js/FlexJS/projects/BasicJS/build.xml | 25 +---- .../js/FlexJS/projects/BindingJS/build.xml | 25 +---- .../js/FlexJS/projects/ChartsJS/build.xml | 25 +---- .../js/FlexJS/projects/CollectionsJS/build.xml | 25 +---- frameworks/js/FlexJS/projects/CoreJS/build.xml | 25 +---- .../js/FlexJS/projects/CreateJSJS/build.xml | 25 +---- .../js/FlexJS/projects/DragDropJS/build.xml | 25 +---- .../js/FlexJS/projects/EffectsJS/build.xml | 25 +---- .../js/FlexJS/projects/ExpressJS/build.xml | 25 +---- frameworks/js/FlexJS/projects/FlatJS/build.xml | 27 +---- .../js/FlexJS/projects/FontAwesomeJS/build.xml | 25 +---- .../js/FlexJS/projects/FormattersJS/build.xml | 25 +---- .../js/FlexJS/projects/GoogleMapsJS/build.xml | 34 +------ .../js/FlexJS/projects/GraphicsJS/build.xml | 25 +---- frameworks/js/FlexJS/projects/HTML5JS/build.xml | 25 +---- frameworks/js/FlexJS/projects/HTMLJS/build.xml | 25 +---- .../js/FlexJS/projects/JQueryJS/build.xml | 25 +---- .../js/FlexJS/projects/LanguageJS/build.xml | 25 +---- .../projects/MaterialDesignLiteJS/build.xml | 25 +---- .../src/main/config/compile-js-config.xml | 8 +- .../js/FlexJS/projects/MobileJS/build.xml | 26 +---- .../js/FlexJS/projects/NetworkJS/build.xml | 25 +---- .../js/FlexJS/projects/ReflectionJS/build.xml | 26 +---- .../js/FlexJS/projects/StorageJS/build.xml | 27 +---- frameworks/js/FlexJS/projects/XMLJS/build.xml | 26 +---- .../XMLJS/src/main/config/compile-js-config.xml | 2 + frameworks/projects/Basic/build.xml | 43 ++++++-- .../Basic/src/main/config/compile-as-config.xml | 93 ----------------- .../src/main/config/compile-swf-config.xml | 102 +++++++++++++++++++ frameworks/projects/Binding/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 73 ------------- .../src/main/config/compile-swf-config.xml | 82 +++++++++++++++ frameworks/projects/Charts/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 82 --------------- .../src/main/config/compile-swf-config.xml | 91 +++++++++++++++++ frameworks/projects/Collections/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 73 ------------- .../src/main/config/compile-swf-config.xml | 82 +++++++++++++++ frameworks/projects/Core/build.xml | 43 ++++++-- .../Core/src/main/config/compile-as-config.xml | 78 -------------- .../Core/src/main/config/compile-swf-config.xml | 87 ++++++++++++++++ frameworks/projects/CreateJS/build.xml | 45 ++++++-- .../src/main/config/compile-as-config.xml | 82 --------------- .../src/main/config/compile-swf-config.xml | 91 +++++++++++++++++ frameworks/projects/DragDrop/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 74 -------------- .../src/main/config/compile-swf-config.xml | 83 +++++++++++++++ frameworks/projects/Effects/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 74 -------------- .../src/main/config/compile-swf-config.xml | 83 +++++++++++++++ frameworks/projects/Express/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 89 ---------------- .../src/main/config/compile-swf-config.xml | 98 ++++++++++++++++++ frameworks/projects/Flat/build.xml | 43 ++++++-- .../Flat/src/main/config/compile-as-config.xml | 89 ---------------- .../Flat/src/main/config/compile-swf-config.xml | 98 ++++++++++++++++++ frameworks/projects/FontAwesome/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 88 ---------------- .../src/main/config/compile-swf-config.xml | 97 ++++++++++++++++++ frameworks/projects/Formatters/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 74 -------------- .../src/main/config/compile-swf-config.xml | 83 +++++++++++++++ frameworks/projects/GoogleMaps/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 81 --------------- .../src/main/config/compile-swf-config.xml | 90 ++++++++++++++++ frameworks/projects/Graphics/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 82 --------------- .../src/main/config/compile-swf-config.xml | 91 +++++++++++++++++ frameworks/projects/HTML/build.xml | 43 ++++++-- .../HTML/src/main/config/compile-as-config.xml | 78 -------------- .../HTML/src/main/config/compile-swf-config.xml | 87 ++++++++++++++++ frameworks/projects/HTML5/build.xml | 43 ++++++-- .../HTML5/src/main/config/compile-as-config.xml | 80 --------------- .../src/main/config/compile-swf-config.xml | 89 ++++++++++++++++ frameworks/projects/JQuery/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 79 -------------- .../src/main/config/compile-swf-config.xml | 88 ++++++++++++++++ frameworks/projects/Language/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 63 ------------ .../src/main/config/compile-swf-config.xml | 72 +++++++++++++ .../projects/MaterialDesignLite/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 89 ---------------- .../src/main/config/compile-swf-config.xml | 98 ++++++++++++++++++ frameworks/projects/Mobile/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 87 ---------------- .../src/main/config/compile-swf-config.xml | 96 +++++++++++++++++ frameworks/projects/Network/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 73 ------------- .../src/main/config/compile-swf-config.xml | 82 +++++++++++++++ frameworks/projects/Reflection/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 69 ------------- .../src/main/config/compile-swf-config.xml | 79 ++++++++++++++ frameworks/projects/Storage/build.xml | 43 ++++++-- .../src/main/config/compile-as-config.xml | 78 -------------- .../src/main/config/compile-swf-config.xml | 87 ++++++++++++++++ frameworks/projects/XML/build.xml | 42 ++++++-- .../XML/src/main/config/compile-as-config.xml | 73 ------------- .../XML/src/main/config/compile-swf-config.xml | 82 +++++++++++++++ 98 files changed, 3037 insertions(+), 2641 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/BasicJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/BasicJS/build.xml b/frameworks/js/FlexJS/projects/BasicJS/build.xml index 5a39024..5763b8e 100644 --- a/frameworks/js/FlexJS/projects/BasicJS/build.xml +++ b/frameworks/js/FlexJS/projects/BasicJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/BindingJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/BindingJS/build.xml b/frameworks/js/FlexJS/projects/BindingJS/build.xml index 454fa2a..604b773 100644 --- a/frameworks/js/FlexJS/projects/BindingJS/build.xml +++ b/frameworks/js/FlexJS/projects/BindingJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/ChartsJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/ChartsJS/build.xml b/frameworks/js/FlexJS/projects/ChartsJS/build.xml index f901286..501e81d 100644 --- a/frameworks/js/FlexJS/projects/ChartsJS/build.xml +++ b/frameworks/js/FlexJS/projects/ChartsJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/CollectionsJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml index f1f976d..8831b6d 100644 --- a/frameworks/js/FlexJS/projects/CollectionsJS/build.xml +++ b/frameworks/js/FlexJS/projects/CollectionsJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/CoreJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/CoreJS/build.xml b/frameworks/js/FlexJS/projects/CoreJS/build.xml index 1c1f737..ff7e909 100644 --- a/frameworks/js/FlexJS/projects/CoreJS/build.xml +++ b/frameworks/js/FlexJS/projects/CoreJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/CreateJSJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml index 75bb24e..07a5b6d 100644 --- a/frameworks/js/FlexJS/projects/CreateJSJS/build.xml +++ b/frameworks/js/FlexJS/projects/CreateJSJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/createjs-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/createjs-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/DragDropJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/DragDropJS/build.xml b/frameworks/js/FlexJS/projects/DragDropJS/build.xml index 1a97cc8..8735368 100644 --- a/frameworks/js/FlexJS/projects/DragDropJS/build.xml +++ b/frameworks/js/FlexJS/projects/DragDropJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <arg value="-compiler.strict-xml=true" /> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/EffectsJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/EffectsJS/build.xml b/frameworks/js/FlexJS/projects/EffectsJS/build.xml index 698a40b..bdb18e4 100644 --- a/frameworks/js/FlexJS/projects/EffectsJS/build.xml +++ b/frameworks/js/FlexJS/projects/EffectsJS/build.xml @@ -34,7 +34,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -50,7 +50,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -60,29 +60,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/ExpressJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/ExpressJS/build.xml b/frameworks/js/FlexJS/projects/ExpressJS/build.xml index 49ce823..3e94f49 100644 --- a/frameworks/js/FlexJS/projects/ExpressJS/build.xml +++ b/frameworks/js/FlexJS/projects/ExpressJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/FlatJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/FlatJS/build.xml b/frameworks/js/FlexJS/projects/FlatJS/build.xml index 45214de..f8004aa 100644 --- a/frameworks/js/FlexJS/projects/FlatJS/build.xml +++ b/frameworks/js/FlexJS/projects/FlatJS/build.xml @@ -34,7 +34,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -50,7 +50,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -60,31 +60,14 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> - </target> + </target> <target name="copy-js" > <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml b/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml index 7e7735e..2c314bd 100644 --- a/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml +++ b/frameworks/js/FlexJS/projects/FontAwesomeJS/build.xml @@ -34,7 +34,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -50,7 +50,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -60,29 +60,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/FormattersJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/FormattersJS/build.xml b/frameworks/js/FlexJS/projects/FormattersJS/build.xml index 7708d84..4dc4262 100644 --- a/frameworks/js/FlexJS/projects/FormattersJS/build.xml +++ b/frameworks/js/FlexJS/projects/FormattersJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml index 2656529..eecd361 100644 --- a/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml +++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,40 +49,10 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> - <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > - <jvmarg value="-Xmx384m" /> - <jvmarg value="-Dsun.io.useCanonCaches=false" /> - <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> - <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> - <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> - <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> - <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> - <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> - </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> - <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> <target name="copy-js" > http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/GraphicsJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml index 628f069..bb0b039 100644 --- a/frameworks/js/FlexJS/projects/GraphicsJS/build.xml +++ b/frameworks/js/FlexJS/projects/GraphicsJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <arg value="-compiler.strict-xml=true" /> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/HTML5JS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/HTML5JS/build.xml b/frameworks/js/FlexJS/projects/HTML5JS/build.xml index 3843b20..8077bc2 100644 --- a/frameworks/js/FlexJS/projects/HTML5JS/build.xml +++ b/frameworks/js/FlexJS/projects/HTML5JS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <arg value="-compiler.strict-xml=true" /> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/HTMLJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/HTMLJS/build.xml b/frameworks/js/FlexJS/projects/HTMLJS/build.xml index ee07b10..9efd910 100644 --- a/frameworks/js/FlexJS/projects/HTMLJS/build.xml +++ b/frameworks/js/FlexJS/projects/HTMLJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/JQueryJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/JQueryJS/build.xml b/frameworks/js/FlexJS/projects/JQueryJS/build.xml index 41c057a..e86edc0 100644 --- a/frameworks/js/FlexJS/projects/JQueryJS/build.xml +++ b/frameworks/js/FlexJS/projects/JQueryJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/jquery-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/jquery-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/LanguageJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/LanguageJS/build.xml b/frameworks/js/FlexJS/projects/LanguageJS/build.xml index 5365aba..04a0f59 100644 --- a/frameworks/js/FlexJS/projects/LanguageJS/build.xml +++ b/frameworks/js/FlexJS/projects/LanguageJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/build.xml b/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/build.xml index d8b59f1..19f8c41 100644 --- a/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/build.xml +++ b/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/build.xml @@ -34,7 +34,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -50,7 +50,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -60,29 +60,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/src/main/config/compile-js-config.xml index 80890c8..ff74c64 100644 --- a/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/MaterialDesignLiteJS/src/main/config/compile-js-config.xml @@ -26,12 +26,12 @@ <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> <binding-value-change-event-type>valueChange</binding-value-change-event-type> <define> - <name>COMPILE::SWF</name> - <value>false</value> + <name>COMPILE::SWF</name> + <value>false</value> </define> <define> - <name>COMPILE::JS</name> - <value>true</value> + <name>COMPILE::JS</name> + <value>true</value> </define> <keep-as3-metadata> <name>Bindable</name> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/MobileJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/MobileJS/build.xml b/frameworks/js/FlexJS/projects/MobileJS/build.xml index 8244c63..190e4d5 100644 --- a/frameworks/js/FlexJS/projects/MobileJS/build.xml +++ b/frameworks/js/FlexJS/projects/MobileJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,30 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/NetworkJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/NetworkJS/build.xml b/frameworks/js/FlexJS/projects/NetworkJS/build.xml index 053b6cc..af906d5 100644 --- a/frameworks/js/FlexJS/projects/NetworkJS/build.xml +++ b/frameworks/js/FlexJS/projects/NetworkJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,29 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="-compiler.strict-xml=true" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/ReflectionJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml index f058231..0d62e2d 100644 --- a/frameworks/js/FlexJS/projects/ReflectionJS/build.xml +++ b/frameworks/js/FlexJS/projects/ReflectionJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,30 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="-compiler.strict-xml=true" /> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/StorageJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/StorageJS/build.xml b/frameworks/js/FlexJS/projects/StorageJS/build.xml index c328fe2..be0a838 100644 --- a/frameworks/js/FlexJS/projects/StorageJS/build.xml +++ b/frameworks/js/FlexJS/projects/StorageJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,32 +59,15 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <arg value="-compiler.strict-xml=true" /> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> - + <target name="copy-js" > <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"/> <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/generated-sources"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/XMLJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/XMLJS/build.xml b/frameworks/js/FlexJS/projects/XMLJS/build.xml index e82d048..8ce4e19 100644 --- a/frameworks/js/FlexJS/projects/XMLJS/build.xml +++ b/frameworks/js/FlexJS/projects/XMLJS/build.xml @@ -33,7 +33,7 @@ <property file="${basedir}/${target.name}.properties"/> <delete file="${basedir}/${target.name}.properties"/> - <target name="main" depends="clean,check-compiler,compile-js-swc,compile-asjs" description="Full build of ${ant.project.name}.swc"> + <target name="main" depends="clean,check-compiler,compile" description="Full build of ${ant.project.name}.swc"> </target> <target name="clean"> @@ -49,7 +49,7 @@ </delete> </target> - <target name="compile-asjs" depends="check-compiler"> + <target name="compile" depends="check-compiler"> <echo message="Cross-compiling ${target.name}"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <mkdir dir="${basedir}/target/generated-sources/flexjs"/> @@ -59,30 +59,12 @@ <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> <arg value="-compiler.strict-xml=true" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${FLEX_HOME}/frameworks/projects/${target.name.nojs}/target/${target.name.nojs}.swc" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> <arg value="-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> <arg value="-load-config+=${basedir}/src/main/config/compile-js-config.xml" /> </java> - </target> - - <target name="compile-js-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> - <mkdir dir="${basedir}/target"/> - - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="-compiler.strict-xml=true" /> - <load-config filename="${FLEX_HOME}/frameworks/js-config.xml" /> - <load-config filename="src/main/config/compile-js-config.xml" /> - </compc> <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name}" /> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml index 93a3615..ece82d1 100644 --- a/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/XMLJS/src/main/config/compile-js-config.xml @@ -71,6 +71,8 @@ <warn-no-constructor>false</warn-no-constructor> </compiler> + <keep-asdoc>true</keep-asdoc> + <include-file> </include-file> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/80e61d8e/frameworks/projects/Basic/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/build.xml b/frameworks/projects/Basic/build.xml index 7b7fc3c..f298a11 100644 --- a/frameworks/projects/Basic/build.xml +++ b/frameworks/projects/Basic/build.xml @@ -74,20 +74,26 @@ <echo message="Compiling libs/${ant.project.name}.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <compc fork="true" - output="${basedir}/target/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-define=COMPILE::SWF,true" /> - <arg value="-define=COMPILE::JS,false" /> - </compc> - <!--<copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}" />--> + <arg value="-compiler.strict-xml=true" /> + <arg value="-compiler.targets=SWF,JSFlex" /> + <arg value="-output=${basedir}/target/${target.name}" /> + <arg value="-load-config+=${basedir}/src/main/config/compile-swf-config.xml" /> + <arg value="-js-load-config=${FLEX_HOME}/frameworks/js-config.xml" /> + <arg value="-js-load-config+=${basedir}/../../js/FlexJS/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" /> + </java> </target> - <target name="check-compiler" depends="check-falcon-home"> + <target name="check-compiler" depends="check-falcon-home,check-falconjx-home"> <path id="lib.path"> <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> </path> @@ -113,4 +119,23 @@ unless="FALCON_HOME"/> </target> + <target name="check-falconjx-home" unless="FALCONJX_HOME" + description="Check FALCON_HOME is a directory."> + + <echo message="FALCONJX_HOME is ${env.FALCONJX_HOME}"/> + + <available file="${env.FALCONJX_HOME}/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${env.FALCONJX_HOME}"/> + + <available file="${FLEXJS_HOME}/../flex-falcon/compiler-jx/lib/jsc.jar" + type="file" + property="FALCONJX_HOME" + value="${FLEXJS_HOME}/../flex-falcon/compiler-jx"/> + + <fail message="FALCONJX_HOME must be set to a folder with a lib sub-folder containing jsc.jar such as the compiler-jx folder in flex-falcon repo or the js folder of a FlexJS SDK" + unless="FALCONJX_HOME"/> + </target> + </project>
