Merge branch 'release4.16.0' into develop
Conflicts:
installer.xml
diff --git a/installer.xml b/installer.xml
index 5996861..38ace4f 100644
--- a/installer.xml
+++ b/installer.xml
@@ -419,7 +419,11 @@
<echo message="Should unzip: ${shouldUnzip}"/>
</target>
+<<<<<<< HEAD
+ <target name="unzipAIRSDK" if="${shouldUnzip}" depends="unzipOrMountDMG">
+=======
<target name="unzipAIRSDK" if="${shouldUnzip}">
+>>>>>>> release4.16.0
<echo message="Unzipping"/>
<!--The tbz2 contains symlinks which Ant does not preserve
@@ -439,16 +443,27 @@
<delete file="${basedir}/airtar.properties" />
</target>
+<<<<<<< HEAD
+ <target name="mountAIRSDK" unless="${shouldUnzip}" depends="unzipOrMountDMG">
+ <echo message="Mounting dmg"/>
+ <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
+ <arg value="attach"/>
+=======
<target name="mountAIRSDK" unless="${shouldUnzip}">
<echo message="Mounting dmg"/>
<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="true">
<arg value="attach"/>
<arg value="-nobrowse"/>
+>>>>>>> release4.16.0
<arg value="${download.dir}/airsdk/${air.sdk.url.file}"/>
</exec>
</target>
+<<<<<<< HEAD
+ <target name="copyFromMount" unless="${shouldUnzip}" depends="mountAIRSDK">
+=======
<target name="copyFromMount" unless="${shouldUnzip}">
+>>>>>>> release4.16.0
<echo message="Copying AIR SDK from mounted volume"/>
<exec executable="rsync" dir="${FLEX_HOME}">
<arg value="--archive" />
@@ -459,7 +474,11 @@
</exec>
</target>
+<<<<<<< HEAD
+ <target name="unmountAIRSDK" unless="${shouldUnzip}" depends="copyFromMount">
+=======
<target name="unmountAIRSDK" unless="${shouldUnzip}">
+>>>>>>> release4.16.0
<echo message="Unmounting AIR SDK"/>
<exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="false">
<arg value="unmount"/>
@@ -467,7 +486,11 @@
</exec>
</target>
+<<<<<<< HEAD
+ <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">
+>>>>>>> release4.16.0
<antcall target="mac-copy-file">
<param name="srcdir" value="." />
<param name="filename" value="AIR SDK license.pdf"/>
