flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/2] git commit: [flex-asjs] [refs/heads/develop] - don't copy the -config.xml files. Makes life easier for IDEs
Date Sat, 07 May 2016 05:14:33 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 06d762723 -> 1149ba78c


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/frameworks/projects/JQuery/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml
index e0f2ca5..d537af2 100644
--- a/frameworks/projects/JQuery/build.xml
+++ b/frameworks/projects/JQuery/build.xml
@@ -75,8 +75,6 @@
         <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 +94,7 @@
         <compc fork="true"
             output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="${basedir}/target/compile-as-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" />
@@ -109,8 +107,6 @@
         <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 +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}/target/compile-js-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}" />
@@ -159,7 +155,7 @@
         <compc fork="true"
             output="${basedir}/target/externs/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="target/compile-js-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/1149ba78/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 cd726e6..94e3423 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>
@@ -49,12 +49,12 @@
         <namespaces>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/jquery</uri>
-                <manifest>../src/main/resources/jquery-manifest.xml</manifest>
+                <manifest>../resources/jquery-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -62,11 +62,11 @@
     
     <include-file>
         <name>defaults.css</name>
-        <path>../src/main/resources/defaults.css</path>
+        <path>../resources/defaults.css</path>
     </include-file>
     <include-file>
         <name>js/out/*</name>
-        <path>generated-sources/flexjs/*</path>
+        <path>../../../target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/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 7a801a9..db0127f 100644
--- a/frameworks/projects/JQuery/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/JQuery/src/main/config/compile-js-config.xml
@@ -45,23 +45,23 @@
             <!-- 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>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/jquery</uri>
-                <manifest>../src/main/resources/jquery-manifest.xml</manifest>
+                <manifest>../resources/jquery-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index 15f1091..1b5bd21 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -71,8 +71,6 @@
         <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 +90,7 @@
         <compc fork="true"
             output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="${basedir}/target/compile-as-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" />
@@ -105,8 +103,6 @@
         <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" />
@@ -116,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}/target/compile-js-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 +150,7 @@
         <compc fork="true"
             output="${basedir}/target/externs/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="target/compile-js-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/1149ba78/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 b52004b..36f1c2c 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>
@@ -50,16 +50,16 @@
         <namespaces>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/cordova</uri>
-                <manifest>../src/main/resources/cordova-manifest.xml</manifest>
+                <manifest>../resources/cordova-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -67,11 +67,11 @@
     
     <include-file>
         <name>defaults.css</name>
-        <path>../src/main/resources/defaults.css</path>
+        <path>../resources/defaults.css</path>
     </include-file>
     <include-file>
         <name>js/out/*</name>
-        <path>generated-sources/flexjs/*</path>
+        <path>../../../target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/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 46759f5..158f4a2 100644
--- a/frameworks/projects/Mobile/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Mobile/src/main/config/compile-js-config.xml
@@ -45,24 +45,24 @@
             <!-- 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>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/cordova</uri>
-                <manifest>../src/main/resources/cordova-manifest.xml</manifest>
+                <manifest>../resources/cordova-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/frameworks/projects/Network/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml
index 510eeb8..afa3440 100644
--- a/frameworks/projects/Network/build.xml
+++ b/frameworks/projects/Network/build.xml
@@ -77,8 +77,6 @@
         <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 +96,7 @@
         <compc fork="true"
             output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="${basedir}/target/compile-as-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,8 +109,6 @@
         <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" />
@@ -122,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}/target/compile-js-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 +156,7 @@
         <compc fork="true"
             output="${basedir}/target/externs/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="target/compile-js-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/1149ba78/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 10fee44..ef4550b 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>
@@ -48,12 +48,12 @@
         <namespaces>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -61,7 +61,7 @@
     
     <include-file>
         <name>js/out/*</name>
-        <path>generated-sources/flexjs/*</path>
+        <path>../../../target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/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 ebb9675..04db866 100644
--- a/frameworks/projects/Network/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Network/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>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/frameworks/projects/Reflection/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/build.xml b/frameworks/projects/Reflection/build.xml
index 68f374a..c75cd4e 100644
--- a/frameworks/projects/Reflection/build.xml
+++ b/frameworks/projects/Reflection/build.xml
@@ -77,8 +77,6 @@
         <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 +96,7 @@
         <compc fork="true"
             output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="${basedir}/target/compile-as-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,8 +109,6 @@
         <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" />
@@ -122,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}/target/compile-js-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 +156,7 @@
         <compc fork="true"
             output="${basedir}/target/externs/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="target/compile-js-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/1149ba78/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 ca8ded9..f2319c4 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>
@@ -49,7 +49,7 @@
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -57,12 +57,12 @@
     
     <include-file>
         <name>js/out/*</name>
-        <path>generated-sources/flexjs/*</path>
+        <path>../../../target/generated-sources/flexjs/*</path>
     </include-file>
 
     <!-- TODO: Why this? -->
     <include-sources>
-        <path-element>../src/main/flex</path-element>
+        <path-element>../flex</path-element>
     </include-sources>
     
     <include-namespaces>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/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 f8a82e2..596968d 100644
--- a/frameworks/projects/Reflection/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Reflection/src/main/config/compile-js-config.xml
@@ -45,14 +45,14 @@
             <!-- 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>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -63,7 +63,7 @@
 
     <!-- TODO: Why this? -->
     <include-sources>
-        <path-element>../src/main/flex</path-element>
+        <path-element>../flex</path-element>
     </include-sources>
     
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/frameworks/projects/Storage/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/build.xml b/frameworks/projects/Storage/build.xml
index 666a493..e7e0646 100644
--- a/frameworks/projects/Storage/build.xml
+++ b/frameworks/projects/Storage/build.xml
@@ -81,8 +81,6 @@
         <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. -->
@@ -102,7 +100,7 @@
         <compc fork="true"
             output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="${basedir}/target/compile-as-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,8 +113,6 @@
         <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" />
@@ -126,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}/target/compile-js-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}" />
@@ -165,7 +161,7 @@
         <compc fork="true"
             output="${basedir}/target/externs/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="target/compile-js-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/1149ba78/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 3bd604b..47046e2 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>
@@ -48,12 +48,12 @@
         <namespaces>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -61,11 +61,11 @@
     
     <include-file>
         <name>defaults.css</name>
-        <path>../src/main/resources/defaults.css</path>
+        <path>../resources/defaults.css</path>
     </include-file>
     <include-file>
         <name>js/out/*</name>
-        <path>generated-sources/flexjs/*</path>
+        <path>../../../target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/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 bfe3a6b..7453387 100644
--- a/frameworks/projects/Storage/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/Storage/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>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/frameworks/projects/XML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml
index b69ef08..f62f2e3 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/build.xml
@@ -73,8 +73,6 @@
         <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 +92,7 @@
         <compc fork="true"
             output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="${basedir}/target/compile-as-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" />
@@ -107,8 +105,6 @@
         <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 +115,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}/target/compile-js-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 +153,7 @@
         <compc fork="true"
             output="${basedir}/target/externs/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="target/compile-js-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/1149ba78/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 68c5690..9c9ffd7 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>
@@ -48,12 +48,12 @@
         <namespaces>
             <namespace>
                 <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -61,7 +61,7 @@
     
     <include-file>
         <name>js/out/*</name>
-        <path>generated-sources/flexjs/*</path>
+        <path>../../../target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1149ba78/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 2070726..fd4d0a6 100644
--- a/frameworks/projects/XML/src/main/config/compile-js-config.xml
+++ b/frameworks/projects/XML/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>../src/main/resources/basic-manifest.xml</manifest>
+                <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
         </namespaces>
         
         <source-path>
-            <path-element>../src/main/flex</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -67,7 +67,7 @@
 
     <!-- TODO: Why this? -->
     <include-sources>
-        <path-element>../src/main/flex</path-element>
+        <path-element>../flex</path-element>
     </include-sources>
     
     <include-namespaces>


Mime
View raw message