Author: nickboldt Date: 2011-01-20 20:57:04 -0500 (Thu, 20 Jan 2011) New Revision: 28456 Modified: trunk/build/aggregate/site/build.xml Log: check if zip exists before trying to get size and md5sum Modified: trunk/build/aggregate/site/build.xml =================================================================== --- trunk/build/aggregate/site/build.xml 2011-01-21 01:56:41 UTC (rev 28455) +++ trunk/build/aggregate/site/build.xml 2011-01-21 01:57:04 UTC (rev 28456) @@ -105,7 +105,7 @@ <propertyregex override="true" property="buildPropertiesPath" defaultvalue="${buildPropertiesPath}" input="${buildPropertiesPath}" regexp="-Sources-|-Update-" replace="-" /> <propertyregex override="true" property="filePrefix" defaultvalue="@{zipPath}" input="@{zipPath}" regexp="(.+)/([^/]+)\.zip" replace="\2.build.properties" /> - + <mkdir dir="${aggregate.zips.dir}/${relativePath}" /> <!-- fetch zips to local dir --> <echo level="verbose">repoNum = @{repoNum} @@ -138,26 +138,31 @@ </else> </if> - <!-- set variable for filename --> - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} + <if> + <available file="${aggregate.zips.dir}/@{zipPath}" type="file" /> + <then> + <!-- set variable for filename --> + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filename = @{zipPath} </echo> - <!-- set variable for filesize in Kb --> - <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> - <math operand2="${fs.length.b}" operation="/" operand1="1024" result="fs.length.kb" datatype="float" /> - <!-- <math operand2="${fs.length.b}" operation="/" operand1="1048576" result="fs.length.mb" datatype="float"/> --> - <echo level="verbose">${aggregate.zips.dir}/@{zipPath}: ${fs.length.kb} Kb, ${fs.length.mb} Mb</echo> - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.kb} Kb + <!-- set variable for filesize in Kb --> + <length file="${aggregate.zips.dir}/@{zipPath}" property="fs.length.b" /> + <math operand2="${fs.length.b}" operation="/" operand1="1024" result="fs.length.kb" datatype="float" /> + <!-- <math operand2="${fs.length.b}" operation="/" operand1="1048576" result="fs.length.mb" datatype="float"/> --> + <echo level="verbose">${aggregate.zips.dir}/@{zipPath}: ${fs.length.kb} Kb, ${fs.length.mb} Mb</echo> + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filesize = ${fs.length.kb} Kb </echo> - <var name="fs.length.b" unset="true" /> - <var name="fs.length.kb" unset="true" /> + <var name="fs.length.b" unset="true" /> + <var name="fs.length.kb" unset="true" /> - <!-- set variable for filemd5 --> - <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" /> - <propertycopy from="${filePrefix}.filemd5" property="tempmd5" /> - <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5} + <!-- set variable for filemd5 --> + <checksum file="${aggregate.zips.dir}/@{zipPath}" property="${filePrefix}.filemd5" /> + <propertycopy from="${filePrefix}.filemd5" property="tempmd5" /> + <echo file="${aggregate.zips.dir}/build.properties.file.txt" append="true">${filePrefix}.filemd5 = ${tempmd5} </echo> - <var name="${filePrefix}.filemd5" unset="true" /> - <var name="tempmd5" unset="true" /> + <var name="${filePrefix}.filemd5" unset="true" /> + <var name="tempmd5" unset="true" /> + </then> + </if> <!-- rename the svn and build properties files so they align with the zip names --> <if>