flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [01/47] git commit: [flex-asjs] [refs/heads/develop] - put compile-js-config in separate project folder tree to get ready for IDE builds
Date Wed, 18 May 2016 18:46:37 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 193170924 -> 63bf4c0c6


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index aa0daa1..fae7fc8 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -27,20 +27,11 @@
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
-    <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
-    <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/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/target/GCL.swc" />
     
-    <property name="target.name" value="Core-${release.version}.swc" />
+    <property name="target.name" value="Core.swc" />
     <property name="target.name.no.version" value="Core.swc" />
 
-    <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test"
description="Full build of Core.swc">
+    <target name="main" depends="clean,compile,test" description="Full build of Core.swc">
     </target>
 
     <target name="test" unless="is.jenkins">
@@ -74,8 +65,6 @@
         <echo message="Compiling target/${target.name}"/>
         <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCON_HOME: ${FALCON_HOME}"/>
-        <!-- make JS output folder now so include-file doesn't error -->
-        <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
 
         <!-- Load the <compc> task. We can't do this at the <project> level
-->
         <!-- because targets that run before flexTasks.jar gets built would fail. -->
@@ -104,80 +93,4 @@
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}"
/>
     </target>
 
-    <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"/>
-        <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
-            <jvmarg value="-Xmx384m" />
-            <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
-            <arg value="+flexlib=${FLEX_HOME}/frameworks" />
-            <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="+playerglobal.version=${playerglobal.version}" />
-            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
-            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
-            <arg value="-external-library-path+=${JS.SWC}" />
-            <!-- this is not on external-library path otherwise goog.requires are not
generated -->
-            <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-        </java>
-        <!-- hack: inject some jsdoc to get rid of a warning when building examples -->
-        <replace file="${basedir}/target/generated-sources/flexjs/org/apache/flex/events/IEventDispatcher.js"
-            token="org.apache.flex.events.IEventDispatcher.prototype.dispatchEvent"
-            value="/** @param {(Object|null|string)} event The event. &#xD;&#xA;@return
{boolean} The return. */&#xD;&#xA;org.apache.flex.events.IEventDispatcher.prototype.dispatchEvent"
/>
-    </target>
-
-    <target name="compile-extern-swc" description="Compiles .as files into .swc used for
cross-compiling other projects">
-        <echo message="Compiling target/externs/${target.name}"/>
-        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
-        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
-        <!-- make JS output folder now so include-file doesn't error -->
-        <mkdir dir="${FLEXJS_HOME}/frameworks/externs"/>
-        <mkdir dir="${basedir}/target/externs"/>
-        
-        <!-- 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"/>
-        <!--
-         Link in the classes (and their dependencies) for the MXML tags
-         listed in this project's manifest.xml.
-         Also link the additional classes (and their dependencies)
-         listed in CoreClasses.as,
-         because these aren't referenced by the manifest classes.
-         Keep the standard metadata when compiling.
-         Include the appropriate CSS files and assets in the SWC.
-         Don't include any resources in the SWC.
-         Write a bundle list of referenced resource bundles
-         into the file bundles.properties in this directory.
-         -->
-        <compc fork="true"
-            output="${basedir}/target/externs/${target.name}">
-            <jvmarg line="${compc.jvm.args}"/>
-            <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}" />
-            <!-- this is not on external-library path otherwise goog.requires are not
generated -->
-            <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-        </compc>
-        <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name.no.version}"
/>
-    </target>
-
-    <target name="copy-js">
-        <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
-            <fileset dir="${basedir}/target/generated-sources/flexjs">
-                <include name="**/**"/>
-            </fileset>
-        </copy>
-    </target>
-
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Core/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/config/compile-as-config.xml b/frameworks/projects/Core/src/main/config/compile-as-config.xml
index 61da2b5..f844ad0 100644
--- a/frameworks/projects/Core/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Core/src/main/config/compile-as-config.xml
@@ -61,7 +61,7 @@
     
     <include-file>
         <name>js/out/*</name>
-        <path>../../../target/generated-sources/flexjs/*</path>
+        <path>../../../../../js/FlexJS/projects/Core/target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/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
deleted file mode 100644
index 3708b54..0000000
--- a/frameworks/projects/Core/src/main/config/compile-js-config.xml
+++ /dev/null
@@ -1,78 +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>
-        </library-path>
-        
-        <namespaces>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../resources/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>
-    </include-file>
-
-    <include-sources>
-    </include-sources>
-    
-    <include-classes>
-        <class>CoreClasses</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/bdce696a/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index 4a4ee73..89214e6 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/build.xml
@@ -27,19 +27,10 @@
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
-    <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
-    <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/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/target/GCL.swc" />
-    <property name="target.name" value="Graphics-${release.version}.swc" />
+    <property name="target.name" value="Graphics.swc" />
     <property name="target.name.no.version" value="Graphics.swc" />
     
-    <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test"
description="Full build of Graphics.swc">
+    <target name="main" depends="clean,compile,test" description="Full build of Graphics.swc">
     </target>
     
     <target name="test" unless="is.jenkins">
@@ -106,76 +97,5 @@
         </compc>
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}"
/>
     </target>
-    
-    <target name="compile-asjs">
-        <echo message="Cross-compiling ${target.name}"/>
-        <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-        <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
-            <jvmarg value="-Xmx384m" />
-            <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
-            <arg value="+flexlib=${FLEX_HOME}/frameworks" />
-            <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="+playerglobal.version=${playerglobal.version}" />
-            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
-            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
-            <arg value="-external-library-path+=${JS.SWC}" />
-            <!-- this is not on external-library path otherwise goog.requires are not
generated -->
-            <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-        </java>
-    </target>
-    
-    <target name="compile-extern-swc" description="Compiles .as files into .swc used for
cross-compiling other projects">
-        <echo message="Compiling target/externs/${target.name}"/>
-        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
-        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
-        <!-- make JS output folder now so include-file doesn't error -->
-        <mkdir dir="${FLEXJS_HOME}/frameworks/externs"/>
-        <mkdir dir="${basedir}/target/externs"/>
-        
-        <!-- 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"/>
-        <!--
-         Link in the classes (and their dependencies) for the MXML tags
-         listed in this project's manifest.xml.
-         Also link the additional classes (and their dependencies)
-         listed in CoreClasses.as,
-         because these aren't referenced by the manifest classes.
-         Keep the standard metadata when compiling.
-         Include the appropriate CSS files and assets in the SWC.
-         Don't include any resources in the SWC.
-         Write a bundle list of referenced resource bundles
-         into the file bundles.properties in this directory.
-         -->
-        <compc fork="true"
-            output="${basedir}/target/externs/${target.name}">
-            <jvmarg line="${compc.jvm.args}"/>
-            <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}" />
-            <!-- this is not on external-library path otherwise goog.requires are not
generated -->
-            <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-        </compc>
-        <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name.no.version}"
/>
-    </target>
-    
-    <target name="copy-js">
-        <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
-            <fileset dir="${basedir}/target/generated-sources/flexjs">
-                <include name="**/**"/>
-            </fileset>
-        </copy>
-    </target>
 
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/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 27f1415..42f522b 100644
--- a/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/Graphics/src/main/config/compile-as-config.xml
@@ -61,7 +61,7 @@
     
     <include-file>
         <name>js/out/*</name>
-        <path>../../../target/generated-sources/flexjs/*</path>
+        <path>../../../../../js/FlexJS/projects/Graphics/target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/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
deleted file mode 100644
index cd003bc..0000000
--- a/frameworks/projects/Graphics/src/main/config/compile-js-config.xml
+++ /dev/null
@@ -1,82 +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>
-        </library-path>
-        
-        <namespaces>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../resources/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>
-    </include-file>
-
-    <include-sources>
-    </include-sources>
-    
-    <include-classes>
-        <class>GraphicsClasses</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/bdce696a/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index d17dd25..c3ad02b 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -27,19 +27,10 @@
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
-    <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
-    <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/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/target/GCL.swc" />
-    <property name="target.name" value="HTML-${release.version}.swc" />
+    <property name="target.name" value="HTML.swc" />
     <property name="target.name.no.version" value="HTML.swc" />
     
-    <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test"
description="Full build of HTML.swc">
+    <target name="main" depends="clean,compile,test" description="Full build of HTML.swc">
     </target>
     
     <target name="test" unless="is.jenkins">
@@ -103,76 +94,4 @@
         <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}"
/>
     </target>
 
-    <target name="compile-asjs">
-        <echo message="Cross-compiling ${target.name}"/>
-        <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <mkdir dir="${basedir}/target/generated-sources/flexjs"/>
-        <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
-            <jvmarg value="-Xmx384m" />
-            <jvmarg value="-Dsun.io.useCanonCaches=false" />
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
-            <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
-            <arg value="+flexlib=${FLEX_HOME}/frameworks" />
-            <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="+playerglobal.version=${playerglobal.version}" />
-            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
-            <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
-            <arg value="-external-library-path+=${JS.SWC}" />
-            <!-- this is not on external-library path otherwise goog.requires are not
generated -->
-            <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-        </java>
-    </target>
-
-    <target name="compile-extern-swc" description="Compiles .as files into .swc used for
cross-compiling other projects">
-        <echo message="Compiling target/externs/${target.name}"/>
-        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
-        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
-        <!-- make JS output folder now so include-file doesn't error -->
-        <mkdir dir="${FLEXJS_HOME}/frameworks/externs"/>
-        <mkdir dir="${basedir}/target/externs"/>
-        
-        <!-- 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"/>
-        <!--
-         Link in the classes (and their dependencies) for the MXML tags
-         listed in this project's manifest.xml.
-         Also link the additional classes (and their dependencies)
-         listed in CoreClasses.as,
-         because these aren't referenced by the manifest classes.
-         Keep the standard metadata when compiling.
-         Include the appropriate CSS files and assets in the SWC.
-         Don't include any resources in the SWC.
-         Write a bundle list of referenced resource bundles
-         into the file bundles.properties in this directory.
-         -->
-        <compc fork="true"
-            output="${basedir}/target/externs/${target.name}">
-            <jvmarg line="${compc.jvm.args}"/>
-            <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}" />
-            <!-- this is not on external-library path otherwise goog.requires are not
generated -->
-            <arg value="-library-path+=${GCL.SWC}" />
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-        </compc>
-        <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name.no.version}"
/>
-    </target>
-
-    <target name="copy-js">
-        <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
-            <fileset dir="${basedir}/target/generated-sources/flexjs">
-                <include name="**/**"/>
-            </fileset>
-        </copy>
-    </target>
-
-
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/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 a907a98..9b6351e 100644
--- a/frameworks/projects/HTML/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
@@ -53,7 +53,6 @@
                 <uri>library://ns.apache.org/flexjs/basic</uri>
                 <manifest>../resources/basic-manifest.xml</manifest>
             </namespace>
-            <!-- TODO: Why is this needed? -->
             <namespace>
                 <uri>library://ns.apache.org/flexjs/basic</uri>
                 <manifest>../resources/basic-as-manifest.xml</manifest>
@@ -77,7 +76,7 @@
     </include-file>
     <include-file>
         <name>js/out/*</name>
-        <path>../../../target/generated-sources/flexjs/*</path>
+        <path>../../../../../js/FlexJS/projects/HTML/target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-classes>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/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
deleted file mode 100644
index 29f659f..0000000
--- a/frameworks/projects/HTML/src/main/config/compile-js-config.xml
+++ /dev/null
@@ -1,90 +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/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>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>../resources/basic-manifest.xml</manifest>
-            </namespace>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/svg</uri>
-                <manifest>../resources/svg-manifest.xml</manifest>
-            </namespace>
-        </namespaces>
-        
-        <source-path>
-            <path-element>../flex</path-element>
-        </source-path>
-        
-        <warn-no-constructor>false</warn-no-constructor>
-    </compiler>
-    
-    <include-file>
-    </include-file>
-
-    <include-sources>
-    </include-sources>
-    
-    <include-classes>
-        <class>HTMLClasses</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>
-	
-
-</flex-config>


Mime
View raw message