put paths to externs swcs in a variable so it can be controlled by FB
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8176257d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8176257d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8176257d Branch: refs/heads/e4x Commit: 8176257d7b7413d101662456997459f495c90920 Parents: 0399067 Author: Alex Harui <[email protected]> Authored: Fri Feb 5 14:04:11 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Fri Feb 5 14:04:11 2016 -0800 ---------------------------------------------------------------------- frameworks/fb.properties | 5 +++++ 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 | 15 +++++++++------ 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 | 15 +++++++++------ frameworks/projects/Graphics/build.xml | 10 ++++++---- frameworks/projects/HTML/build.xml | 10 ++++++---- frameworks/projects/HTML5/build.xml | 10 ++++++---- frameworks/projects/JQuery/build.xml | 15 +++++++++------ frameworks/projects/Mobile/build.xml | 10 ++++++---- frameworks/projects/Network/build.xml | 10 ++++++---- frameworks/projects/Reflection/build.xml | 10 ++++++---- 18 files changed, 116 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/fb.properties ---------------------------------------------------------------------- diff --git a/frameworks/fb.properties b/frameworks/fb.properties new file mode 100644 index 0000000..2ee2886 --- /dev/null +++ b/frameworks/fb.properties @@ -0,0 +1,5 @@ +env.FALCON_HOME=/Users/aharui/ApacheFlexJSNightly +env.FALCONJX_HOME=/Users/aharui/ApacheFlexJSNightly/js +GCL.SWC=/Users/aharui/ApacheFlexJSNightly/js/libs/GCL.swc +JS.SWC=/Users/aharui/ApacheFlexJSNightly/js/libs/js.swc + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Binding/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml index 1036fc0..43ced99 100644 --- a/frameworks/projects/Binding/build.xml +++ b/frameworks/projects/Binding/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Binding-${release.version}.swc" /> <property name="target.name.no.version" value="Binding.swc" /> @@ -113,9 +115,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -150,9 +152,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Charts/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml index 56dbf82..ce3de72 100644 --- a/frameworks/projects/Charts/build.xml +++ b/frameworks/projects/Charts/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Charts-${release.version}.swc" /> <property name="target.name.no.version" value="Charts.swc" /> @@ -107,9 +109,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -144,9 +146,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Collections/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml index 48e298b..b94ec18 100644 --- a/frameworks/projects/Collections/build.xml +++ b/frameworks/projects/Collections/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Collections-${release.version}.swc" /> <property name="target.name.no.version" value="Collections.swc" /> @@ -107,9 +109,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -144,9 +146,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Core/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml index d7e5137..009ab52 100644 --- a/frameworks/projects/Core/build.xml +++ b/frameworks/projects/Core/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Core-${release.version}.swc" /> <property name="target.name.no.version" value="Core.swc" /> @@ -111,9 +113,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -152,9 +154,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/CreateJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml index eb84ec2..2d0018e 100644 --- a/frameworks/projects/CreateJS/build.xml +++ b/frameworks/projects/CreateJS/build.xml @@ -28,6 +28,9 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="CREATEJS.SWC" value="${FALCONJX_HOME}/../externs/createjs/out/bin/createjs.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> <condition property="no.lint" value="true"> <os family="windows"/> </condition> @@ -116,10 +119,10 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/createjs/out/bin/createjs.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <arg value="-external-library-path+=${CREATEJS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -154,10 +157,10 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/createjs/out/bin/createjs.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <arg value="-external-library-path+=${CREATEJS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/DragDrop/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml index 1f42c0c..930716f 100644 --- a/frameworks/projects/DragDrop/build.xml +++ b/frameworks/projects/DragDrop/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="DragDrop-${release.version}.swc" /> <property name="target.name.no.version" value="DragDrop.swc" /> @@ -114,9 +116,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -151,9 +153,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Effects/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml index 558a021..84062df 100644 --- a/frameworks/projects/Effects/build.xml +++ b/frameworks/projects/Effects/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Effects-${release.version}.swc" /> <property name="target.name.no.version" value="Effects.swc" /> @@ -115,9 +117,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -152,9 +154,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Flat/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml index b23122d..858b6d2 100644 --- a/frameworks/projects/Flat/build.xml +++ b/frameworks/projects/Flat/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Flat-${release.version}.swc" /> <property name="target.name.no.version" value="Flat.swc" /> @@ -114,9 +116,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -151,9 +153,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Formatters/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml index aab06cc..2048821 100644 --- a/frameworks/projects/Formatters/build.xml +++ b/frameworks/projects/Formatters/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Formatters-${release.version}.swc" /> <property name="target.name.no.version" value="Formatters.swc" /> @@ -107,9 +109,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -144,9 +146,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/GoogleMaps/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml index ca36195..f9e3654 100644 --- a/frameworks/projects/GoogleMaps/build.xml +++ b/frameworks/projects/GoogleMaps/build.xml @@ -28,6 +28,9 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="GOOGLEMAPS.SWC" value="${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> <property name="target.name" value="GoogleMaps-${release.version}.swc" /> <property name="target.name.no.version" value="GoogleMaps.swc" /> @@ -107,10 +110,10 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <arg value="-external-library-path+=${GOOGLEMAPS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -145,10 +148,10 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <arg value="-external-library-path+=${GOOGLEMAPS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Graphics/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml index 63d9f84..25463f7 100644 --- a/frameworks/projects/Graphics/build.xml +++ b/frameworks/projects/Graphics/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Graphics-${release.version}.swc" /> <property name="target.name.no.version" value="Graphics.swc" /> @@ -115,9 +117,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -152,9 +154,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/HTML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml index df29536..3305178 100644 --- a/frameworks/projects/HTML/build.xml +++ b/frameworks/projects/HTML/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="HTML-${release.version}.swc" /> <property name="target.name.no.version" value="HTML.swc" /> @@ -111,9 +113,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -148,9 +150,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/HTML5/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml index 447af25..11d0829 100644 --- a/frameworks/projects/HTML5/build.xml +++ b/frameworks/projects/HTML5/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="HTML5-${release.version}.swc" /> <property name="target.name.no.version" value="HTML5.swc" /> @@ -107,9 +109,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -144,9 +146,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/JQuery/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml index 2787b86..ba3a857 100644 --- a/frameworks/projects/JQuery/build.xml +++ b/frameworks/projects/JQuery/build.xml @@ -28,6 +28,9 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <property name="JQUERY.SWC" value="${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc" /> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> <property name="target.name" value="JQuery-${release.version}.swc" /> <property name="target.name.no.version" value="JQuery.swc" /> @@ -107,10 +110,10 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <arg value="-external-library-path+=${JQUERY.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -145,10 +148,10 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <arg value="-external-library-path+=${JQUERY.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Mobile/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml index 0cb312a..9666013 100644 --- a/frameworks/projects/Mobile/build.xml +++ b/frameworks/projects/Mobile/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Mobile-${release.version}.swc" /> <property name="target.name.no.version" value="Mobile.swc" /> @@ -107,9 +109,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -144,9 +146,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Network/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml index e971317..b7696a2 100644 --- a/frameworks/projects/Network/build.xml +++ b/frameworks/projects/Network/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Network-${release.version}.swc" /> <property name="target.name.no.version" value="Network.swc" /> @@ -113,9 +115,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -150,9 +152,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8176257d/frameworks/projects/Reflection/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml index 86ec620..b15f68a 100644 --- a/frameworks/projects/Reflection/build.xml +++ b/frameworks/projects/Reflection/build.xml @@ -28,6 +28,8 @@ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <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="target.name" value="Reflection-${release.version}.swc" /> <property name="target.name.no.version" value="Reflection.swc" /> @@ -113,9 +115,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> @@ -150,9 +152,9 @@ <load-config filename="src/main/resources/compile-asjs-config.xml" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <arg value="-external-library-path+=${JS.SWC}" /> <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> + <arg value="-library-path+=${GCL.SWC}" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </compc>
