FLEX-35364 - Fix issue where "air-setup-mac" target launched their dependents targets on windows before checking condition (it is default ant behavior) - Fix some merge issue
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7cd99a7a Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7cd99a7a Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7cd99a7a Branch: refs/heads/master Commit: 7cd99a7a0b3e69c409ad6b2f837d817412e9a766 Parents: 4c60183 Author: Piotr Zarzycki <piotrzarzyck...@gmail.com> Authored: Wed Oct 25 14:25:02 2017 +0200 Committer: Piotr Zarzycki <piotrzarzyck...@gmail.com> Committed: Wed Oct 25 14:25:02 2017 +0200 ---------------------------------------------------------------------- installer.xml | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7cd99a7a/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index 38ace4f..c22be85 100644 --- a/installer.xml +++ b/installer.xml @@ -351,7 +351,7 @@ <antcall target="air-get" /> <antcall target="air-setup-win" /> - <antcall target="air-setup-mac" /> + <antcall target="air-setup-mac-init" /> </target> @@ -377,7 +377,7 @@ <param name="md5" value="${air.sdk.url.md5}" /> </antcall> </target> - + <target name="air-setup-win" if="isWindows"> <unzip src="${download.dir}/${air.sdk.url.file}" dest="${download.dir}/airsdk" /> <echo>${INFO_FINISHED_UNZIPPING} ${download.dir}/${air.sdk.url.file}</echo> @@ -419,13 +419,8 @@ <echo message="Should unzip: ${shouldUnzip}"/> </target> -<<<<<<< HEAD - <target name="unzipAIRSDK" if="${shouldUnzip}" depends="unzipOrMountDMG"> -======= - <target name="unzipAIRSDK" if="${shouldUnzip}"> ->>>>>>> release4.16.0 + <target name="unzipAIRSDK" if="${shouldUnzip}"> <echo message="Unzipping"/> - <!--The tbz2 contains symlinks which Ant does not preserve <untar compression="bzip2" src="${download.dir}/${air.sdk.url.file}" dest="${download.dir}/airsdk" />--> @@ -443,27 +438,17 @@ <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"/> + <echo message="IS WINDOWS: ${isWindows}, IS MAC: ${isMac}" /> <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 + <target name="copyFromMount" unless="${shouldUnzip}"> <echo message="Copying AIR SDK from mounted volume"/> <exec executable="rsync" dir="${FLEX_HOME}"> <arg value="--archive" /> @@ -474,11 +459,7 @@ </exec> </target> -<<<<<<< HEAD - <target name="unmountAIRSDK" unless="${shouldUnzip}" depends="copyFromMount"> -======= - <target name="unmountAIRSDK" unless="${shouldUnzip}"> ->>>>>>> release4.16.0 + <target name="unmountAIRSDK" unless="${shouldUnzip}"> <echo message="Unmounting AIR SDK"/> <exec executable="/usr/bin/hdiutil" os="Mac OS X" failonerror="false"> <arg value="unmount"/> @@ -486,11 +467,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 + <target name="air-setup-mac-init" if="isMac"> + <antcall target="air-setup-mac" /> + </target> + + <target name="air-setup-mac" depends="unzipOrMountDMG,unzipAIRSDK,mountAIRSDK,copyFromMount,unmountAIRSDK"> <antcall target="mac-copy-file"> <param name="srcdir" value="." /> <param name="filename" value="AIR SDK license.pdf"/>
