1.1 --- a/build-drop-template.xml Thu Oct 15 16:40:27 2009 -0700
1.2 +++ b/build-drop-template.xml Fri Oct 23 11:06:56 2009 -0700
1.3 @@ -34,7 +34,7 @@
1.4
1.5 <!-- Location where the copied bundle lands. -->
1.6 <property name="@DROP@.bundle.copy"
1.7 - value="${drop.dir}/bundles/${@DROP@.bundle.name}"/>
1.8 + value="${drop.expanded.dir}/bundles/${@DROP@.bundle.name}"/>
1.9
1.10 <!-- Root of exploded area. -->
1.11 <property name="@DROP@.root.dir" value="${drop.dir}/@DROP@"/>
1.12 @@ -43,10 +43,13 @@
1.13 <!-- To see if the drop areas are ready. (ignoring bundles) -->
1.14 <target name="-@DROP@-ready">
1.15 <condition property="@DROP@.ready">
1.16 - <and>
1.17 - <available file="${@DROP@.root.dir}" type="dir"/>
1.18 - <available file="${@DROP@.root.dir}/PATCHED" type="file"/>
1.19 - </and>
1.20 + <or>
1.21 + <available file="${drop.included.dir}" type="dir"/>
1.22 + <and>
1.23 + <available file="${@DROP@.root.dir}" type="dir"/>
1.24 + <available file="${@DROP@.root.dir}/PATCHED" type="file"/>
1.25 + </and>
1.26 + </or>
1.27 </condition>
1.28 </target>
1.29
1.30 @@ -72,7 +75,6 @@
1.31 <target name="-@DROP@-url-should-be-used" unless="@DROP@.url.should.be.used">
1.32 <condition property="@DROP@.url.should.be.used">
1.33 <and>
1.34 - <http url="${@DROP@.master.bundle.url.base}"/>
1.35 <not>
1.36 <isset property="@DROP@.master.bundle.copy.exists"/>
1.37 </not>
1.38 @@ -106,6 +108,16 @@
1.39 <delete dir="${@DROP@.root.dir}"/>
1.40 <delete dir="${@DROP@.root.dir}-temp"/>
1.41 <mkdir dir="${@DROP@.root.dir}-temp"/>
1.42 + <checksum file="${@DROP@.bundle.copy}"
1.43 + property="@DROP@.bundle.md5.checksum.is"/>
1.44 + <condition property="@DROP@.bundle.md5.checksum.good">
1.45 + <equals arg1="${@DROP@.bundle.md5.checksum}"
1.46 + arg2="${@DROP@.bundle.md5.checksum.is}"/>
1.47 + </condition>
1.48 + <fail unless="@DROP@.bundle.md5.checksum.good">
1.49 + Checksum on file ${@DROP@.bundle.copy} is
1.50 + ${@DROP@.bundle.md5.checksum.is}, not ${@DROP@.bundle.md5.checksum}
1.51 + </fail>
1.52 <unzip src="${@DROP@.bundle.copy}" dest="${@DROP@.root.dir}-temp"/>
1.53 <move file="${@DROP@.root.dir}-temp" tofile="${@DROP@.root.dir}"/>
1.54 <touch>
