Repository: flex-falcon Updated Branches: refs/heads/develop f9a34075b -> b7720d134
copy GCC from binary kit before the jx downloads so it doesn't try to download and compile GCC Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b560f1c9 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b560f1c9 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b560f1c9 Branch: refs/heads/develop Commit: b560f1c94afb36256891053465b58715e469bc45 Parents: f9a3407 Author: Alex Harui <aha...@apache.org> Authored: Tue Jul 8 00:20:52 2014 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue Jul 8 00:20:52 2014 -0700 ---------------------------------------------------------------------- installer.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b560f1c9/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index 8d1ea4e..63b4603 100644 --- a/installer.xml +++ b/installer.xml @@ -88,7 +88,7 @@ <os family="unix" /> </condition> - <target name="overlay" depends="movefiles,download,copyfiles,download.jx,copyfiles.jx" description="Places Falcon and FalconJX files in an SDK folder"> + <target name="overlay" depends="movefiles,download,copyfiles,copy.jx.lib,download.jx,copyfiles.jx" description="Places Falcon and FalconJX files in an SDK folder"> <echo>Falcon and FalconJX installed in ${FLEX_HOME}</echo> </target> @@ -103,6 +103,13 @@ <ant dir="${basedir}/compiler.jx" antfile="downloads.xml"/> </target> + <target name="copy.jx.lib" if="install.jx" description="copy our bundled GCC before running download.jx so we don't download GCC"> + <property name="FALCONJX_HOME" value="${FLEX_HOME}/js" /> + <mkdir dir="${FLEX_HOME}/js/lib/google/closure-compiler" /> + <copy file="${basedir}/js/lib/google/closure-compiler/compiler.jar" tofile="${FLEX_HOME}/js/lib/google/closure-compiler/compiler.jar"/> + <copy file="${basedir}/js/lib/google/closure-compiler/compiler-LICENSE.txt" tofile="${FLEX_HOME}/js/lib/google/closure-compiler/compiler-LICENSE.txt"/> + </target> + <target name="movefiles" description="move SDK files into -legacy folders" > <mkdir dir="${FLEX_HOME}/bin-legacy" /> <mkdir dir="${FLEX_HOME}/lib-legacy" /> @@ -139,7 +146,7 @@ <copy tofile="${FLEX_HOME}/lib/mxmlc.jar" file="${FLEX_HOME}/lib/falcon-mxmlc.jar" overwrite="true"/> <!-- Copy compiler external dependencies --> <copy todir="${FLEX_HOME}/lib/external" overwrite="true" includeEmptyDirs="false"> - <fileset dir="${FALCON_HOME}/lib"> + <fileset dir="${FALCON_HOME}/compiler/lib"> <include name="**"/> </fileset> </copy>
