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/22 15:42:11 UTC
[2/5] git commit: [flex-falcon] [refs/heads/develop] - try to package
extern swcs
try to package extern swcs
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b544884d
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b544884d
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b544884d
Branch: refs/heads/develop
Commit: b544884db71ff875b99aae9dc57875bf6b986919
Parents: 51df3c6
Author: Alex Harui <ah...@apache.org>
Authored: Sun Jun 21 23:43:10 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 22 06:06:08 2015 -0700
----------------------------------------------------------------------
build.xml | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b544884d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d583ab3..6387bf0 100644
--- a/build.xml
+++ b/build.xml
@@ -253,7 +253,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,js.swc,compiler.oem,debugger,binary-package,javadoc"
+ depends="setup-binary-release,compiler.binary.release,compiler.jx,extern.swcs,compiler.oem,debugger,binary-package,javadoc"
description="Builds and packages the binary kit which is provided as a convenience."/>
<!--
@@ -327,6 +327,9 @@
<!-- compiler -->
<antcall target="stage-fb-integration"/>
+ <!-- exters -->
+ <antcall target="stage-externs"/>
+
<!--
Source files have Windows line endings. Most UNIX editors can handle
either type of line endings but the converse is often not true.
@@ -420,6 +423,15 @@
</copy>
</target>
+ <target name="stage-externs">
+ <copy todir="${basedir}/temp/externs" includeEmptyDirs="false">
+ <fileset dir="${basedir}/externs">
+ <include name="**/*.xml"/>
+ <include name="externs/js/missing.js"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="stage-compiler.tests">
<copy todir="${basedir}/temp/compiler.tests" includeEmptyDirs="false">
<fileset dir="${basedir}/compiler.tests">
@@ -523,9 +535,7 @@
</target>
- <target name="js.swc" >
- <ant dir="compiler.jx.tests" target="js.swc"/>
- </target>
+ <target name="extern.swcs" depends="externc.js.swc, externc.jquery.swc" />
<target name="externc.js.swc" >
<echo>${env.ASJS_HOME}</echo>
@@ -644,11 +654,8 @@
<!-- 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>
+ <copy tofile="${basedir}/temp/js/libs/js.swc" file="${basedir}/externs/js/js.swc" />
+ <copy tofile="${basedir}/temp/js/libs/jquery.swc" file="${basedir}/externs/jquery/jquery-1.9.swc" />
<antcall target="binary-package-jx-zip"/>
<antcall target="binary-package-jx-tgz"/>