You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2017/03/15 04:04:53 UTC
[24/50] [abbrv] git commit: [flex-sdk] [refs/heads/develop] - try to
fix install
try to fix install
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/77268745
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/77268745
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/77268745
Branch: refs/heads/develop
Commit: 77268745eaff42ae5b4449be362f4e2459ab25bc
Parents: a5b11cd
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 18 10:24:06 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Dec 18 10:24:06 2016 -0800
----------------------------------------------------------------------
installer.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/77268745/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 1490420..292cd8b 100644
--- a/installer.xml
+++ b/installer.xml
@@ -419,7 +419,7 @@
<echo message="Should unzip: ${shouldUnzip}"/>
</target>
- <target name="unzipAIRSDK" if="${shouldUnzip}" depends="unzipOrMountDMG">
+ <target name="unzipAIRSDK" if="${shouldUnzip}">
<echo message="Unzipping"/>
<!--The tbz2 contains symlinks which Ant does not preserve
@@ -439,7 +439,7 @@
<delete file="${basedir}/airtar.properties" />
</target>
- <target name="mountAIRSDK" unless="${shouldUnzip}" depends="unzipOrMountDMG">
+ <target name="mountAIRSDK" unless="${shouldUnzip}">
<echo message="Mounting dmg"/>
<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
<arg value="attach"/>
@@ -447,7 +447,7 @@
</exec>
</target>
- <target name="copyFromMount" unless="${shouldUnzip}" depends="mountAIRSDK">
+ <target name="copyFromMount" unless="${shouldUnzip}">
<echo message="Copying AIR SDK from mounted volume"/>
<exec executable="rsync" dir="${FLEX_HOME}">
<arg value="--archive" />
@@ -458,7 +458,7 @@
</exec>
</target>
- <target name="unmountAIRSDK" unless="${shouldUnzip}" depends="copyFromMount">
+ <target name="unmountAIRSDK" unless="${shouldUnzip}">
<echo message="Unmounting AIR SDK"/>
<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="false">
<arg value="unmount"/>
@@ -466,7 +466,7 @@
</exec>
</target>
- <target name="air-setup-mac" depends="unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK" unless="isWindows">
+ <target name="air-setup-mac" depends="unzipOrMountDMG,unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK" unless="isWindows">
<antcall target="mac-copy-file">
<param name="srcdir" value="." />
<param name="filename" value="AIR SDK license.pdf"/>