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/12/16 22:36:23 UTC
[37/50] git commit: [flex-asjs] [refs/heads/master] - fix up falcon
from binary package
fix up falcon from binary package
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ad4955f3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ad4955f3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ad4955f3
Branch: refs/heads/master
Commit: ad4955f3d890943a366e8f6d726a505a58dfa0ba
Parents: 9f70730
Author: Alex Harui <ah...@apache.org>
Authored: Thu Oct 15 10:04:02 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Oct 15 10:04:02 2015 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ad4955f3/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index 2e1c29d..e2f7032 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -379,6 +379,7 @@
<target name="build" depends="ask.build,get.dependencies,copy.downloads">
<ant dir="${basedir}/${package.url.name}" target="main" />
+ <ant dir="${basedir}/${package.url.name}" target="examples" />
</target>
<target name="copy.downloads" if="${do.copy.downloads}" description="instead of actually downloading all of the dependencies, you can save lots of time by just copying from some other folder in some other SDK.">
@@ -417,14 +418,21 @@
dest="${basedir}/${binary.jx.kit}.zip" verbose="true" skipexisting="true"/>
<unzip src="${basedir}/${binary.jx.kit}.zip" dest="${basedir}/falconjx" />
<ant dir="${basedir}/falconjx/compiler" antfile="downloads.xml" />
+ <ant dir="${basedir}/falconjx/compiler.jx" antfile="downloads.xml" />
<!-- Copy compiler external dependencies -->
<copy todir="${basedir}/falconjx/compiler/generated/dist/sdk/lib/external" overwrite="true" includeEmptyDirs="false">
<fileset dir="${basedir}/falconjx/compiler/lib">
<include name="**"/>
</fileset>
</copy>
+ <!-- Copy compiler.jx external dependencies -->
+ <copy todir="${basedir}/falconjx/js/lib" overwrite="true" includeEmptyDirs="false">
+ <fileset dir="${basedir}/falconjx/compiler.jx/lib">
+ <include name="**"/>
+ </fileset>
+ </copy>
<property name="FALCON_HOME" value="${basedir}/falconjx/compiler/generated/dist/sdk" />
- <property name="FALCONJX_HOME" value="${basedir}/falconjx/compiler.jx" />
+ <property name="FALCONJX_HOME" value="${basedir}/falconjx/js" />
</target>
<target name="get.falcon.rc" if="falcon.rc">
<property name="kit.jx.prefix" value="apache-flex-falconjx-0.5.0"/>
@@ -433,14 +441,21 @@
dest="${basedir}/${binary.jx.kit}.zip" verbose="true" skipexisting="true"/>
<unzip src="${basedir}/${binary.jx.kit}.zip" dest="${basedir}/falconjx" />
<ant dir="${basedir}/falconjx/compiler" antfile="downloads.xml" />
+ <ant dir="${basedir}/falconjx/compiler.jx" antfile="downloads.xml" />
<!-- Copy compiler external dependencies -->
<copy todir="${basedir}/falconjx/compiler/generated/dist/sdk/lib/external" overwrite="true" includeEmptyDirs="false">
<fileset dir="${basedir}/falconjx/compiler/lib">
<include name="**"/>
</fileset>
</copy>
+ <!-- Copy compiler.jx external dependencies -->
+ <copy todir="${basedir}/falconjx/js/lib" overwrite="true" includeEmptyDirs="false">
+ <fileset dir="${basedir}/falconjx/compiler.jx/lib">
+ <include name="**"/>
+ </fileset>
+ </copy>
<property name="FALCON_HOME" value="${basedir}/falconjx/compiler/generated/dist/sdk" />
- <property name="FALCONJX_HOME" value="${basedir}/falconjx/compiler.jx" />
+ <property name="FALCONJX_HOME" value="${basedir}/falconjx/js" />
</target>
<target name="get.flexunit.if.needed" unless="FLEXUNIT_HOME" >
<property name="binary.flexunit.kit" value="apache-flex-flexunit-4.2.0-4.12.0-bin"/>