Bug 3748: Please separate ROM images into a separate zip file
\epoc32\rom\* and \epoc32\rombuild\* now in separate archive (apart from items which are included in the tools zip)
--- a/common/build.postbuild.xml Fri Oct 01 14:00:40 2010 +0100
+++ b/common/build.postbuild.xml Fri Oct 01 16:54:01 2010 +0100
@@ -346,6 +346,8 @@
<arg value="-x!epoc32\include\featureuids.h"/>
<arg value="-x!epoc32\rom\include\feature.iby"/>
<arg value="-x!epoc32\rom\include\featuredatabase.xml"/>
+ <arg value="-x!epoc32\rom"/> <!-- ROM images (etc) go into their own archive -->
+ <arg value="-x!epoc32\rombuild"/> <!-- ROM images go into their own archive -->
<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"/>
@@ -449,6 +451,20 @@
<arg value="${build.drive}/output/zips/release/binaries_armv5_lib.${sf.spec.package.zip.format}.zip"/>
<arg value="epoc32\release\armv5\lib"/>
</exec>
+
+ <!-- ROM images -->
+ <exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_rom_images.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="-x!epoc32\rom\include\feature.iby"/>
+ <arg value="-x!epoc32\rom\include\featuredatabase.xml"/>
+ <arg value="${build.drive}/output/zips/release/binaries_rom_images.${sf.spec.package.zip.format}.zip"/>
+ <arg value="epoc32\rom"/>
+ <arg value="epoc32\rombuild"/>
+ </exec>
</parallel>
<runtarget target="sf-package-tools"/>
@@ -994,9 +1010,9 @@
<istrue value="${sf.spec.publish.release.zips.enable}" />
<then>
<mkdir dir="${sf.spec.publish.release.zips.location}/${build.id}"/>
- <copy todir="${sf.spec.publish.release.zips.location}/${build.id}" preservelastmodified="true" failonerror="false">
- <fileset dir="${build.output.dir}/zips/release/"><include name="*.*"/></fileset>
- </copy>
+ <copy todir="${sf.spec.publish.release.zips.location}/${build.id}" preservelastmodified="true" failonerror="false">
+ <fileset dir="${build.output.dir}/zips/release/"><include name="*.*"/></fileset>
+ </copy>
</then>
</if>
</target>
--- a/common/templates/zip.cfg.xml.ftl.template Fri Oct 01 14:00:40 2010 +0100
+++ b/common/templates/zip.cfg.xml.ftl.template Fri Oct 01 16:54:01 2010 +0100
@@ -105,7 +105,9 @@
<config name="winscw_lib">
<set name="name" value="binaries_winscw_lib.${sf.spec.package.zip.format}"/>
</config>
-
+ <config name="rom_images">
+ <set name="name" value="binaries_rom_images.${sf.spec.package.zip.format}"/>
+ </config>
</config>
<!-- "Null" SDK entry, which matches no files, but does populate the release_metadata.xml -->
<config name="bin-sdk-just-metadata" abstract="true">