flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [18/20] git commit: [flex-asjs] [refs/heads/mavenfolders] - update xml files after folder rename/refactor
Date Mon, 11 Jan 2016 20:56:02 GMT
update xml files after folder rename/refactor


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/72c9cb8f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/72c9cb8f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/72c9cb8f

Branch: refs/heads/mavenfolders
Commit: 72c9cb8fc013f8427a1d424dae48433bb174932c
Parents: a903508
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jan 11 12:10:01 2016 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jan 11 12:10:01 2016 -0800

----------------------------------------------------------------------
 frameworks/projects/Core/build.xml              | 32 +++----
 .../main/resources/compile-as-to-js-config.xml  | 77 -----------------
 .../src/main/resources/compile-asjs-config.xml  |  2 +-
 .../Core/src/main/resources/compile-config.xml  | 10 +--
 .../src/main/resources/compile-js-config.xml    | 87 --------------------
 .../projects/Core/src/test/flex/build.xml       | 17 ++--
 6 files changed, 28 insertions(+), 197 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c9cb8f/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 1831bf2..4a768d7 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -28,12 +28,13 @@
     <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
     <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
+    <property name="target.name" value="Core-${release.version}.swc" />
 
     <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test"
description="Full build of Core.swc">
     </target>
 
     <target name="test" unless="is.jenkins">
-        <ant dir="as/tests"/>
+        <ant dir="src/test/flex"/>
     </target>
 
     <target name="test-js" unless="is.jenkins">
@@ -49,7 +50,7 @@
             </fileset>
         </delete>
         <delete failonerror="false">
-            <fileset dir="${basedir}/js/out">
+            <fileset dir="${basedir}/target">
                 <include name="**/**"/>
             </fileset>
         </delete>
@@ -60,11 +61,11 @@
     </path>
 
     <target name="compile" description="Compiles .as files into .swc">
-        <echo message="Compiling libs/Core.swc"/>
+        <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}/js/out"/>
+        <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. -->
@@ -82,18 +83,19 @@
             into the file bundles.properties in this directory.
         -->
         <compc fork="true"
-               output="${FLEXJS_HOME}/frameworks/libs/Core.swc">
+               output="${basedir}/target/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="compile-config.xml" />
+            <load-config filename="${basedir}/src/main/resources/compile-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
             <arg value="-define=COMPILE::AS3,true" />
             <arg value="-define=COMPILE::JS,false" />
         </compc>
+        <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name}"
/>
     </target>
 
     <target name="compile-asjs">
-        <echo message="Cross-compiling Core"/>
+        <echo message="Cross-compiling ${target.name}"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
             <jvmarg value="-Xmx384m" />
@@ -103,8 +105,8 @@
             <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}/js/out" />
-            <arg value="-load-config=${basedir}/compile-asjs-config.xml" />
+            <arg value="-output=${basedir}/target/generated-sources/flexjs" />
+            <arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml"
/>
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
@@ -115,17 +117,18 @@
             <arg value="-define=COMPILE::JS,true" />
         </java>
         <!-- hack: inject some jsdoc to get rid of a warning when building examples -->
-        <replace file="${basedir}/js/out/org/apache/flex/events/IEventDispatcher.js"
+        <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 externs/Core.swc"/>
+        <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. -->
@@ -143,9 +146,9 @@
          into the file bundles.properties in this directory.
          -->
         <compc fork="true"
-            output="${FLEXJS_HOME}/frameworks/externs/Core.swc">
+            output="${basedir}/target/externs/${target.name}">
             <jvmarg line="${compc.jvm.args}"/>
-            <load-config filename="compile-asjs-config.xml" />
+            <load-config filename="src/main/resources/compile-asjs-config.xml" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.AIR_HOME=${env.AIR_HOME}" />
             <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
/>
@@ -154,11 +157,12 @@
             <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}"
/>
     </target>
 
     <target name="copy-js">
         <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
-            <fileset dir="${basedir}/js/out">
+            <fileset dir="${basedir}/target/generated-sources/flexjs">
                 <include name="**/**"/>
             </fileset>
         </copy>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c9cb8f/frameworks/projects/Core/src/main/resources/compile-as-to-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/resources/compile-as-to-js-config.xml b/frameworks/projects/Core/src/main/resources/compile-as-to-js-config.xml
deleted file mode 100644
index e601b79..0000000
--- a/frameworks/projects/Core/src/main/resources/compile-as-to-js-config.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<flex-config>
-
-    <compiler>
-        <accessible>false</accessible>
-        
-        <external-library-path>
-            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
-            <path-element>D:/SDKs/FlexJS/nightly_PF18_AIR18.0_en_US/js/libs/js.swc</path-element>
-            <path-element>D:/SDKs/FlexJS/nightly_PF18_AIR18.0_en_US/js/libs/gcl.swc</path-element>
-        </external-library-path>
-
-        <mxml>
-            <children-as-data>true</children-as-data>
-        </mxml>
-        <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
-        <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
-        <binding-value-change-event-type>valueChange</binding-value-change-event-type>
-
-        <keep-as3-metadata>
-            <name>Bindable</name>
-            <name>Managed</name>
-            <name>ChangeEvent</name>
-            <name>NonCommittingChangeEvent</name>
-            <name>Transient</name>
-        </keep-as3-metadata>
-
-        <namespaces>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>basic-manifest.xml</manifest>
-            </namespace>
-        </namespaces>
-        
-        <locale/>
-
-        <source-path>
-            <!--<path-element>as/src</path-element>-->
-        </source-path>
-
-        <warn-no-constructor>false</warn-no-constructor>
-    </compiler>
-
-    <include-sources>
-        <path-element>as/src</path-element>
-    </include-sources>
-
-    <include-classes>
-        <class>CoreClasses</class>
-        <!--<class>CoreASJSClasses</class>-->
-    </include-classes>
-    
-    <include-namespaces>
-        <uri>library://ns.apache.org/flexjs/basic</uri>
-    </include-namespaces>
-        
-    <target-player>11.1</target-player>
-	
-
-</flex-config>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c9cb8f/frameworks/projects/Core/src/main/resources/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/resources/compile-asjs-config.xml b/frameworks/projects/Core/src/main/resources/compile-asjs-config.xml
index 977c1d4..2cb04d8 100644
--- a/frameworks/projects/Core/src/main/resources/compile-asjs-config.xml
+++ b/frameworks/projects/Core/src/main/resources/compile-asjs-config.xml
@@ -52,7 +52,7 @@
         </namespaces>
         
         <source-path>
-            <path-element>as/src</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/72c9cb8f/frameworks/projects/Core/src/main/resources/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/resources/compile-config.xml b/frameworks/projects/Core/src/main/resources/compile-config.xml
index d9a038d..7fdfa2b 100644
--- a/frameworks/projects/Core/src/main/resources/compile-config.xml
+++ b/frameworks/projects/Core/src/main/resources/compile-config.xml
@@ -52,7 +52,7 @@
         </namespaces>
         
         <source-path>
-            <path-element>as/src</path-element>
+            <path-element>../flex</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -60,14 +60,8 @@
     
     <include-file>
         <name>js/out/*</name>
-        <path>js/out/*</path>
+        <path>../../../target/generated-sources/flexjs/*</path>
     </include-file>
-    <!--
-    <include-file>
-        <name>js/src/*</name>
-        <path>js/src/*</path>
-    </include-file>
-     -->
 
     <include-classes>
         <class>CoreClasses</class>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c9cb8f/frameworks/projects/Core/src/main/resources/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/resources/compile-js-config.xml b/frameworks/projects/Core/src/main/resources/compile-js-config.xml
deleted file mode 100644
index 3c3784b..0000000
--- a/frameworks/projects/Core/src/main/resources/compile-js-config.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
-<flex-config>
-
-    <compiler>
-        <accessible>false</accessible>
-        
-        <external-library-path>
-            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
-        </external-library-path>
-        
-		<mxml>
-			<children-as-data>true</children-as-data>
-		</mxml>
-		<binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event>
-		<binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind>
-		<binding-value-change-event-type>valueChange</binding-value-change-event-type>
-
-        <keep-as3-metadata>
-          <name>Bindable</name>
-          <name>Managed</name>
-          <name>ChangeEvent</name>
-          <name>NonCommittingChangeEvent</name>
-          <name>Transient</name>
-        </keep-as3-metadata>
-	  
-        <locale/>
-        
-        <library-path/>
-
-        <namespaces>
-            <namespace>
-                <uri>library://ns.apache.org/flexjs/basic</uri>
-                <manifest>basic-manifest.xml</manifest>
-            </namespace>
-        </namespaces>
-        
-        <source-path>
-            <path-element>as/src</path-element>
-            <path-element>asjs/src</path-element>
-        </source-path>
-        
-        <warn-no-constructor>false</warn-no-constructor>
-    </compiler>
-    
-    <include-file>
-        <name>js/out/*</name>
-        <path>js/out/*</path>
-    </include-file>
-    <!--
-    <include-file>
-        <name>js/src/*</name>
-        <path>js/src/*</path>
-    </include-file>
-     -->
-    
-    <include-classes>
-        <class>CoreJSClasses</class>
-        <!-- leave out for now until we get Application to compile
-        <class>CoreASJSClasses</class>-->
-    </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>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/72c9cb8f/frameworks/projects/Core/src/test/flex/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/test/flex/build.xml b/frameworks/projects/Core/src/test/flex/build.xml
index 31d979b..3fdc3d6 100644
--- a/frameworks/projects/Core/src/test/flex/build.xml
+++ b/frameworks/projects/Core/src/test/flex/build.xml
@@ -20,14 +20,15 @@
 
 
 <project name="Core.test" default="main" basedir=".">
-    <property name="FLEXJS_HOME" location="../../../../.."/>
+    <property name="FLEXJS_HOME" location="../../../../../.."/>
     
     <property file="${FLEXJS_HOME}/env.properties"/>
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
- 	
+    <property name="target.name" value="Core-${release.version}.swc" />
+    
 	<condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe">
 		<os family="windows"/>
     </condition>
@@ -70,7 +71,7 @@
         value="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" />
     <property name="FLEXUNIT_CLASSPATH" value="${FLEXUNIT_HOME}/flexunit" />
         
-    <target name="main" depends="clean,compile,test" description="Clean test of FlexJSUI.swc">
+    <target name="main" depends="clean,compile,test" description="Clean test of ${target.name}">
     </target>
 
     <target name="clean">
@@ -80,7 +81,7 @@
             </fileset>
         </delete>
         <delete failonerror="false">
-            <fileset dir="${basedir}/js/out">
+            <fileset dir="${basedir}/bin">
                 <include name="**/**"/>
             </fileset>
         </delete>
@@ -119,13 +120,9 @@
             <arg value="-debug" />
             <arg value="-define=COMPILE::AS3,true" />
             <arg value="-define=COMPILE::JS,false" />
-            <arg value="-compiler.mxml.children-as-data" />
-            <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent"
/>
-            <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent"
/>
-            <arg value="-compiler.binding-value-change-event-type=valueChange" />
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
-            <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/Core/as/src"
/>
+            <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/Core/src/main/flex"
/>
             <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" />
             <arg value="${FLEXUNIT_LIBPATH1}" />
             <arg value="${FLEXUNIT_LIBPATH2}" />
@@ -149,7 +146,7 @@
 			verbose="true"
 			localTrusted="true"
 			timeout="90000">
-            <source dir="${FLEXJS_HOME}/frameworks/projects/Core/as/src" />
+            <source dir="${FLEXJS_HOME}/frameworks/projects/Core/src/main/flex" />
             <library dir="${FLEXJS_HOME}/frameworks/libs" />
         </flexunit>
         


Mime
View raw message