You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/04/30 02:02:54 UTC
[1/3] git commit: [flex-asjs] [refs/heads/feature/maven-migration] -
try to update ant scripts for new folder structures
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 <ah...@apache.org>
Authored: Fri Apr 29 10:19:04 2016 -0700
Committer: Alex Harui <ah...@apache.org>
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}" />
[2/3] git commit: [flex-asjs] [refs/heads/feature/maven-migration] -
got the build to work by fixing up build scripts and -config.xml files
Posted by ah...@apache.org.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/src/main/config/compile-as-config.xml b/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
index 02dd1b8..cd726e6 100644
--- a/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/JQuery/src/main/config/compile-as-config.xml
@@ -23,8 +23,8 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/HTML.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/HTML.swc</path-element>
</external-library-path>
<mxml>
@@ -62,7 +62,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/JQuery/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/src/main/config/compile-js-config.xml b/frameworks/projects/JQuery/src/main/config/compile-js-config.xml
index b2a1367..7a801a9 100644
--- a/frameworks/projects/JQuery/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/JQuery/src/main/config/compile-js-config.xml
@@ -45,12 +45,12 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Binding.swc</path-element>
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Binding.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
<!-- TODO: Why do we need these libs for JS, but not for AS? -->
- <path-element>../../../../../externs/Graphics.swc</path-element>
- <path-element>../../../../../externs/Collections.swc</path-element>
- <path-element>../../../../../externs/HTML.swc</path-element>
+ <path-element>../../../externs/Graphics.swc</path-element>
+ <path-element>../../../externs/Collections.swc</path-element>
+ <path-element>../../../externs/HTML.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index 4ad36d3..15f1091 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -71,6 +71,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -90,7 +92,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -102,6 +104,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -111,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +154,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/config/compile-as-config.xml b/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
index 0f5ebc4..b52004b 100644
--- a/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Mobile/src/main/config/compile-as-config.xml
@@ -23,9 +23,9 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/Graphics.swc</path-element>
- <path-element>../../../../../libs/HTML.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Graphics.swc</path-element>
+ <path-element>../../../libs/HTML.swc</path-element>
</external-library-path>
<mxml>
@@ -67,7 +67,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Mobile/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/config/compile-js-config.xml b/frameworks/projects/Mobile/src/main/config/compile-js-config.xml
index aa3da52..46759f5 100644
--- a/frameworks/projects/Mobile/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Mobile/src/main/config/compile-js-config.xml
@@ -45,9 +45,9 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
- <path-element>../../../../../externs/Graphics.swc</path-element>
- <path-element>../../../../../externs/HTML.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Graphics.swc</path-element>
+ <path-element>../../../externs/HTML.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Network/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml
index 1236b41..510eeb8 100644
--- a/frameworks/projects/Network/build.xml
+++ b/frameworks/projects/Network/build.xml
@@ -77,6 +77,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -96,7 +98,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -108,6 +110,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -117,7 +122,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +160,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Network/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/src/main/config/compile-as-config.xml b/frameworks/projects/Network/src/main/config/compile-as-config.xml
index cd3c1cc..10fee44 100644
--- a/frameworks/projects/Network/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Network/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Network/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/src/main/config/compile-js-config.xml b/frameworks/projects/Network/src/main/config/compile-js-config.xml
index 2d2d2ff..ebb9675 100644
--- a/frameworks/projects/Network/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Network/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Reflection/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml
index 408853b..68f374a 100644
--- a/frameworks/projects/Reflection/build.xml
+++ b/frameworks/projects/Reflection/build.xml
@@ -77,6 +77,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -96,7 +98,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -108,6 +110,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -117,7 +122,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +160,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/src/main/config/compile-as-config.xml b/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
index 220f69e..ca8ded9 100644
--- a/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Reflection/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Reflection/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/src/main/config/compile-js-config.xml b/frameworks/projects/Reflection/src/main/config/compile-js-config.xml
index d08153b..f8a82e2 100644
--- a/frameworks/projects/Reflection/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Reflection/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Storage/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/build.xml b/frameworks/projects/Storage/build.xml
index dfc42b8..666a493 100644
--- a/frameworks/projects/Storage/build.xml
+++ b/frameworks/projects/Storage/build.xml
@@ -81,6 +81,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -100,7 +102,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/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,6 +114,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -121,7 +126,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +165,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Storage/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/src/main/config/compile-as-config.xml b/frameworks/projects/Storage/src/main/config/compile-as-config.xml
index d04d981..3bd604b 100644
--- a/frameworks/projects/Storage/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Storage/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
@@ -61,7 +61,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Storage/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/src/main/config/compile-js-config.xml b/frameworks/projects/Storage/src/main/config/compile-js-config.xml
index 7d6b613..bfe3a6b 100644
--- a/frameworks/projects/Storage/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Storage/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/XML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml
index b404972..b69ef08 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/build.xml
@@ -73,6 +73,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs" />
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -92,7 +94,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -104,6 +106,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -114,7 +119,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +157,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/XML/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/config/compile-as-config.xml b/frameworks/projects/XML/src/main/config/compile-as-config.xml
index 36dd27f..68c5690 100644
--- a/frameworks/projects/XML/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/XML/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/XML/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/config/compile-js-config.xml b/frameworks/projects/XML/src/main/config/compile-js-config.xml
index 0f11c83..2070726 100644
--- a/frameworks/projects/XML/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/XML/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
[3/3] git commit: [flex-asjs] [refs/heads/feature/maven-migration] -
got the build to work by fixing up build scripts and -config.xml files
Posted by ah...@apache.org.
got the build to work by fixing up build scripts and -config.xml files
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c1c49ec0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c1c49ec0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c1c49ec0
Branch: refs/heads/feature/maven-migration
Commit: c1c49ec0671593c11910af9adc1700b6fe9d16d0
Parents: 22f2dd9
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 29 17:02:38 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 29 17:02:38 2016 -0700
----------------------------------------------------------------------
frameworks/projects/Binding/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 2 +-
.../src/main/config/compile-js-config.xml | 8 +-
frameworks/projects/Charts/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 84 ++++++++++++++++++++
.../src/main/config/compile-as-to-js-config.xml | 76 ------------------
.../src/main/config/compile-asjs-config.xml | 71 -----------------
.../Charts/src/main/config/compile-config.xml | 84 --------------------
.../src/main/config/compile-js-config.xml | 28 +++----
frameworks/projects/Collections/build.xml | 13 ++-
.../src/main/config/compile-as-config.xml | 2 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/Core/build.xml | 12 ++-
.../Core/src/main/config/compile-js-config.xml | 3 +-
frameworks/projects/CreateJS/build.xml | 13 ++-
.../src/main/config/compile-as-config.xml | 8 +-
.../src/main/config/compile-js-config.xml | 6 +-
frameworks/projects/DragDrop/build.xml | 13 ++-
.../src/main/config/compile-as-config.xml | 2 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/Effects/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 2 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/Flat/build.xml | 13 ++-
.../Flat/src/main/config/compile-as-config.xml | 10 +--
.../Flat/src/main/config/compile-js-config.xml | 4 +-
frameworks/projects/Formatters/build.xml | 13 ++-
.../src/main/config/compile-as-config.xml | 4 +-
.../src/main/config/compile-js-config.xml | 4 +-
frameworks/projects/GoogleMaps/build.xml | 13 ++-
.../src/main/config/compile-as-config.xml | 4 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/Graphics/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 2 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/HTML/build.xml | 11 ++-
.../HTML/src/main/config/compile-as-config.xml | 10 +--
.../HTML/src/main/config/compile-js-config.xml | 8 +-
frameworks/projects/HTML5/build.xml | 11 ++-
.../HTML5/src/main/config/compile-as-config.xml | 6 +-
.../HTML5/src/main/config/compile-js-config.xml | 4 +-
frameworks/projects/JQuery/build.xml | 13 ++-
.../src/main/config/compile-as-config.xml | 6 +-
.../src/main/config/compile-js-config.xml | 10 +--
frameworks/projects/Mobile/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 8 +-
.../src/main/config/compile-js-config.xml | 6 +-
frameworks/projects/Network/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 2 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/Reflection/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 2 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/Storage/build.xml | 11 ++-
.../src/main/config/compile-as-config.xml | 4 +-
.../src/main/config/compile-js-config.xml | 2 +-
frameworks/projects/XML/build.xml | 11 ++-
.../XML/src/main/config/compile-as-config.xml | 2 +-
.../XML/src/main/config/compile-js-config.xml | 2 +-
59 files changed, 329 insertions(+), 385 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index ad9a0ff..4745777 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -78,6 +78,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs" />
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -97,7 +99,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -109,6 +111,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -118,7 +123,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +161,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Binding/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/config/compile-as-config.xml b/frameworks/projects/Binding/src/main/config/compile-as-config.xml
index 7f593e9..72cf089 100644
--- a/frameworks/projects/Binding/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Binding/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Binding/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/config/compile-js-config.xml b/frameworks/projects/Binding/src/main/config/compile-js-config.xml
index 2c5abf4..b118aa4 100644
--- a/frameworks/projects/Binding/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Binding/src/main/config/compile-js-config.xml
@@ -45,18 +45,18 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
- <manifest>basic-manifest.xml</manifest>
+ <manifest>../src/main/resources/basic-manifest.xml</manifest>
</namespace>
</namespaces>
<source-path>
- <path-element>../flex</path-element>
+ <path-element>../src/main/flex</path-element>
</source-path>
<warn-no-constructor>false</warn-no-constructor>
@@ -66,7 +66,7 @@
</include-file>
<include-sources>
- <path-element>../flex</path-element>
+ <path-element>../src/main/flex</path-element>
</include-sources>
<include-namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index e4c8e2f..347bd5d 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -72,6 +72,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -91,7 +93,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -103,6 +105,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -112,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +155,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Charts/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/config/compile-as-config.xml b/frameworks/projects/Charts/src/main/config/compile-as-config.xml
new file mode 100644
index 0000000..472c6df
--- /dev/null
+++ b/frameworks/projects/Charts/src/main/config/compile-as-config.xml
@@ -0,0 +1,84 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<flex-config>
+
+ <compiler>
+ <accessible>false</accessible>
+
+ <external-library-path>
+ <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Graphics.swc</path-element>
+ <path-element>../../../libs/HTML.swc</path-element>
+ </external-library-path>
+
+ <mxml>
+ <children-as-data>true</children-as-data>
+ </mxml>
+ <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
+ <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>
+
+ <keep-as3-metadata>
+ <name>Bindable</name>
+ <name>Managed</name>
+ <name>ChangeEvent</name>
+ <name>NonCommittingChangeEvent</name>
+ <name>Transient</name>
+ </keep-as3-metadata>
+
+ <locale/>
+
+ <library-path/>
+
+ <namespaces>
+ <namespace>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+ <manifest>../src/main/resources/basic-manifest.xml</manifest>
+ </namespace>
+ </namespaces>
+
+ <source-path>
+ <path-element>../src/main/flex</path-element>
+ </source-path>
+
+ <warn-no-constructor>false</warn-no-constructor>
+ </compiler>
+
+ <include-file>
+ <name>defaults.css</name>
+ <path>../src/main/resources/defaults.css</path>
+ </include-file>
+ <include-file>
+ <name>js/out/*</name>
+ <path>generated-sources/flexjs/*</path>
+ </include-file>
+
+ <include-classes>
+ <class>ChartsClasses</class>
+ </include-classes>
+
+ <include-namespaces>
+ <uri>library://ns.apache.org/flexjs/basic</uri>
+ </include-namespaces>
+
+ <target-player>${playerglobal.version}</target-player>
+
+
+</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Charts/src/main/config/compile-as-to-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/config/compile-as-to-js-config.xml b/frameworks/projects/Charts/src/main/config/compile-as-to-js-config.xml
deleted file mode 100644
index ee3cac0..0000000
--- a/frameworks/projects/Charts/src/main/config/compile-as-to-js-config.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<flex-config>
-
- <compiler>
- <accessible>false</accessible>
-
- <external-library-path>
- <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>D:/SDKs/FlexJS/nightly_PF18_AIR18.0_en_US/js/libs/js.swc</path-element>
- <path-element>D:/SDKs/FlexJS/nightly_PF18_AIR18.0_en_US/js/libs/gcl.swc</path-element>
- </external-library-path>
-
- <mxml>
- <children-as-data>true</children-as-data>
- </mxml>
- <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
- <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>
-
- <keep-as3-metadata>
- <name>Bindable</name>
- <name>Managed</name>
- <name>ChangeEvent</name>
- <name>NonCommittingChangeEvent</name>
- <name>Transient</name>
- </keep-as3-metadata>
-
- <namespaces>
- <namespace>
- <uri>library://ns.apache.org/flexjs/basic</uri>
- <manifest>basic-manifest.xml</manifest>
- </namespace>
- </namespaces>
-
- <locale/>
-
- <source-path>
- <!--<path-element>as/src</path-element>-->
- </source-path>
-
- <warn-no-constructor>false</warn-no-constructor>
- </compiler>
-
- <include-sources>
- <path-element>as/src</path-element>
- </include-sources>
-
- <include-classes>
- <class>ChartsClasses</class>
- </include-classes>
-
- <include-namespaces>
- <uri>library://ns.apache.org/flexjs/basic</uri>
- </include-namespaces>
-
- <target-player>11.1</target-player>
-
-
-</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Charts/src/main/config/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/config/compile-asjs-config.xml b/frameworks/projects/Charts/src/main/config/compile-asjs-config.xml
deleted file mode 100644
index 4934459..0000000
--- a/frameworks/projects/Charts/src/main/config/compile-asjs-config.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<flex-config>
-
- <compiler>
- <accessible>false</accessible>
-
- <external-library-path>
- </external-library-path>
-
- <mxml>
- <children-as-data>true</children-as-data>
- </mxml>
- <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
- <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>
-
- <keep-as3-metadata>
- <name>Bindable</name>
- <name>Managed</name>
- <name>ChangeEvent</name>
- <name>NonCommittingChangeEvent</name>
- <name>Transient</name>
- </keep-as3-metadata>
-
- <locale/>
-
- <library-path>
- <!-- asjscompc won't 'link' these classes in, but will list their requires
- if these swcs are on the external-library-path then their requires
- will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
- <path-element>../../../../../externs/Graphics.swc</path-element>
- <path-element>../../../../../externs/HTML.swc</path-element>
- </library-path>
-
- <source-path>
- <path-element>../flex</path-element>
- </source-path>
-
- <warn-no-constructor>false</warn-no-constructor>
- </compiler>
-
- <include-sources>
- <path-element>../flex</path-element>
- </include-sources>
-
- <include-namespaces>
- <uri>library://ns.apache.org/flexjs/basic</uri>
- </include-namespaces>
-
- <target-player>${playerglobal.version}</target-player>
-
-
-</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Charts/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/config/compile-config.xml b/frameworks/projects/Charts/src/main/config/compile-config.xml
deleted file mode 100644
index bbdbe54..0000000
--- a/frameworks/projects/Charts/src/main/config/compile-config.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<flex-config>
-
- <compiler>
- <accessible>false</accessible>
-
- <external-library-path>
- <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/Graphics.swc</path-element>
- <path-element>../../../../../libs/HTML.swc</path-element>
- </external-library-path>
-
- <mxml>
- <children-as-data>true</children-as-data>
- </mxml>
- <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
- <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>
-
- <keep-as3-metadata>
- <name>Bindable</name>
- <name>Managed</name>
- <name>ChangeEvent</name>
- <name>NonCommittingChangeEvent</name>
- <name>Transient</name>
- </keep-as3-metadata>
-
- <locale/>
-
- <library-path/>
-
- <namespaces>
- <namespace>
- <uri>library://ns.apache.org/flexjs/basic</uri>
- <manifest>basic-manifest.xml</manifest>
- </namespace>
- </namespaces>
-
- <source-path>
- <path-element>../flex</path-element>
- </source-path>
-
- <warn-no-constructor>false</warn-no-constructor>
- </compiler>
-
- <include-file>
- <name>defaults.css</name>
- <path>defaults.css</path>
- </include-file>
- <include-file>
- <name>js/out/*</name>
- <path>../../../target/generated-sources/flexjs/*</path>
- </include-file>
-
- <include-classes>
- <class>ChartsClasses</class>
- </include-classes>
-
- <include-namespaces>
- <uri>library://ns.apache.org/flexjs/basic</uri>
- </include-namespaces>
-
- <target-player>${playerglobal.version}</target-player>
-
-
-</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Charts/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/src/main/config/compile-js-config.xml b/frameworks/projects/Charts/src/main/config/compile-js-config.xml
index 3c3784b..96bbbea 100644
--- a/frameworks/projects/Charts/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Charts/src/main/config/compile-js-config.xml
@@ -22,7 +22,6 @@
<accessible>false</accessible>
<external-library-path>
- <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
</external-library-path>
<mxml>
@@ -42,43 +41,38 @@
<locale/>
- <library-path/>
+ <library-path>
+ <!-- asjscompc won't 'link' these classes in, but will list their requires
+ if these swcs are on the external-library-path then their requires
+ will not be listed -->
+ <path-element>../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Graphics.swc</path-element>
+ <path-element>../../../externs/HTML.swc</path-element>
+ </library-path>
<namespaces>
<namespace>
<uri>library://ns.apache.org/flexjs/basic</uri>
- <manifest>basic-manifest.xml</manifest>
+ <manifest>../src/main/resources/basic-manifest.xml</manifest>
</namespace>
</namespaces>
<source-path>
- <path-element>as/src</path-element>
- <path-element>asjs/src</path-element>
+ <path-element>../src/main/flex</path-element>
</source-path>
<warn-no-constructor>false</warn-no-constructor>
</compiler>
<include-file>
- <name>js/out/*</name>
- <path>js/out/*</path>
</include-file>
- <!--
- <include-file>
- <name>js/src/*</name>
- <path>js/src/*</path>
- </include-file>
- -->
<include-classes>
- <class>CoreJSClasses</class>
- <!-- leave out for now until we get Application to compile
- <class>CoreASJSClasses</class>-->
+ <class>ChartsClasses</class>
</include-classes>
<include-namespaces>
<uri>library://ns.apache.org/flexjs/basic</uri>
- <uri>library://ns.apache.org/flexjs/svg</uri>
</include-namespaces>
<target-player>${playerglobal.version}</target-player>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index 7446999..2f199d6 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/build.xml
@@ -72,7 +72,9 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
@@ -91,7 +93,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -103,6 +105,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -112,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +155,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Collections/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/src/main/config/compile-as-config.xml b/frameworks/projects/Collections/src/main/config/compile-as-config.xml
index 161a916..a6315c4 100644
--- a/frameworks/projects/Collections/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Collections/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Collections/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/src/main/config/compile-js-config.xml b/frameworks/projects/Collections/src/main/config/compile-js-config.xml
index 15f3375..8ff9f5e 100644
--- a/frameworks/projects/Collections/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Collections/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index f9ad384..0e809f1 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -76,6 +76,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -95,7 +97,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -107,6 +109,10 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <!-- make JS output folder now so include-file doesn't error -->
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -116,7 +122,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +164,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Core/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/config/compile-js-config.xml b/frameworks/projects/Core/src/main/config/compile-js-config.xml
index 580228e..aec1201 100644
--- a/frameworks/projects/Core/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Core/src/main/config/compile-js-config.xml
@@ -21,7 +21,8 @@
<compiler>
<accessible>false</accessible>
- <external-library-path><path-element>/Users/christoferdutz/Maven-Repository/com/adobe/air/framework/airglobal/20.0/airglobal-20.0.swc</path-element></external-library-path>
+ <external-library-path>
+ </external-library-path>
<mxml>
<children-as-data>true</children-as-data>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/CreateJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index 230e39f..73715d4 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/build.xml
@@ -84,7 +84,9 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
@@ -103,7 +105,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/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,6 +117,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -124,7 +129,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +168,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml b/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
index 0520d0b..8cbde61 100644
--- a/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/CreateJS/src/main/config/compile-as-config.xml
@@ -23,9 +23,9 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/HTML.swc</path-element>
- <path-element>../../../../../libs/Graphics.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/HTML.swc</path-element>
+ <path-element>../../../libs/Graphics.swc</path-element>
</external-library-path>
<mxml>
@@ -63,7 +63,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/CreateJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/src/main/config/compile-js-config.xml b/frameworks/projects/CreateJS/src/main/config/compile-js-config.xml
index f3376ae..4da0629 100644
--- a/frameworks/projects/CreateJS/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/CreateJS/src/main/config/compile-js-config.xml
@@ -56,9 +56,9 @@
</source-path>
<library-path>
- <path-element>../../../../../externs/Core.swc</path-element>
- <path-element>../../../../../externs/HTML.swc</path-element>
- <path-element>../../../../../externs/Graphics.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/HTML.swc</path-element>
+ <path-element>../../../externs/Graphics.swc</path-element>
</library-path>
<warn-no-constructor>false</warn-no-constructor>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index e7f7b44..02050f0 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -79,7 +79,9 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
@@ -98,7 +100,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -110,6 +112,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -119,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +162,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
index cad0134..4354372 100644
--- a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/DragDrop/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/config/compile-js-config.xml b/frameworks/projects/DragDrop/src/main/config/compile-js-config.xml
index 79d4527..c311b86 100644
--- a/frameworks/projects/DragDrop/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/DragDrop/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index 1b4bb13..57290e4 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -80,6 +80,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -99,7 +101,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/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,6 +113,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -120,7 +125,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +163,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Effects/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/config/compile-as-config.xml b/frameworks/projects/Effects/src/main/config/compile-as-config.xml
index 2680ee6..43a5c2b 100644
--- a/frameworks/projects/Effects/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Effects/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Effects/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/config/compile-js-config.xml b/frameworks/projects/Effects/src/main/config/compile-js-config.xml
index f7a7d88..a0c69d7 100644
--- a/frameworks/projects/Effects/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Effects/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index 121ba8a..ead1f91 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/build.xml
@@ -79,7 +79,9 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
@@ -98,7 +100,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -110,6 +112,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -119,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +162,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Flat/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/src/main/config/compile-as-config.xml b/frameworks/projects/Flat/src/main/config/compile-as-config.xml
index be7e60c..ee18a9f 100644
--- a/frameworks/projects/Flat/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Flat/src/main/config/compile-as-config.xml
@@ -23,10 +23,10 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Binding.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/Graphics.swc</path-element>
- <path-element>../../../../../libs/HTML.swc</path-element>
+ <path-element>../../../libs/Binding.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Graphics.swc</path-element>
+ <path-element>../../../libs/HTML.swc</path-element>
</external-library-path>
<mxml>
@@ -70,7 +70,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Flat/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/src/main/config/compile-js-config.xml b/frameworks/projects/Flat/src/main/config/compile-js-config.xml
index 9de2e8e..daeec75 100644
--- a/frameworks/projects/Flat/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Flat/src/main/config/compile-js-config.xml
@@ -45,8 +45,8 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
- <path-element>../../../../../externs/HTML.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/HTML.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index 2de4469..8c00494 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -71,7 +71,9 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
@@ -90,7 +92,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -102,6 +104,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -111,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +154,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml b/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
index 26da743..7f4eac8 100644
--- a/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Formatters/src/main/config/compile-as-config.xml
@@ -23,8 +23,8 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/HTML.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/HTML.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Formatters/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/src/main/config/compile-js-config.xml b/frameworks/projects/Formatters/src/main/config/compile-js-config.xml
index d18303a..fae26a3 100644
--- a/frameworks/projects/Formatters/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Formatters/src/main/config/compile-js-config.xml
@@ -45,8 +45,8 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
- <path-element>../../../../../externs/HTML.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/HTML.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/GoogleMaps/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index e2656dd..751ba34 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/build.xml
@@ -75,7 +75,9 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
@@ -94,7 +96,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -106,6 +108,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -115,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +159,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
index ce7e95a..0ff4ec5 100644
--- a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
@@ -61,7 +61,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/GoogleMaps/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/src/main/config/compile-js-config.xml b/frameworks/projects/GoogleMaps/src/main/config/compile-js-config.xml
index 440e4ae..c8e7f0f 100644
--- a/frameworks/projects/GoogleMaps/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/GoogleMaps/src/main/config/compile-js-config.xml
@@ -43,7 +43,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index e040adf..4c45c8e 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/build.xml
@@ -79,6 +79,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -98,7 +100,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -110,6 +112,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -119,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +162,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml b/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
index 12db487..939474b 100644
--- a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/Graphics/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/config/compile-js-config.xml b/frameworks/projects/Graphics/src/main/config/compile-js-config.xml
index 7a280a6..a3e3d6b 100644
--- a/frameworks/projects/Graphics/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Graphics/src/main/config/compile-js-config.xml
@@ -45,7 +45,7 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 3a1743a..0385e8d 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -75,6 +75,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -94,7 +96,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -106,6 +108,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -115,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +158,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/HTML/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/config/compile-as-config.xml b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
index dd172cd..4773caa 100644
--- a/frameworks/projects/HTML/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
@@ -23,10 +23,10 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Binding.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/Graphics.swc</path-element>
- <path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../libs/Binding.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/Graphics.swc</path-element>
+ <path-element>../../../libs/Collections.swc</path-element>
</external-library-path>
<mxml>
@@ -73,7 +73,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/HTML/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/config/compile-js-config.xml b/frameworks/projects/HTML/src/main/config/compile-js-config.xml
index 56b3739..9a7dc0a 100644
--- a/frameworks/projects/HTML/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/HTML/src/main/config/compile-js-config.xml
@@ -45,10 +45,10 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Binding.swc</path-element>
- <path-element>../../../../../externs/Core.swc</path-element>
- <path-element>../../../../../externs/Graphics.swc</path-element>
- <path-element>../../../../../externs/Collections.swc</path-element>
+ <path-element>../../../externs/Binding.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/Graphics.swc</path-element>
+ <path-element>../../../externs/Collections.swc</path-element>
</library-path>
<namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/HTML5/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml
index fb10d86..567bb4e 100644
--- a/frameworks/projects/HTML5/build.xml
+++ b/frameworks/projects/HTML5/build.xml
@@ -71,6 +71,8 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -90,7 +92,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -102,6 +104,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -111,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +154,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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/c1c49ec0/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/src/main/config/compile-as-config.xml b/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
index 8cd01a7..5ccc4ed 100644
--- a/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/HTML5/src/main/config/compile-as-config.xml
@@ -23,8 +23,8 @@
<external-library-path>
<path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
- <path-element>../../../../../libs/Core.swc</path-element>
- <path-element>../../../../../libs/HTML.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
+ <path-element>../../../libs/HTML.swc</path-element>
</external-library-path>
<mxml>
@@ -62,7 +62,7 @@
<include-file>
<name>defaults.css</name>
- <path>defaults.css</path>
+ <path>../src/main/resources/defaults.css</path>
</include-file>
<include-file>
<name>js/out/*</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/HTML5/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/src/main/config/compile-js-config.xml b/frameworks/projects/HTML5/src/main/config/compile-js-config.xml
index 9fcaea5..a693771 100644
--- a/frameworks/projects/HTML5/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/HTML5/src/main/config/compile-js-config.xml
@@ -45,8 +45,8 @@
<!-- asjscompc won't 'link' these classes in, but will list their requires
if these swcs are on the external-library-path then their requires
will not be listed -->
- <path-element>../../../../../externs/Core.swc</path-element>
- <path-element>../../../../../externs/HTML.swc</path-element>
+ <path-element>../../../externs/Core.swc</path-element>
+ <path-element>../../../externs/HTML.swc</path-element>
</library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1c49ec0/frameworks/projects/JQuery/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml
index 30da306..e0f2ca5 100644
--- a/frameworks/projects/JQuery/build.xml
+++ b/frameworks/projects/JQuery/build.xml
@@ -75,7 +75,9 @@
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
<!-- make JS output folder now so include-file doesn't error -->
<mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-
+ <copy file="${basedir}/src/main/config/compile-as-config.xml"
+ tofile="${basedir}/target/compile-as-config.xml" />
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
@@ -94,7 +96,7 @@
<compc fork="true"
output="${basedir}/target/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="${basedir}/src/main/config/compile-as-config.xml" />
+ <load-config filename="${basedir}/target/compile-as-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
<arg value="-define=COMPILE::AS3,true" />
@@ -106,6 +108,9 @@
<target name="compile-asjs">
<echo message="Cross-compiling ${target.name}"/>
<echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+ <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
+ <copy file="${basedir}/src/main/config/compile-js-config.xml"
+ tofile="${basedir}/target/compile-js-config.xml" />
<java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
<jvmarg value="-Xmx384m" />
<jvmarg value="-Dsun.io.useCanonCaches=false" />
@@ -115,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/config/compile-js-config.xml" />
+ <arg value="-load-config=${basedir}/target/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 +159,7 @@
<compc fork="true"
output="${basedir}/target/externs/${target.name}">
<jvmarg line="${compc.jvm.args}"/>
- <load-config filename="src/main/config/compile-js-config.xml" />
+ <load-config filename="target/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}" />