Repository: flex-falcon Updated Branches: refs/heads/develop b5a06269f -> c252ce961
put more echos in the downloads script because it is used in the installer Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c252ce96 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c252ce96 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c252ce96 Branch: refs/heads/develop Commit: c252ce961ba64c0123ccecddfaad11eb732976d9 Parents: b5a0626 Author: Alex Harui <aha...@apache.org> Authored: Fri Feb 14 21:43:12 2014 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Fri Feb 14 21:43:54 2014 -0800 ---------------------------------------------------------------------- compiler.jx/downloads.xml | 35 +++++++++++++++++++++++++++++++- compiler/downloads.xml | 46 +++++++++++++++++++++++++++++++++++------- 2 files changed, 73 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c252ce96/compiler.jx/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml index ccf2bc8..3db5ae7 100644 --- a/compiler.jx/downloads.xml +++ b/compiler.jx/downloads.xml @@ -180,6 +180,17 @@ <target name="closure-jar" depends="closure-jar-check" unless="closure.jar.exists" description="Copies the closure build jars."> <mkdir dir="${lib.dir}/google/closure-compiler" /> + <antcall target="echo-closure-jar"> + <param name="srcUrl" value="http://dl.google.com/closure-compiler"/> + <!-- + erikdebruin: because of a dependency Falcon has on an old version of Guava, + any versions of the Closure compiler after sept. 17, 2012 cause exceptions + when doing a release build with FalconJx. + + Was: param name="zipFile" value="compiler-latest.zip" + --> + <param name="zipFile" value="${closure.download.filename}"/> + </antcall> <antcall target="download-zip"> <param name="srcUrl" value="http://dl.google.com/closure-compiler"/> <!-- @@ -201,7 +212,16 @@ <fileset dir="${download.dir}/temp" includes="**/*"/> </delete> </target> - + + <target name="echo-closure-jar" if="installer"> + <echo file="${basedir}/closure.properties">closure.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/closure.properties" token="{0}" value="${zipFile}" /> + <replace file="${basedir}/closure.properties" token="{1}" value="${srcUrl}" /> + <property file="${basedir}/closure.properties" /> + <delete file="${basedir}/closure.properties" /> + <echo>${closure.echo}</echo> + </target> + <!-- commons-io --> @@ -214,6 +234,10 @@ unless="commons.io.jar.exists" description="Copies commons-io.jar to the lib directory."> + <antcall target="echo-commons-jar"> + <param name="srcUrl" value="http://archive.apache.org/dist/commons/io/binaries"/> + <param name="zipFile" value="${commons-io.name}-bin.tar.gz"/> + </antcall> <antcall target="download-zip"> <param name="srcUrl" value="http://archive.apache.org/dist/commons/io/binaries"/> <param name="zipFile" value="${commons-io.name}-bin.tar.gz"/> @@ -230,6 +254,15 @@ <delete dir="${download.dir}/temp/${commons-io.name}"/> </target> + <target name="echo-commons-jar" if="installer"> + <echo file="${basedir}/commons.properties">commons.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/commons.properties" token="{0}" value="${zipFile}" /> + <replace file="${basedir}/commons.properties" token="{1}" value="${srcUrl}" /> + <property file="${basedir}/commons.properties" /> + <delete file="${basedir}/commons.properties" /> + <echo>${commons.echo}</echo> + </target> + <!-- Cleanup --> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c252ce96/compiler/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler/downloads.xml b/compiler/downloads.xml index db2eca7..3938b2a 100644 --- a/compiler/downloads.xml +++ b/compiler/downloads.xml @@ -51,7 +51,9 @@ <property name="antlr.src.url" value="http://antlr3.org/download"/> <property name="antlr.src.file" value="antlr-3.3-complete.jar"/> - + + <property name="INFO_DOWNLOADING_FILE_FROM" value="Downloading {0} from: {1}" /> + <!-- Because the downloads requires a network connection and the JARs don't change very often, they are each downloaded only if they don't already exist. @@ -213,7 +215,12 @@ <target name="antlr-jar" depends="antlr-jar-check" unless="antlr.jar.exists" description="Copies the antlr jar to the lib directory."> - <echo message="Obtaining lib/antlr.jar"/> + <echo file="${basedir}/antlr.properties">antlr.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/antlr.properties" token="{0}" value="${antlr.src.file}" /> + <replace file="${basedir}/antlr.properties" token="{1}" value="${antlr.src.url}" /> + <property file="${basedir}/antlr.properties" /> + <delete file="${basedir}/antlr.properties" /> + <echo>${antlr.echo}</echo> <antcall target="antlr-download-jar"/> <echo file="${lib.dir}/antlr-LICENSE.TXT">http://www.antlr.org/license.html</echo> </target> @@ -245,7 +252,12 @@ <target name="commons-cli-jar" depends="commons-cli-jar-check" unless="commons.cli.jar.exists" description="Downloads and copies common-cli.jar to the lib directory."> - <echo message="Obtaining lib/commons-cli.jar"/> + <echo file="${basedir}/cli.properties">cli.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/cli.properties" token="{0}" value="${commons-cli.name}-bin.tar.gz" /> + <replace file="${basedir}/cli.properties" token="{1}" value="http://archive.apache.org/dist/commons/cli/binaries"; /> + <property file="${basedir}/cli.properties" /> + <delete file="${basedir}/cli.properties" /> + <echo>${cli.echo}</echo> <antcall target="download-zip"> <param name="srcUrl" value="http://archive.apache.org/dist/commons/cli/binaries"/> <param name="zipFile" value="${commons-cli.name}-bin.tar.gz"/> @@ -273,7 +285,12 @@ <target name="commons-io-jar" depends="commons-io-jar-check" unless="commons.io.jar.exists" description="Copies commons-io.jar to the lib directory."> - <echo message="Obtaining lib/commons-io.jar"/> + <echo file="${basedir}/io.properties">io.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/io.properties" token="{0}" value="${commons-io.name}-bin.tar.gz" /> + <replace file="${basedir}/io.properties" token="{1}" value="http://archive.apache.org/dist/commons/io/binaries"; /> + <property file="${basedir}/io.properties" /> + <delete file="${basedir}/io.properties" /> + <echo>${io.echo}</echo> <antcall target="download-zip"> <param name="srcUrl" value="http://archive.apache.org/dist/commons/io/binaries"/> <param name="zipFile" value="${commons-io.name}-bin.tar.gz"/> @@ -302,7 +319,12 @@ <target name="guava-jar" depends="guava-jar-check" unless="guava.jar.exists" description="Downloads and copies guava.jar to the lib directory."> - <echo message="Obtaining lib/guava.jar"/> + <echo file="${basedir}/guava.properties">guava.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/guava.properties" token="{0}" value="guava-15.0.jar" /> + <replace file="${basedir}/guava.properties" token="{1}" value="http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0"; /> + <property file="${basedir}/guava.properties" /> + <delete file="${basedir}/guava.properties" /> + <echo>${guava.echo}</echo> <antcall target="download-jar"> <param name="srcUrl" value="http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0"/> <param name="srcJarFile" value="guava-15.0.jar"/> @@ -321,7 +343,12 @@ <target name="jburg-jar" depends="jburg-jar-check" unless="jburg.jar.exists" description="Copies jburg.jar to the lib directory."> - <echo message="Obtaining lib/jburg.jar"/> + <echo file="${basedir}/jburg.properties">jburg.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/jburg.properties" token="{0}" value="${jburg.name}.tar.gz" /> + <replace file="${basedir}/jburg.properties" token="{1}" value="http://downloads.sourceforge.net/project/jburg"; /> + <property file="${basedir}/jburg.properties" /> + <delete file="${basedir}/jburg.properties" /> + <echo>${jburg.echo}</echo> <antcall target="download-zip"> <param name="srcUrl" value="http://downloads.sourceforge.net/project/jburg"/> <param name="zipFile" value="${jburg.name}.tar.gz"/> @@ -350,7 +377,12 @@ <target name="lzma-jar" depends="lzma-jar-check" unless="lzma.jar.exists" description="Copies the lzma build jars."> - <echo message="Obtaining lib/lzma.jar"/> + <echo file="${basedir}/lzma.properties">lzma.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/lzma.properties" token="{0}" value="lzma-9.20.jar.zip" /> + <replace file="${basedir}/lzma.properties" token="{1}" value="http://www.java2s.com/Code/JarDownload/lzma"; /> + <property file="${basedir}/lzma.properties" /> + <delete file="${basedir}/lzma.properties" /> + <echo>${lzma.echo}</echo> <antcall target="download-zip"> <param name="srcUrl" value="http://www.java2s.com/Code/JarDownload/lzma"/> <param name="zipFile" value="lzma-9.20.jar.zip"/>
