--- a/common/build.postbuild.xml Tue Oct 12 17:23:11 2010 +0100
+++ b/common/build.postbuild.xml Thu Oct 14 16:29:33 2010 +0100
@@ -61,6 +61,9 @@
<param name="zip.target.name" value="md5-just-metadata" />
</antcall>
+ <!-- All zips now zipped, so check for collisions (apart from logs, which cannot be processed) -->
+ <runtarget target="sf-detect-archive-collisions"/>
+
<!-- Launch smoketest -->
<if><istrue value="${sf.spec.test.sendpkg.enable}"/>
<then>
@@ -828,6 +831,20 @@
</target>
+ <target name="sf-detect-archive-collisions">
+ <exec executable="perl" output="${build.log.dir}/detectArchiveCollisions.log">
+ <arg value="${sf.common.config.dir}/tools/detectArchiveCollisions.pl"/>
+ <arg value="${build.drive}/output/zips/release/*.zip"/>
+ <arg value="${build.drive}/output/zips/release/*.7z"/>
+ </exec>
+ <antcall target="sf-log-to-brag">
+ <param name="sf.brag.id" value="ArchiveCollisions"/>
+ <param name="sf.brag.log" value="${build.log.dir}/detectArchiveCollisions.log"/>
+ <param name="sf.brag.phase" value="Postbuild"/>
+ <param name="sf.brag.step" value="Detect Archive Collisions"/>
+ </antcall>
+ </target>
+
<target name="sf-links-to-diamonds">
<fmpp sourceFile="${sf.common.config.dir}/diamonds/linksForDiamonds.xml.ftl" outputFile="${build.log.dir}/linksForDiamonds.xml">
<data expandProperties="yes">