Repository: flex-asjs Updated Branches: refs/heads/feature/mdl 999e7402a -> 016e3e82c (forced update)
allow CI build to use download cache in case true source is unavailable Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4b796701 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4b796701 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4b796701 Branch: refs/heads/feature/mdl Commit: 4b796701864d8b12a601c205b1e72bad2219c847 Parents: 64d564f Author: Alex Harui <aha...@apache.org> Authored: Tue Oct 25 13:00:03 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue Oct 25 13:00:42 2016 -0700 ---------------------------------------------------------------------- frameworks/downloads.xml | 76 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b796701/frameworks/downloads.xml ---------------------------------------------------------------------- diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml index 6238641..220b3f9 100644 --- a/frameworks/downloads.xml +++ b/frameworks/downloads.xml @@ -55,8 +55,15 @@ <mkdir dir="${download.dir}"/> <get src="https://codeload.github.com/swfobject/swfobject/zip/2.2" - dest="${download.dir}/swfobject_2_2.zip" - verbose="false"/> + dest="${download.dir}/swfobject_2_2.zip" + verbose="false" ignoreerrors="true"/> + + <antcall target="get-from-cache-if-needed" > + <param name="filename" value="swfobject_2_2.zip" /> + </antcall> + <antcall target="fail-if-not-found" > + <param name="filename" value="swfobject_2_2.zip" /> + </antcall> <unzip src="${download.dir}/swfobject_2_2.zip" dest="${FLEXJS_HOME}/templates/swfobject"> <patternset> @@ -65,6 +72,7 @@ </patternset> <flattenmapper /> </unzip> + <antcall target="swfobject-double-check" /> <mkdir dir="${FLEXJS_HOME}/templates/swfobject/history"/> <copy toDir="${FLEXJS_HOME}/templates/swfobject/history" > <fileset dir="${FLEXJS_HOME}/templates/swfobject/history"> @@ -83,6 +91,24 @@ </delete> </target> + <target name="have-swfobject" > + <condition property="still-no-swfobject"> + <not> + <available file="${FLEXJS_HOME}/templates/swfobject/swfobject.js" /> + </not> + </condition> + </target> + + <target name="swfobject-double-check" depends="have-swfobject" if="still-no-swfobject" description="some SWFObject zips have a different folder structure so if the first unzip doesn't work, try this one"> + <unzip src="${download.dir}/swfobject_2_2.zip" dest="${FLEXJS_HOME}/templates/swfobject"> + <patternset> + <include name="swfobject/expressInstall.swf"/> + <include name="swfobject/swfobject.js"/> + </patternset> + <flattenmapper /> + </unzip> + </target> + <!-- flat ui fonts --> <!-- Because this requires a network connection it downloads Flat UI fonts only if it doesn't already exist. --> <target name="flat-ui-check" description="Checks if Flat UI fonts have been downloaded."> @@ -125,7 +151,16 @@ <mkdir dir="${download.dir}"/> <get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip" dest="${download.dir}/flat-ui_2_2.zip" - verbose="false"/> + verbose="false" ignoreerrors="true"/> + + <antcall target="get-from-cache-if-needed" > + <param name="filename" value="flat-ui_2_2.zip" /> + <param name="destDir" value="${download.dir}" /> + </antcall> + <antcall target="fail-if-not-found" > + <param name="filename" value="flat-ui_2_2.zip" /> + <param name="destDir" value="${download.dir}" /> + </antcall> <mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/> <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts"> @@ -158,8 +193,17 @@ <mkdir dir="${download.dir}"/> <get src="https://github.com/google/closure-library/archive/master.zip" dest="${download.dir}/google-closure-library-master.zip" - verbose="false"/> + verbose="false" ignoreerrors="true"/> + <antcall target="get-from-cache-if-needed" > + <param name="filename" value="google-closure-library-master.zip" /> + <param name="destDir" value="${download.dir}" /> + </antcall> + <antcall target="fail-if-not-found" > + <param name="filename" value="google-closure-library-master.zip" /> + <param name="destDir" value="${download.dir}" /> + </antcall> + <mkdir dir="${FLEXJS_HOME}/js/lib/google/closure-library"/> <unzip src="${download.dir}/google-closure-library-master.zip" dest="${FLEXJS_HOME}/js/lib/google/closure-library"> <cutdirsmapper dirs="1" /> @@ -225,4 +269,28 @@ value="${env.GOOG_HOME}" /> </target> + <target name="fail-if-not-found"> + <fail message="${filename} could not be downloaded or found in cache"> + <condition> + <not> + <available file="${download.dir}/${filename}" /> + </not> + </condition> + </fail> + </target> + + <target name="double-check-file" > + <condition property="still-no-file" value="true"> + <and> + <not> + <available file="${download.dir}/${filename}" /> + </not> + <isset property="env.FLEX_DOWNLOAD_CACHE" /> + </and> + </condition> + <echo>Need file: ${still_no_file}</echo> + </target> + <target name="get-from-cache-if-needed" depends="double-check-file" if="still-no-file"> + <copy file="${env.FLEX_DOWNLOAD_CACHE}/${filename}" tofile="${download.dir}/${filename}" /> + </target> </project>