fix air and flash downloading
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/16c4a58c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/16c4a58c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/16c4a58c Branch: refs/heads/develop Commit: 16c4a58c278f9893f24e59c4846b443e75b59319 Parents: 6a58b0a Author: Alex Harui <[email protected]> Authored: Fri Jun 6 10:00:03 2014 -0700 Committer: Alex Harui <[email protected]> Committed: Fri Jun 6 10:01:16 2014 -0700 ---------------------------------------------------------------------- installer.xml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16c4a58c/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index 453af2c..b4d2be7 100644 --- a/installer.xml +++ b/installer.xml @@ -479,14 +479,14 @@ <target name="air-get" depends="air-get-check" unless="air.downloaded" > <echo>${AIRDownloadEcho} ${air.sdk.url.server}/${air.sdk.url.folder}/${air.sdk.url.file}</echo> - <antcall target="download_file" > + <antcall target="download_air" > <param name="srcDomain" value="${air.sdk.url.server}" /> <param name="srcFolder" value="${air.sdk.url.folder}" /> <param name="srcFile" value="${air.sdk.url.file}" /> <param name="dest" value="${download.dir}/${air.sdk.url.file}" /> <param name="failmessage" value="AIR SDK download failed" /> </antcall> - <antcall target="download_file_with_md5" > + <antcall target="download_air_with_md5" > <param name="srcDomain" value="${air.sdk.url.server}" /> <param name="srcFolder" value="${air.sdk.url.folder}" /> <param name="srcFile" value="${air.sdk.url.file}" /> @@ -681,7 +681,7 @@ <mkdir dir="${download.dir}"/> <mkdir dir="${FLEXJS_HOME}/frameworks/libs/player/${flash.sdk.version}"/> <echo>${INFO_INSTALLING_PLAYERGLOBAL_SWC} ${flash.sdk.url.server}/${flash.sdk.url.folder}/${flash.sdk.url.file}</echo> - <antcall target="download_file" > + <antcall target="download_flash" > <param name="srcDomain" value="${flash.sdk.url.server}" /> <param name="srcFolder" value="${flash.sdk.url.folder}" /> <param name="srcFile" value="${flash.sdk.url.file}" /> @@ -689,7 +689,7 @@ <param name="message" value="${INFO_INSTALLING_PLAYERGLOBAL_SWC} ${flash.sdk.url.server}/${flash.sdk.url.folder}/${flash.sdk.url.file}" /> <param name="failmessage" value="Flash SDK download failed" /> </antcall> - <antcall target="download_file_with_md5" > + <antcall target="download_flash_with_md5" > <param name="srcDomain" value="${flash.sdk.url.server}" /> <param name="srcFolder" value="${flash.sdk.url.folder}" /> <param name="srcFile" value="${flash.sdk.url.file}" /> @@ -717,7 +717,7 @@ <echo>${swfobject.echo}</echo> <mkdir dir="${download.dir}"/> - <antcall target="download_file" > + <antcall target="download_using_get" > <param name="srcDomain" value="http://swfobject.googlecode.com"; /> <param name="srcFolder" value="files" /> <param name="srcFile" value="swfobject_2_2.zip" /> @@ -911,12 +911,18 @@ tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" /> <echo>${message} ${preferred}${srcFolder}/${srcFile}</echo> </target> - <target name="download_file" unless="md5"> + <target name="download_air" unless="air-has-md5"> <antcall target="download_using_get" /> </target> - <target name="download_file_with_md5" if="md5"> + <target name="download_air_with_md5" if="air-has-md5"> <antcall target="download_using_get" /> </target> + <target name="download_flash" unless="flash-has-md5"> + <antcall target="download_using_get" /> + </target> + <target name="download_flash_with_md5" if="flash-has-md5"> + <antcall target="download_using_get" /> + </target> <!-- Download a file and optionally verify the checksum.
