--- a/common/build.postbuild.xml	Wed Mar 03 10:25:44 2010 +0000
+++ b/common/build.postbuild.xml	Fri Mar 05 16:20:28 2010 +0000
@@ -276,23 +276,60 @@
                 </then>
             </if>
             
-            <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw.log">
+            <!-- WinsCW binaries, by udeb/urel/lib -->
+            <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw_udeb.log">
+                <arg value="a"/>
+                <arg value="-tzip"/>
+                <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
+                <arg value="-xr!*.sym"/>
+                <arg value="-xr!*.lib"/>
+                <arg value="${build.drive}/output/zips/release/binaries_winscw_udeb.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="-tzip"/>
                 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
                 <arg value="-xr!*.sym"/>
-                <arg value="${build.drive}/output/zips/release/binaries_winscw.zip"/>
+                <arg value="-xr!*.lib"/>
+                <arg value="${build.drive}/output/zips/release/binaries_winscw_urel.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="-tzip"/>
+                <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
+                <arg value="-ir*.lib"/>
+                <arg value="${build.drive}/output/zips/release/binaries_winscw_lib.zip"/>
                 <arg value="epoc32\release\winscw\"/>
             </exec>
             
-            <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5.log">
+            <!-- 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="-tzip"/>
                 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
                 <arg value="-xr!*.sym"/>
-                <arg value="${build.drive}/output/zips/release/binaries_armv5.zip"/>
-                <arg value="epoc32\release\armv5\"/>
+                <arg value="${build.drive}/output/zips/release/binaries_armv5_udeb.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="-tzip"/>
+                <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
+                <arg value="-xr!*.sym"/>
+                <arg value="${build.drive}/output/zips/release/binaries_armv5_urel.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="-tzip"/>
+                <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
+                <arg value="-xr!*.sym"/>
+                <arg value="${build.drive}/output/zips/release/binaries_armv5_lib.zip"/>
+                <arg value="epoc32\release\armv5\lib"/>
+            </exec>
+
         </parallel>
         <!-- Generate release_metadata entries for the above zips -->
         <antcall target="sf-zip-content">

--- a/common/templates/zip.cfg.xml.ftl.template	Wed Mar 03 10:25:44 2010 +0000
+++ b/common/templates/zip.cfg.xml.ftl.template	Fri Mar 05 16:20:28 2010 +0000
@@ -87,12 +87,25 @@
 			<config name="core">
 				<set name="name" value="binaries_epoc"/>
 			</config>
-			<config name="armv5">
-				<set name="name" value="binaries_armv5"/>
+			<config name="armv5_udeb">
+				<set name="name" value="binaries_armv5_udeb"/>
+			</config>
+			<config name="armv5_urel">
+				<set name="name" value="binaries_armv5_urel"/>
+			</config>
+			<config name="armv5_lib">
+				<set name="name" value="binaries_armv5_lib"/>
 			</config>
-			<config name="winscw">
-				<set name="name" value="binaries_winscw"/>
+			<config name="winscw_udeb">
+				<set name="name" value="binaries_winscw_udeb"/>
 			</config>
+			<config name="winscw_urel">
+				<set name="name" value="binaries_winscw_urel"/>
+			</config>
+			<config name="winscw_lib">
+				<set name="name" value="binaries_winscw_lib"/>
+			</config>
+
 		</config>
 		<!-- "Null" SDK entry, which matches no files, but does populate the release_metadata.xml -->
 		<config name="bin-sdk-just-metadata" abstract="true">