Repository: flex-asjs Updated Branches: refs/heads/feature/maven-migration 9dbcb5d14 -> c1c49ec06
try to update ant scripts for new folder structures Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/22f2dd9f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/22f2dd9f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/22f2dd9f Branch: refs/heads/feature/maven-migration Commit: 22f2dd9ffbd21354f79b3b3bb58dcfd46bbd5175 Parents: 9dbcb5d Author: Alex Harui <[email protected]> Authored: Fri Apr 29 10:19:04 2016 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Apr 29 10:19:04 2016 -0700 ---------------------------------------------------------------------- frameworks/projects/Binding/build.xml | 10 +++++----- frameworks/projects/Charts/build.xml | 10 +++++----- frameworks/projects/Collections/build.xml | 10 +++++----- frameworks/projects/Core/build.xml | 10 +++++----- frameworks/projects/CreateJS/build.xml | 12 ++++++------ frameworks/projects/DragDrop/build.xml | 10 +++++----- frameworks/projects/Effects/build.xml | 10 +++++----- frameworks/projects/Flat/build.xml | 10 +++++----- frameworks/projects/Formatters/build.xml | 10 +++++----- frameworks/projects/GoogleMaps/build.xml | 12 ++++++------ frameworks/projects/Graphics/build.xml | 10 +++++----- frameworks/projects/HTML/build.xml | 10 +++++----- frameworks/projects/HTML5/build.xml | 10 +++++----- frameworks/projects/JQuery/build.xml | 12 ++++++------ frameworks/projects/Mobile/build.xml | 10 +++++----- frameworks/projects/Network/build.xml | 10 +++++----- frameworks/projects/Reflection/build.xml | 10 +++++----- frameworks/projects/Storage/build.xml | 12 ++++++------ frameworks/projects/XML/build.xml | 10 +++++----- 19 files changed, 99 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Binding/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml index 29ffbe4..ad9a0ff 100644 --- a/frameworks/projects/Binding/build.xml +++ b/frameworks/projects/Binding/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Binding-${release.version}.swc" /> <property name="target.name.no.version" value="Binding.swc" /> @@ -97,7 +97,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -118,7 +118,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -156,7 +156,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Charts/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml index 268eaab..e4c8e2f 100644 --- a/frameworks/projects/Charts/build.xml +++ b/frameworks/projects/Charts/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Charts-${release.version}.swc" /> <property name="target.name.no.version" value="Charts.swc" /> @@ -91,7 +91,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -112,7 +112,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -150,7 +150,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Collections/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml index 90e8757..7446999 100644 --- a/frameworks/projects/Collections/build.xml +++ b/frameworks/projects/Collections/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Collections-${release.version}.swc" /> <property name="target.name.no.version" value="Collections.swc" /> @@ -91,7 +91,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -112,7 +112,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -150,7 +150,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Core/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml index 2d1b251..f9ad384 100644 --- a/frameworks/projects/Core/build.xml +++ b/frameworks/projects/Core/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Core-${release.version}.swc" /> <property name="target.name.no.version" value="Core.swc" /> @@ -95,7 +95,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -116,7 +116,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -158,7 +158,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/CreateJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml index caed5c7..230e39f 100644 --- a/frameworks/projects/CreateJS/build.xml +++ b/frameworks/projects/CreateJS/build.xml @@ -31,15 +31,15 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <condition property="CREATEJS.SWC" value="${FALCONJX_HOME}/../js/libs/createjs.swc" > <available file="${FALCONJX_HOME}/../js/libs/createjs.swc" /> </condition> - <property name="CREATEJS.SWC" value="${FALCONJX_HOME}/../externs/createjs/out/bin/createjs.swc" /> + <property name="CREATEJS.SWC" value="${FALCONJX_HOME}/../externs/createjs/target/createjs.swc" /> <condition property="no.lint" value="true"> <os family="windows"/> </condition> @@ -103,7 +103,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -124,7 +124,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -163,7 +163,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/DragDrop/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml index ef605af..e7f7b44 100644 --- a/frameworks/projects/DragDrop/build.xml +++ b/frameworks/projects/DragDrop/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="DragDrop-${release.version}.swc" /> <property name="target.name.no.version" value="DragDrop.swc" /> @@ -98,7 +98,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -119,7 +119,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -157,7 +157,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Effects/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml index a469f5e..1b4bb13 100644 --- a/frameworks/projects/Effects/build.xml +++ b/frameworks/projects/Effects/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Effects-${release.version}.swc" /> <property name="target.name.no.version" value="Effects.swc" /> @@ -99,7 +99,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -120,7 +120,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -158,7 +158,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Flat/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml index 9bc139f..121ba8a 100644 --- a/frameworks/projects/Flat/build.xml +++ b/frameworks/projects/Flat/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Flat-${release.version}.swc" /> <property name="target.name.no.version" value="Flat.swc" /> @@ -98,7 +98,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -119,7 +119,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -157,7 +157,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Formatters/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml index 9f57088..2de4469 100644 --- a/frameworks/projects/Formatters/build.xml +++ b/frameworks/projects/Formatters/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Formatters-${release.version}.swc" /> <property name="target.name.no.version" value="Formatters.swc" /> @@ -90,7 +90,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -111,7 +111,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -149,7 +149,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/GoogleMaps/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml index 2bdd19d..e2656dd 100644 --- a/frameworks/projects/GoogleMaps/build.xml +++ b/frameworks/projects/GoogleMaps/build.xml @@ -31,15 +31,15 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <condition property="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../js/libs/google_maps.swc" > <available file="${FALCONJX_HOME}/../js/libs/google_maps.swc" /> </condition> - <property name="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc" /> + <property name="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../externs/google_maps/target/google_maps.swc" /> <property name="target.name" value="GoogleMaps-${release.version}.swc" /> <property name="target.name.no.version" value="GoogleMaps.swc" /> @@ -94,7 +94,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -115,7 +115,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -154,7 +154,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Graphics/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml index c05b49a..e040adf 100644 --- a/frameworks/projects/Graphics/build.xml +++ b/frameworks/projects/Graphics/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Graphics-${release.version}.swc" /> <property name="target.name.no.version" value="Graphics.swc" /> @@ -98,7 +98,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -119,7 +119,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -157,7 +157,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/HTML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml index a70c56f..3a1743a 100644 --- a/frameworks/projects/HTML/build.xml +++ b/frameworks/projects/HTML/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="HTML-${release.version}.swc" /> <property name="target.name.no.version" value="HTML.swc" /> @@ -94,7 +94,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -115,7 +115,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -153,7 +153,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/HTML5/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml index a316de6..fb10d86 100644 --- a/frameworks/projects/HTML5/build.xml +++ b/frameworks/projects/HTML5/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="HTML5-${release.version}.swc" /> <property name="target.name.no.version" value="HTML5.swc" /> @@ -90,7 +90,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -111,7 +111,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -149,7 +149,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/JQuery/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml index 754b23a..30da306 100644 --- a/frameworks/projects/JQuery/build.xml +++ b/frameworks/projects/JQuery/build.xml @@ -31,15 +31,15 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <condition property="JQUERY.SWC" value="${FALCONJX_HOME}/../js/libs/jquery.swc" > <available file="${FALCONJX_HOME}/../js/libs/jquery.swc" /> </condition> - <property name="JQUERY.SWC" value="${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc" /> + <property name="JQUERY.SWC" value="${FALCONJX_HOME}/../externs/jquery/target/jquery-1.9.swc" /> <property name="target.name" value="JQuery-${release.version}.swc" /> <property name="target.name.no.version" value="JQuery.swc" /> @@ -94,7 +94,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -115,7 +115,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -154,7 +154,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Mobile/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml index 3def2bf..4ad36d3 100644 --- a/frameworks/projects/Mobile/build.xml +++ b/frameworks/projects/Mobile/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Mobile-${release.version}.swc" /> <property name="target.name.no.version" value="Mobile.swc" /> @@ -90,7 +90,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -111,7 +111,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -149,7 +149,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Network/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml index 8a2e7fd..1236b41 100644 --- a/frameworks/projects/Network/build.xml +++ b/frameworks/projects/Network/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Network-${release.version}.swc" /> <property name="target.name.no.version" value="Network.swc" /> @@ -96,7 +96,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -117,7 +117,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -155,7 +155,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Reflection/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml index 3b5038c..408853b 100644 --- a/frameworks/projects/Reflection/build.xml +++ b/frameworks/projects/Reflection/build.xml @@ -31,11 +31,11 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="Reflection-${release.version}.swc" /> <property name="target.name.no.version" value="Reflection.swc" /> @@ -96,7 +96,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -117,7 +117,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -155,7 +155,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/Storage/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Storage/build.xml b/frameworks/projects/Storage/build.xml index 66508c1..dfc42b8 100644 --- a/frameworks/projects/Storage/build.xml +++ b/frameworks/projects/Storage/build.xml @@ -31,15 +31,15 @@ <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <condition property="CORDOVA.SWC" value="${FALCONJX_HOME}/../js/libs/cordova.swc" > <available file="${FALCONJX_HOME}/../js/libs/cordova.swc" /> </condition> - <property name="CORDOVA.SWC" value="${FALCONJX_HOME}/../externs/cordova/out/bin/cordova.swc" /> + <property name="CORDOVA.SWC" value="${FALCONJX_HOME}/../externs/cordova/target/cordova.swc" /> <property name="target.name" value="Storage-${release.version}.swc" /> <property name="target.name.no.version" value="Storage.swc" /> @@ -100,7 +100,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -121,7 +121,7 @@ <arg value="-js-output-type=FLEXJS" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -160,7 +160,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path+=${JS.SWC}" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22f2dd9f/frameworks/projects/XML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml index 7db690a..b404972 100644 --- a/frameworks/projects/XML/build.xml +++ b/frameworks/projects/XML/build.xml @@ -28,8 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <target name="more-props" > - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> <property name="target.name" value="XML-${release.version}.swc" /> <property name="target.name.no.version" value="XML.swc" /> <path id="lib.path"> @@ -92,7 +92,7 @@ <compc fork="true" output="${basedir}/target/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="${basedir}/src/main/resources/compile-config.xml" /> + <load-config filename="${basedir}/src/main/config/compile-as-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-define=COMPILE::AS3,true" /> @@ -114,7 +114,7 @@ <arg value="-compiler.strict-xml=true" /> <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> @@ -152,7 +152,7 @@ <compc fork="true" output="${basedir}/target/externs/${target.name}"> <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/resources/compile-asjs-config.xml" /> + <load-config filename="src/main/config/compile-js-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> <arg value="-external-library-path=${JS.SWC}" />
