Repository: flex-falcon Updated Branches: refs/heads/develop cab409d5b -> dbea06b99
fix md5 checking in download scripts Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dbea06b9 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dbea06b9 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dbea06b9 Branch: refs/heads/develop Commit: dbea06b99a19243a7ca3a177b45c4b8d72bf4051 Parents: cab409d Author: Alex Harui <aha...@apache.org> Authored: Tue May 27 21:04:19 2014 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue May 27 21:04:19 2014 -0700 ---------------------------------------------------------------------- compiler.jx/downloads.xml | 13 ++++++++----- compiler/downloads.xml | 25 +++++++++++++++---------- 2 files changed, 23 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dbea06b9/compiler.jx/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml index 6c0fdbd..0850512 100644 --- a/compiler.jx/downloads.xml +++ b/compiler.jx/downloads.xml @@ -25,6 +25,7 @@ <property name="download.dir" value="${FALCONJX_HOME}/in"/> <property file="${basedir}/local.properties"/> <property name="closure.download.filename" value="compiler-20140303.zip" /> + <property name="closure.download.checksum" value="072349ef05a6d909c9e8a97edac1f580" /> <!-- Notes: @@ -153,10 +154,12 @@ <target name="check-sum" if="md5" description="Verifies MD5 checksum, and fails if checksum doesn't match"> - <checksum file="${download.dir}/${zipFile}" algorithm="MD5" property="${we.failed}"/> - <antcall target="fail-with-message"> - <param name="message" value="${message}"/> - </antcall> + <checksum file="${download.dir}/${zipFile}" algorithm="MD5" verifyproperty="we.failed" property="${md5}" /> + <fail message="${message}"> + <condition> + <equals arg1="${we.failed}" arg2="false" /> + </condition> + </fail> </target> <target name="copy-downloaded-jar" if="destination.known"> @@ -201,7 +204,7 @@ Was: param name="zipFile" value="compiler-latest.zip" --> <param name="zipFile" value="${closure.download.filename}"/> - <param name="md5" value="1f7f3b03f0bdf15ee83140b9ce3b72ac"/> + <param name="md5" value="${closure.download.checksum}"/> </antcall> <get src="http://www.apache.org/licenses/LICENSE-2.0"; dest="${lib.dir}/google/closure-compiler/closure-LICENSE.txt"/> <copy todir="${lib.dir}/google/closure-compiler"> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dbea06b9/compiler/downloads.xml ---------------------------------------------------------------------- diff --git a/compiler/downloads.xml b/compiler/downloads.xml index 911c5c1..379f147 100644 --- a/compiler/downloads.xml +++ b/compiler/downloads.xml @@ -171,10 +171,12 @@ description="Downloads jar, and optionally verifies checksum."> <get src="${srcUrl}/${srcJarFile}" dest="${destJarFile}"/> - <checksum file="${destJarFile}" algorithm="MD5" property="${we.failed}"/> - <antcall target="fail-with-message"> - <param name="message" value="Checksum mismatch for ${destJarFile}"/> - </antcall> + <checksum file="${destJarFile}" algorithm="MD5" verifyproperty="we.failed" property="${md5}"/> + <fail message="Checksum mismatch for ${destJarFile}"> + <condition> + <equals arg1="${we.failed}" arg2="false" /> + </condition> + </fail> </target> <target name="untar-file" unless="zip.compressed" description="Untars zipFile"> @@ -188,10 +190,12 @@ <target name="check-sum" if="md5" description="Verifies MD5 checksum, and fails if checksum doesn't match"> - <checksum file="${download.dir}/${zipFile}" algorithm="MD5" property="${we.failed}"/> - <antcall target="fail-with-message"> - <param name="message" value="${message}"/> - </antcall> + <checksum file="${download.dir}/${zipFile}" algorithm="MD5" verifyproperty="md5.ok" property="${md5}" /> + <fail message="${message}"> + <condition> + <equals arg1="${md5.ok}" arg2="false" /> + </condition> + </fail> </target> <target name="copy-downloaded-jar" if="destination.known"> @@ -235,7 +239,7 @@ <param name="srcUrl" value="${antlr.src.url}"/> <param name="srcJarFile" value="${antlr.src.file}"/> <param name="destJarFile" value="${lib.dir}/antlr.jar"/> - <param name="md5" value="7abf224f627594a3f4ae37fcfff296730f3f4edd"/> + <param name="md5" value="acfa69f928a0f1653555bda73091efca"/> <!--<param name="md5" value="238becce7da69f7be5c5b8a65558cf63"/>--> </antcall> </target> @@ -333,6 +337,7 @@ <param name="srcUrl" value="http://search.maven.org/remotecontent?filepath=com/google/guava/guava/15.0"/> <param name="srcJarFile" value="guava-15.0.jar"/> <param name="destJarFile" value="${lib.dir}/guava.jar"/> + <param name="md5" value="2c10bb2ca3ac8b55b0e77e54a7eb3744"/> </antcall> <get src="http://www.apache.org/licenses/LICENSE-2.0"; dest="${lib.dir}/guava-LICENSE.txt"/> </target> @@ -356,7 +361,7 @@ <antcall target="download-zip"> <param name="srcUrl" value="http://jflex.de"/> <param name="zipFile" value="${jflex.name}.tar.gz"/> - <param name="md5" value="a05956c9ac8bacdc2b8d07fb2cb331ce"/> + <param name="md5" value="c388c909eb0024d546489a89e608e096"/> <param name="srcJarPath" value="${jflex.name}/lib/${jflex.name}.jar"/> <param name="destJarFile" value="${lib.dir}/JFlex.jar"/> </antcall>
