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/06/22 23:02:13 UTC

git commit: [flex-falcon] [refs/heads/develop] - wrap unless test so missing tasks don't get evaluated

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 46f2c65ee -> d77028ae0


wrap unless test so missing tasks don't get evaluated


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/d77028ae
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/d77028ae
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/d77028ae

Branch: refs/heads/develop
Commit: d77028ae080d10e8bc430678eb541c50faeb5add
Parents: 46f2c65
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jun 22 14:01:47 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jun 22 14:01:47 2015 -0700

----------------------------------------------------------------------
 compiler.jx/downloads.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d77028ae/compiler.jx/downloads.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index 32bf0c9..55d8e2d 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -233,10 +233,15 @@
     <copy file="${download.dir}/temp/${closure.name}.jar" toFile="${lib.dir}/${closure.dest.folder}/${closure.dest.filename}" verbose="true"/>
     <copy file="${download.dir}/temp/README.md" toFile="${lib.dir}/${closure.dest.folder}/README.md" verbose="true"/>
 
-    <antcall target="unpack.externs" />
+    <antcall target="unpack.externs.if.not.installer" />
   </target>
   
-  <target name="unpack.externs" unless="installer">
+  <!-- no unjar task in ant_on_air yet, so do the unless test in this target so unjar doesn't get searched for -->
+  <target name="unpack.externs.if.not.installer" unless="installer" >
+      <antcall target="unpack.externs" />
+  </target>
+  
+  <target name="unpack.externs">
     <mkdir dir="${download.dir}/temp/externs" />
     <unjar src="${lib.dir}/${closure.dest.folder}/${closure.dest.filename}"
            dest="${download.dir}/temp/externs">