You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/06/10 21:47:38 UTC

git commit: [flex-falcon] [refs/heads/develop] - add js.swc to binary packages

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 3e9da1b8c -> 016a23209


add js.swc to binary packages


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

Branch: refs/heads/develop
Commit: 016a23209a68bb35c226f0ea40721a3380c64608
Parents: 3e9da1b
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 10 12:47:28 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 10 12:47:28 2015 -0700

----------------------------------------------------------------------
 build.xml                   | 14 +++++++++++++-
 compiler.jx.tests/build.xml | 21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/016a2320/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 602e6ee..7ee5f50 100644
--- a/build.xml
+++ b/build.xml
@@ -242,7 +242,7 @@
         description="Packages the source release kit which is the official Apache release."/>
         
     <target name="binary-release"
-        depends="setup-binary-release,compiler.binary.release,compiler.jx,compiler.oem,binary-package,javadoc"
+        depends="setup-binary-release,compiler.binary.release,compiler.jx,js.swc,compiler.oem,binary-package,javadoc"
         description="Builds and packages the binary kit which is provided as a convenience."/>
         
     <!--
@@ -503,6 +503,10 @@
         
     </target>
     
+    <target name="js.swc" >
+        <ant dir="compiler.jx.tests" target="js.swc"/>
+    </target>
+    
     <target name="binary-package"
         description="Package binary files in zip and tar-gzip file.">
         
@@ -579,6 +583,14 @@
             </fileset>
         </copy>
         
+        <!-- generated -->
+        <mkdir dir="${basedir}/temp/js/libs"/>
+        <copy todir="${basedir}/temp/js/libs">
+            <fileset dir="${basedir}/compiler.jx.tests">
+                <include name="temp/externals/bin/JS.swc"/>
+            </fileset>
+        </copy>
+        
         <antcall target="binary-package-jx-zip"/>
         <antcall target="binary-package-jx-tgz"/>
         

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/016a2320/compiler.jx.tests/build.xml
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/build.xml b/compiler.jx.tests/build.xml
index 8408342..14b9ce2 100644
--- a/compiler.jx.tests/build.xml
+++ b/compiler.jx.tests/build.xml
@@ -76,6 +76,27 @@
         </junit>
     </target>
 	
+    <target name="js.swc" depends="download, compile.unit.tests">
+        <mkdir dir="${compiler.tests}/results"/>
+        <mkdir dir="${compiler.tests}/temp"/>
+        <junit dir="${compiler.tests}"
+            fork="yes" forkMode="perBatch" maxmemory="${maxmem}m" timeout="${test.timeout}"
+            printsummary="true" showoutput="true"
+            haltonerror="true" haltonfailure="true"
+            failureproperty="tests.unit.failed">
+            <classpath>
+                <pathelement location="${compiler.tests}/classes"/>
+                <fileset dir="${compiler}/lib" includes="**/*.jar"/>
+                <fileset dir="${compiler.tests}/lib" includes="**/*.jar"/>
+            </classpath>
+            <batchtest todir="${compiler.tests}/results">
+                <fileset dir="${compiler.tests}/classes">
+                    <include name="**/TestExternalsJSCompile.class"/>
+                </fileset>
+            </batchtest>
+            <formatter type="xml"/>
+        </junit>
+    </target>
  
     <target name="main" depends="unit.tests"/>