fix some issues with downloads scripts in install mode
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8093ac76 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8093ac76 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8093ac76 Branch: refs/heads/VF2JS Commit: 8093ac7652b8e7d8b00966fd672637cda422c3ed Parents: d98e23f Author: Alex Harui <aha...@apache.org> Authored: Mon Jul 7 00:11:55 2014 -0700 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Mon Jul 7 15:09:37 2014 +0200 ---------------------------------------------------------------------- compiler.jx/downloads.xml | 2 +- compiler/downloads.xml | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8093ac76/compiler.jx/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml index 2311b73..547e164 100644 --- a/compiler.jx/downloads.xml +++ b/compiler.jx/downloads.xml @@ -35,7 +35,7 @@ risk around caching bad downloads and/or needing to clean up the cache --> - <property name="FALCONJX_HOME" location="."/> + <property name="FALCONJX_HOME" location="${basedir}"/> <property name="lib.dir" value="${FALCONJX_HOME}/lib"/> <property name="download.dir" value="${FALCONJX_HOME}/in"/> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8093ac76/compiler/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler/downloads.xml b/compiler/downloads.xml index bb02c0c..0b0717c 100644 --- a/compiler/downloads.xml +++ b/compiler/downloads.xml @@ -39,7 +39,7 @@ risk around caching bad downloads and/or needing to clean up the cache --> - <property name="FALCONJX_HOME" location="."/> + <property name="FALCONJX_HOME" location="${basedir}"/> <property name="lib.dir" value="${FALCONJX_HOME}/lib"/> <property name="download.dir" value="${FALCONJX_HOME}/in"/> @@ -244,11 +244,18 @@ <antcall target="download-apache-license" /> <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"> - <or> - <contains string="${src.filename}" substring=".tar" /> - <contains string="${src.filename}" substring=".zip" /> - </or> + <not> + <and> + <not> + <contains string="${src.filename}" substring=".tar" /> + </not> + <not> + <contains string="${src.filename}" substring=".zip" /> + </not> + </and> + </not> </condition> <antcall target="download-dependency-jar">
