FCL/sftools/fbf/configs/default: comparison common/build.postbuild.xml

equal deleted inserted replaced

-:c4b5a5c928c2
+:92bfe0d10c29
 <arg value="-x!epoc32\data\media"/> <!-- Files created when emulator is used to create comms database - not worth releasing-->
 <arg value="-x!epoc32\build"/>
 <arg value="-x!epoc32\release\armv5"/>
 <arg value="-x!epoc32\release\winscw"/>
 <arg value="-xr!*.sym"/>
-<arg value="${build.drive}/output/zips/release/binaries_epoc.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_epoc.${sf.spec.package.zip.format}.zip"/>
 <arg value="epoc32\"/>
 </exec>
 </sequential>
 <if>
 <arg value="-i@${sf.sdk.header.list.file}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-x!epoc32/include/featureuids.h"/> <!-- This needs to come from the tools zip instead -->
-<arg value="${build.drive}/output/zips/release/binaries_epoc_sdk.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_epoc_sdk.${sf.spec.package.zip.format}.zip"/>
 </exec>
 <!-- Check that all the files we want in the SDK are zipped -->
 <antcall target="sf-log-to-brag">
 <param name="sf.brag.id" value="SDK"/>
 <param name="sf.brag.log" value="${build.log.dir}/zip_${build.id}_binaries_sdk.log"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-xr!*.lib"/>
-<arg value="${build.drive}/output/zips/release/binaries_winscw_udeb.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_winscw_udeb.${sf.spec.package.zip.format}.zip"/>
 <arg value="epoc32\release\winscw\udeb"/>
 </exec>
 <exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_winscw_urel.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-xr!*.lib"/>
-<arg value="${build.drive}/output/zips/release/binaries_winscw_urel.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_winscw_urel.${sf.spec.package.zip.format}.zip"/>
 <arg value="epoc32\release\winscw\urel"/>
 </exec>
 <exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_winscw_lib.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-ir!epoc32/release/winscw/*.lib"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
-<arg value="${build.drive}/output/zips/release/binaries_winscw_lib.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_winscw_lib.${sf.spec.package.zip.format}.zip"/>
 </exec>
 <!-- ARMv5 binaries, by udeb/urel/lib -->
 <exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_armv5_udeb.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
-<arg value="${build.drive}/output/zips/release/binaries_armv5_udeb.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_armv5_udeb.${sf.spec.package.zip.format}.zip"/>
 <arg value="epoc32\release\armv5\udeb"/>
 </exec>
 <exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_armv5_urel.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
-<arg value="${build.drive}/output/zips/release/binaries_armv5_urel.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_armv5_urel.${sf.spec.package.zip.format}.zip"/>
 <arg value="epoc32\release\armv5\urel"/>
 </exec>
 <exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_armv5_lib.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-ir!epoc32/release/armv5/_*.bin"/> <!-- include bootloaders in common lib zipfile -->
-<arg value="${build.drive}/output/zips/release/binaries_armv5_lib.zip"/>
+<arg value="${build.drive}/output/zips/release/binaries_armv5_lib.${sf.spec.package.zip.format}.zip"/>
 <arg value="epoc32\release\armv5\lib"/>
 </exec>
 </parallel>
 <runtarget target="sf-package-tools"/>
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@/output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
-<arg value="${build.drive}/output/zips/release/tools_epoc.zip"/>
+<arg value="${build.drive}/output/zips/release/tools_epoc.${sf.spec.package.zip.format}.zip"/>
 <arg value="epoc32/tools"/>
 <arg value="epoc32/gcc"/>
 <arg value="epoc32/gcc_mingw"/>
 <arg value="epoc32/data/buildinfo.txt"/>
 <arg value="epoc32/data/config/features.dat"/>
 <exec executable="7za" dir="${build.drive}/" output="${build.drive}/zip_${manifest.shortname}.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-i@${manifest.fullname}"/>
-<arg value="${build.drive}/output/zips/release/${manifest.shortname}.zip"/>
+<arg value="${build.drive}/output/zips/release/${manifest.shortname}.${sf.spec.package.zip.format}.zip"/>
 </exec>
 <!-- merge release metadata -->
 <antcall target="sf-zip-content">
 <param name="zip.config.file"  value="${temp.build.dir}/zip.cfg.xml.ftl"/>

changeset 1273	92bfe0d10c29
parent 1272	c4b5a5c928c2
child 1275	5a935138ebeb