flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [5/8] git commit: [flex-asjs] [refs/heads/core_js_to_as] - clean up build now that asjs is folded into as
Date Sun, 18 Oct 2015 05:35:13 GMT
clean up build now that asjs is folded into as


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

Branch: refs/heads/core_js_to_as
Commit: d94ca1054c8f8e1185413288e08b410a246970c9
Parents: b074b60
Author: Alex Harui <aharui@apache.org>
Authored: Thu Oct 15 09:19:40 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Oct 15 09:19:40 2015 -0700

----------------------------------------------------------------------
 frameworks/projects/Core/build.xml              | 116 +------------------
 .../projects/Core/compile-asjs-config.xml       |  21 ++--
 frameworks/projects/Core/compile-config.xml     |   2 -
 3 files changed, 15 insertions(+), 124 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d94ca105/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 4a8f358..7fa3583 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -28,23 +28,15 @@
     <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="gjslint" value="gjslint"/>
-    <property name="jshint" value="jshint"/>
-    <condition property="no.lint" value="true">
-        <os family="windows"/>
-    </condition>
 
     <target name="main" depends="clean,compile,test" description="Clean build of Core.swc">
     </target>
 
-    <target name="all" depends="clean,compile-asjs,compile,test" description="Full build
of Core.swc">
+    <target name="all" depends="clean,compile-asjs,copy-js,compile,test" description="Full
build of Core.swc">
     </target>
 
     <target name="test" unless="is.jenkins">
         <ant dir="as/tests"/>
-        <!-- no tests yet
-        <ant dir="asjs/tests" />
-        -->
     </target>
 
     <target name="test-js" unless="is.jenkins">
@@ -103,55 +95,6 @@
         </compc>
     </target>
 
-    <target name="compile-as-to-js-core-application-using-falcon">
-        <echo message="Cross-compiling Core"/>
-        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
-        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
-        <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <echo message="FLEXJS_HOME: ${FLEXJS_HOME}"/>
-        <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true">
-            <!--<jvmarg value="-agentlib:jdwp=transport=dt_shmem,server=n,address=javadebug,suspend=y"/>-->
-            <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="-keep-asdoc"/> <!-- allows compiler to see @flexjsignorecoercion
annotations -->
-            <arg value="-output=${basedir}/as/out/js"/>
-            <arg value="-load-config=${basedir}/compile-as-to-js-config.xml"/>
-            <arg value="-define+=COMPILE::AS3,false"/>
-            <arg value="-define+=COMPILE::JS,true"/>
-            <arg value="-js-output-type=FLEXJS"/>
-            <arg value="+playerglobal.version=${playerglobal.version}"/>
-            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}"/>
-            <arg value="+env.AIR_HOME=${env.AIR_HOME}"/>
-        </java>
-    </target>
-
-
-    <target name="compile-as-to-js-core-application-using-oem">
-        <echo message="Cross-compiling Core"/>
-        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
-        <echo message="FALCON_HOME: ${FALCON_HOME}"/>
-        <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <echo message="FLEXJS_HOME: ${FLEXJS_HOME}"/>
-        <java classname="flex2.tools.Compc" classpath="${FALCON_HOME}/lib/flex-compiler-oem.jar"
fork="true">
-            <jvmarg value="-agentlib:jdwp=transport=dt_shmem,server=n,address=javadebug,suspend=y"/>
-            <jvmarg value="-Xmx384m"/>
-            <jvmarg value="-Dsun.io.useCanonCaches=false"/>
-            <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler"/>
-            <arg value="-keep-asdoc"/> <!-- allows compiler to see @flexjsignorecoercion
annotations -->
-            <arg value="-output=${basedir}/as/out/js"/>
-            <arg value="-load-config=${basedir}/compile-as-to-js-config.xml"/>
-            <arg value="-define+=COMPILE::AS3,false"/>
-            <arg value="-define+=COMPILE::JS,true"/>
-            <arg value="-js-output-type=FLEXJS"/>
-            <arg value="+playerglobal.version=${playerglobal.version}"/>
-            <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}"/>
-            <arg value="+env.AIR_HOME=${env.AIR_HOME}"/>
-        </java>
-    </target>
-
     <target name="compile-asjs">
         <echo message="Cross-compiling Core"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
@@ -164,32 +107,7 @@
             <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-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+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
/>
-            <!-- this is not on external-library path otherwise goog.requires are not
generated -->
-            <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc"
/>
-            <arg value="-define=COMPILE::AS3,false" />
-            <arg value="-define=COMPILE::JS,true" />
-        </java>
-    </target>
-
-    <target name="compile-as-for-js" >
-        <!-- copy js.swc into frameworks/libs -->
-        <echo message="Cross-compiling Core/as for js"/>
-        <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
-        <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}/js/out" />
-            <arg value="-load-config=${basedir}/compile-js-config.xml" />
+            <arg value="-load-config=${basedir}/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}" />
@@ -201,42 +119,12 @@
         </java>
     </target>
 
-    <target name="lint-js" depends="gjslint, jshint, copy-js"/>
     <target name="copy-js">
         <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
-            <fileset dir="${basedir}/js/src">
-                <include name="**/**"/>
-            </fileset>
             <fileset dir="${basedir}/js/out">
                 <include name="**/**"/>
             </fileset>
         </copy>
     </target>
 
-    <target name="gjslint" unless="no.lint">
-        <echo>running gjslint</echo>
-        <exec executable="${gjslint}" dir="${basedir}" failonerror="true">
-            <arg value="--strict"/>
-            <arg value="--disable"/>
-            <arg value="006,100,214,300"/>
-            <!-- 006: wrong indentation -->
-            <!-- 100: cannot have non-primitive value -->
-            <!-- 214: @fileoverview tag missing description -->
-            <!-- 300: missing newline at end of file -->
-            <arg value="--max_line_length"/>
-            <arg value="120"/>
-            <arg value="-r"/>
-            <arg value="${basedir}/js/src"/>
-        </exec>
-    </target>
-
-    <target name="jshint" unless="no.lint">
-        <echo>running jshint</echo>
-        <exec executable="${jshint}" dir="${basedir}" failonerror="true">
-            <arg value="--config"/>
-            <arg value="${FLEX_HOME}/frameworks/js/jshint.properties"/>
-            <arg value="${basedir}/js/src"/>
-        </exec>
-    </target>
-
 </project>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d94ca105/frameworks/projects/Core/compile-asjs-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-asjs-config.xml b/frameworks/projects/Core/compile-asjs-config.xml
index ff74fb0..977c1d4 100644
--- a/frameworks/projects/Core/compile-asjs-config.xml
+++ b/frameworks/projects/Core/compile-asjs-config.xml
@@ -22,7 +22,6 @@
         <accessible>false</accessible>
         
         <external-library-path>
-            <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
         </external-library-path>
         
 		<mxml>
@@ -43,14 +42,17 @@
         <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>../../libs/Core.swc</path-element>
         </library-path>
         
+        <namespaces>
+            <namespace>
+                <uri>library://ns.apache.org/flexjs/basic</uri>
+                <manifest>basic-manifest.xml</manifest>
+            </namespace>
+        </namespaces>
+        
         <source-path>
-            <path-element>asjs/src</path-element>
+            <path-element>as/src</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -60,13 +62,16 @@
     </include-file>
 
     <include-sources>
-        <path-element>asjs/src</path-element>
     </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>-->
 	
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d94ca105/frameworks/projects/Core/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/compile-config.xml b/frameworks/projects/Core/compile-config.xml
index 51d36de..d9a038d 100644
--- a/frameworks/projects/Core/compile-config.xml
+++ b/frameworks/projects/Core/compile-config.xml
@@ -53,7 +53,6 @@
         
         <source-path>
             <path-element>as/src</path-element>
-            <path-element>asjs/src</path-element>
         </source-path>
         
         <warn-no-constructor>false</warn-no-constructor>
@@ -72,7 +71,6 @@
 
     <include-classes>
         <class>CoreClasses</class>
-        <class>CoreASJSClasses</class>
     </include-classes>
     
     <include-namespaces>


Mime
View raw message