equal
deleted
inserted
replaced
776 <then> |
776 <then> |
777 <runtarget target="preprocess-zip-config" /> |
777 <runtarget target="preprocess-zip-config" /> |
778 <property name="zip.${zip.target.name}.log.file" location="${build.log.dir}/${build.id}_${zip.target.name}_zip.log" /> |
778 <property name="zip.${zip.target.name}.log.file" location="${build.log.dir}/${build.id}_${zip.target.name}_zip.log" /> |
779 <property name="zips.${zip.target.name}.spec.name" value="${zip.target.name}" /> |
779 <property name="zips.${zip.target.name}.spec.name" value="${zip.target.name}" /> |
780 <if><isset property="sf.using.newer.than.helium5"/> |
780 <if><isset property="sf.using.newer.than.helium5"/> |
781 <then> |
781 <then> |
782 <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" failonemptyconfig="false"/> |
782 <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" failonemptyconfig="false"/> |
783 </then> |
783 </then> |
784 <else> |
784 <else> |
785 <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" /> |
785 <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" /> |
786 </else> |
786 </else> |
787 </if> |
787 </if> |
|
788 |
|
789 <!-- Now patch up zip filenames and to avoid double extensions --> |
|
790 <move verbose="true" todir="${build.drive}/output/zips/"> |
|
791 <fileset dir="${build.drive}/output/zips/" includes="**/*.zip"/> |
|
792 <mapper type="regexp" from="^(.+?\.(7z|zip))\.zip$" to="\1"/> |
|
793 </move> |
|
794 |
|
795 <!-- And patch up the release metadata to match --> |
|
796 <replaceregexp match="\.(7z|zip)\.zip" replace=".\1"> |
|
797 <fileset dir="${build.drive}/output/zips/" includes="**/release_metadata.xml"/> |
|
798 </replaceregexp> |
788 </then> |
799 </then> |
789 <else> |
800 <else> |
790 <echo message="ERROR ${zip.config.file} not available for zipping!"/> |
801 <echo message="ERROR ${zip.config.file} not available for zipping!"/> |
791 </else> |
802 </else> |
792 </if> |
803 </if> |
821 </target> |
832 </target> |
822 |
833 |
823 <!-- Unpack the rnd zips ready to be used in the build --> |
834 <!-- Unpack the rnd zips ready to be used in the build --> |
824 <target name="sf-unpack-rnd"> |
835 <target name="sf-unpack-rnd"> |
825 <echo message="INFO Unpacking any available RnD binaries"/> |
836 <echo message="INFO Unpacking any available RnD binaries"/> |
826 <mkdir dir="${build.drive}/output/zips/"/> |
837 <mkdir dir="${build.drive}/output/zips/"/> |
827 <for param="rndZip"> |
838 <for param="rndZip"> |
828 <fileset dir="${build.drive}/output/zips/"> |
839 <fileset dir="${build.drive}/output/zips/"> |
829 <include name="binaries_*.zip"/> <!-- Internal rnd bins --> |
840 <include name="binaries_*.zip"/> <!-- Internal rnd bins --> |
830 <include name="release/bin_*.zip"/> <!-- Releaseable rnd bins --> |
841 <include name="release/bin_*.zip"/> <!-- Releaseable rnd bins --> |
831 </fileset> |
842 </fileset> |