equal
deleted
inserted
replaced
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 |
788 |
789 <!-- Now patch up zip filenames and to avoid double extensions --> |
789 <!-- Now patch up zip filenames and to avoid double extensions and patch up the release metadata to match --> |
790 <move verbose="true" todir="${build.drive}/output/zips/"> |
790 <!-- <move verbose="true" todir="${build.drive}/output/zips/"> |
791 <fileset dir="${build.drive}/output/zips/" includes="**/*.zip"/> |
791 <fileset dir="${build.drive}/output/zips/" includes="**/*.zip"/> |
792 <mapper type="regexp" from="^(.+?\.(7z|zip))\.zip$" to="\1"/> |
792 <mapper type="regexp" from="^(.+?\.(7z|zip))\.zip$" to="\1"/> |
793 </move> |
793 </move> |
794 |
794 <replaceregexp match="\.(7z|zip)\.zip" replace=".\1" flags="g"> |
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"/> |
795 <fileset dir="${build.drive}/output/zips/" includes="**/release_metadata.xml"/> |
798 </replaceregexp> |
796 </replaceregexp> |
|
797 --> |
799 </then> |
798 </then> |
800 <else> |
799 <else> |
801 <echo message="ERROR ${zip.config.file} not available for zipping!"/> |
800 <echo message="ERROR ${zip.config.file} not available for zipping!"/> |
802 </else> |
801 </else> |
803 </if> |
802 </if> |