flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [36/50] [abbrv] git commit: [flex-asjs] [refs/heads/spark] - got the build to work by fixing up build scripts and -config.xml files
Date Wed, 04 May 2016 18:14:22 GMT
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>


Mime
View raw message