fix install errors. Ant_on_air doesn't support tokens in 'if' or 'unless'. I didn't see it documented that it was supported in Ant, but it did work for recent Ant versions, just not ant_on_air
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/027b4aac Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/027b4aac Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/027b4aac Branch: refs/heads/VF2JS Commit: 027b4aacb01d10a9d5a77b0fe82385f0a5dce7c8 Parents: 8f15320 Author: Alex Harui <aha...@apache.org> Authored: Tue Jul 8 00:22:21 2014 -0700 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Mon Jul 28 11:33:51 2014 +0200 ---------------------------------------------------------------------- compiler.jx/downloads.xml | 12 ++++++------ compiler/downloads.xml | 20 ++++++-------------- 2 files changed, 12 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/027b4aac/compiler.jx/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml index 547e164..f6f9150 100644 --- a/compiler.jx/downloads.xml +++ b/compiler.jx/downloads.xml @@ -162,8 +162,8 @@ <target name="echo-project-jar" if="installer"> <echo file="${basedir}/project.properties">project.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> - <replace file="${basedir}/project.properties" token="{0}" value="${srcFile}"/> - <replace file="${basedir}/project.properties" token="{1}" value="${srcPath}"/> + <replace file="${basedir}/project.properties" token="{0}" value="${srcPath}"/> + <replace file="${basedir}/project.properties" token="{1}" value="${srcDomain}"/> <property file="${basedir}/project.properties"/> <delete file="${basedir}/project.properties"/> <echo>${project.echo}</echo> @@ -178,7 +178,7 @@ <get src="http://www.apache.org/licenses/LICENSE-2.0"; dest="${lib.dir}/${dest.folder}/${name}-LICENSE.txt"/> - <condition property="project.download.jar" value="true" else="false"> + <condition property="project.download.jar"> <contains string="${src.filename}" substring=".jar" /> </condition> @@ -221,7 +221,7 @@ <copy file="${download.dir}/temp/closure-${closure.name}-${closure.version}/build/${closure.name}.jar" toFile="${lib.dir}/${closure.dest.folder}/${closure.dest.filename}" verbose="true"/> </target> - <target name="download-dependency-jar" if="${project.download.jar}" description="Downloads a jar to the lib directory."> + <target name="download-dependency-jar" if="project.download.jar" description="Downloads a jar to the lib directory."> <antcall target="download-jar"> <param name="srcDomain" value="${server}"/> <param name="srcFolder" value="${folder}"/> @@ -232,7 +232,7 @@ </antcall> </target> - <target name="download-dependency-zip" unless="${project.download.jar}" description="Downloads a zip to the lib directory."> + <target name="download-dependency-zip" unless="project.download.jar" description="Downloads a zip to the lib directory."> <antcall target="download-zip"> <param name="srcDomain" value="${server}"/> <param name="srcFolder" value="${folder}"/> @@ -243,7 +243,7 @@ </antcall> </target> - <target name="download-dependency-zip-closure" unless="${project.download.jar}" description="Downloads a zip to the lib directory."> + <target name="download-dependency-zip-closure" unless="project.download.jar" description="Downloads a zip to the lib directory."> <antcall target="download-zip"> <param name="srcDomain" value="${server}"/> <param name="srcFolder" value="${folder}"/> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/027b4aac/compiler/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler/downloads.xml b/compiler/downloads.xml index 0b0717c..20ff5c3 100644 --- a/compiler/downloads.xml +++ b/compiler/downloads.xml @@ -80,7 +80,6 @@ <param name="src.checksum" value="acfa69f928a0f1653555bda73091efca"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${antlr.name}.jar"/> - <param name="license.use.apache" value="false"/> <param name="license.use.url" value="http://www.antlr.org/license.html"/> </antcall> @@ -97,7 +96,6 @@ <param name="dest.jarPath" value="${lib.dir}/${commons-cli.name}.jar"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${commons-cli.name}.jar"/> - <param name="license.use.apache" value="false"/> </antcall> <copy todir="${lib.dir}" failonerror="false" quiet="true"> <fileset dir="${download.dir}/temp/${commons-cli.name}-${commons-cli.version}"> @@ -121,7 +119,6 @@ <param name="dest.jarPath" value="${lib.dir}/${commons-io.name}.jar"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${commons-io.name}.jar"/> - <param name="license.use.apache" value="false"/> </antcall> <copy todir="${lib.dir}" failonerror="false" quiet="true"> <fileset dir="${download.dir}/temp/${commons-io.name}-${commons-io.version}"> @@ -161,7 +158,6 @@ <param name="dest.jarPath" value="${lib.dir}/${jburg.name}.jar"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${jburg.name}.jar"/> - <param name="license.use.apache" value="false"/> </antcall> <copy todir="${lib.dir}" failonerror="false" quiet="true"> <fileset dir="${download.dir}/temp"> @@ -186,7 +182,6 @@ <param name="dest.jarPath" value="${lib.dir}/${jflex.name}.jar"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${jflex.name}.jar"/> - <param name="license.use.apache" value="false"/> </antcall> <copy todir="${lib.dir}" failonerror="false" quiet="true"> <fileset dir="${download.dir}/temp/${jflex.name}-${jflex.version}"> @@ -209,7 +204,6 @@ <param name="dest.jarPath" value="${lib.dir}/${lzma.name}-sdk.jar"/> <param name="dest.folder" value=""/> <param name="dest.filename" value="${lzma.name}-sdk.jar"/> - <param name="license.use.apache" value="false"/> <param name="license.use.url" value="http://www.7-zip.org/sdk.html"/> </antcall> @@ -227,8 +221,8 @@ <target name="echo-project-jar" if="installer"> <echo file="${basedir}/project.properties">project.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> - <replace file="${basedir}/project.properties" token="{0}" value="${srcFile}"/> - <replace file="${basedir}/project.properties" token="{1}" value="${srcPath}"/> + <replace file="${basedir}/project.properties" token="{0}" value="${srcPath}"/> + <replace file="${basedir}/project.properties" token="{1}" value="${srcDomain}"/> <property file="${basedir}/project.properties"/> <delete file="${basedir}/project.properties"/> <echo>${project.echo}</echo> @@ -245,8 +239,7 @@ <antcall target="download-other-license" /> <!-- ant_on_air in Installer 3.1 doesn't support 'or' yet --> - <condition property="project.download.jar" value="false" else="true"> - <not> + <condition property="project.download.jar"> <and> <not> <contains string="${src.filename}" substring=".tar" /> @@ -255,7 +248,6 @@ <contains string="${src.filename}" substring=".zip" /> </not> </and> - </not> </condition> <antcall target="download-dependency-jar"> @@ -276,7 +268,7 @@ </antcall> </target> - <target name="download-apache-license" if="${license.use.apache}" description="Downloads the Apache license to the lib directory."> + <target name="download-apache-license" if="license.use.apache" description="Downloads the Apache license to the lib directory."> <get src="http://www.apache.org/licenses/LICENSE-2.0"; dest="${lib.dir}/${dest.folder}/${name}-LICENSE.html"/> </target> @@ -284,7 +276,7 @@ <get src="${license.use.url}" dest="${lib.dir}/${dest.folder}/${name}-LICENSE.html"/> </target> - <target name="download-dependency-jar" if="${project.download.jar}" description="Downloads a jar to the lib directory."> + <target name="download-dependency-jar" if="project.download.jar" description="Downloads a jar to the lib directory."> <antcall target="download-jar"> <param name="srcDomain" value="${server}"/> <param name="srcFolder" value="${folder}"/> @@ -295,7 +287,7 @@ </antcall> </target> - <target name="download-dependency-zip" unless="${project.download.jar}" description="Downloads a zip to the lib directory."> + <target name="download-dependency-zip" unless="project.download.jar" description="Downloads a zip to the lib directory."> <antcall target="download-zip"> <param name="srcDomain" value="${server}"/> <param name="srcFolder" value="${folder}"/>
