--- a/common/build.postbuild.xml	Wed Sep 23 14:17:19 2009 +0100
+++ b/common/build.postbuild.xml	Wed Sep 23 14:15:55 2009 +0100
@@ -229,6 +229,11 @@
                 <arg value="epoc32\release\armv5\"/>
             </exec>
         </parallel>
+        <!-- Generate release_metadata entries for the above zips -->
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="bin-just-metadata" />
+        </antcall>
     </target>
 
     <target name="sf-package-postbuild-rnd" depends="sf-preprocess-package-config">
@@ -239,7 +244,6 @@
     </target>
 
     <target name="sf-package-tools" depends="sf-preprocess-package-config">
-        <echo message="Packaging epoc32 tools - Temporary method"/>
         <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
             <arg value="a"/>
             <arg value="-tzip"/>
@@ -247,6 +251,10 @@
             <arg value="${build.drive}/output/zips/release/tools_epoc.zip"/> 
             <arg value="epoc32/tools"/>
         </exec>
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="tools" />
+        </antcall>
     </target>
     
     <target name="sf-package-validate">

--- a/common/templates/zip.cfg.xml.ftl.template	Wed Sep 23 14:17:19 2009 +0100
+++ b/common/templates/zip.cfg.xml.ftl.template	Wed Sep 23 14:15:55 2009 +0100
@@ -119,5 +119,29 @@
 			<set name="grace.filters" value="emu"/>
 			<set name="archives.dir" value="${build.output.dir}/zips/release" />
 		</config>
+		<!-- "Null" tools entry, which matches no files, but does populate the release_metadata.xml -->
+		<config name="tools">
+			<set name="name" value="tools_epoc"/>
+			<set name="archives.dir" value="${build.output.dir}/zips/release" />
+			<set name="grace.filters" value="tools"/>
+			<set name="include" value="*"/>
+			<set name="exclude" value="**"/>
+		</config>
+		<!-- "Null" binaries entries, which match no files, but do populate the release_metadata.xml -->
+		<config name="bin-just-metadata" abstract="true">
+			<set name="archives.dir" value="${build.output.dir}/zips/release" />
+			<set name="grace.filters" value="emu"/>
+			<set name="include" value="*"/>
+			<set name="exclude" value="**"/>
+			<config name="core">
+				<set name="name" value="binaries_epoc"/>
+			</config>
+			<config name="armv5">
+				<set name="name" value="binaries_armv5"/>
+			</config>
+			<config name="winscw">
+				<set name="name" value="binaries_winscw"/>
+			</config>
+		</config>
 	</config>
 </build>