equal
deleted
inserted
replaced
59 <antcall target="sf-zip-content"> |
59 <antcall target="sf-zip-content"> |
60 <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/> |
60 <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/> |
61 <param name="zip.target.name" value="md5-just-metadata" /> |
61 <param name="zip.target.name" value="md5-just-metadata" /> |
62 </antcall> |
62 </antcall> |
63 |
63 |
|
64 <!-- All zips now zipped, so check for collisions (apart from logs, which cannot be processed) --> |
|
65 <runtarget target="sf-detect-archive-collisions"/> |
|
66 |
64 <!-- Launch smoketest --> |
67 <!-- Launch smoketest --> |
65 <if><istrue value="${sf.spec.test.sendpkg.enable}"/> |
68 <if><istrue value="${sf.spec.test.sendpkg.enable}"/> |
66 <then> |
69 <then> |
67 <runtarget target="sf-build-smoketestpkg"/> |
70 <runtarget target="sf-build-smoketestpkg"/> |
68 <runtarget target="sf-send-testpkg"/> |
71 <runtarget target="sf-send-testpkg"/> |
826 <fileset dir="${temp.build.dir}" includes="*depends.out"/> |
829 <fileset dir="${temp.build.dir}" includes="*depends.out"/> |
827 </concat> |
830 </concat> |
828 |
831 |
829 </target> |
832 </target> |
830 |
833 |
|
834 <target name="sf-detect-archive-collisions"> |
|
835 <exec executable="perl" output="${build.log.dir}/detectArchiveCollisions.log"> |
|
836 <arg value="${sf.common.config.dir}/tools/detectArchiveCollisions.pl"/> |
|
837 <arg value="${build.drive}/output/zips/release/*.zip"/> |
|
838 <arg value="${build.drive}/output/zips/release/*.7z"/> |
|
839 </exec> |
|
840 <antcall target="sf-log-to-brag"> |
|
841 <param name="sf.brag.id" value="ArchiveCollisions"/> |
|
842 <param name="sf.brag.log" value="${build.log.dir}/detectArchiveCollisions.log"/> |
|
843 <param name="sf.brag.phase" value="Postbuild"/> |
|
844 <param name="sf.brag.step" value="Detect Archive Collisions"/> |
|
845 </antcall> |
|
846 </target> |
|
847 |
831 <target name="sf-links-to-diamonds"> |
848 <target name="sf-links-to-diamonds"> |
832 <fmpp sourceFile="${sf.common.config.dir}/diamonds/linksForDiamonds.xml.ftl" outputFile="${build.log.dir}/linksForDiamonds.xml"> |
849 <fmpp sourceFile="${sf.common.config.dir}/diamonds/linksForDiamonds.xml.ftl" outputFile="${build.log.dir}/linksForDiamonds.xml"> |
833 <data expandProperties="yes"> |
850 <data expandProperties="yes"> |
834 ant: antProperties() |
851 ant: antProperties() |
835 </data> |
852 </data> |