--- a/common/build.xml	Wed Jul 15 17:48:52 2009 +0100
+++ b/common/build.xml	Wed Jul 15 17:50:03 2009 +0100
@@ -564,10 +564,16 @@
     </target>
     
     <target name="sf-package-source" depends="sf-preprocess-package-config">
+        <!-- Firstly zip up src by package -->
         <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="src" />
         </antcall>
+        <!-- Then zip up zips by layer -->
+        <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="src-by-layer" />
+        </antcall>
     </target>
     
     <target name="sf-package-tools" depends="sf-preprocess-package-config">

--- a/common/templates/zip.cfg.xml.ftl.template	Wed Jul 15 17:48:52 2009 +0100
+++ b/common/templates/zip.cfg.xml.ftl.template	Wed Jul 15 17:50:03 2009 +0100
@@ -38,6 +38,34 @@
 				<set name="grace.filters" value="rnd" />
 			</config>
 		</config>
+		<config name="src-by-layer" abstract="true">
+			<set name="grace.filters" value="src" />
+			<set name="root.dir" value="${build.output.dir}/zips"/>
+			<config>
+				<set name="name" value="src_adaptation"/>
+				<set name="include" value="src_sfl_adaptation_*.zip"/>
+			</config>
+			<config>
+				<set name="name" value="src_app"/>
+				<set name="include" value="src_sfl_app_*.zip"/>
+			</config>
+			<config>
+				<set name="name" value="src_mw"/>
+				<set name="include" value="src_sfl_mw_*.zip"/>
+			</config>
+			<config>
+				<set name="name" value="src_os"/>
+				<set name="include" value="src_sfl_os_*.zip"/>
+			</config>
+			<config>
+				<set name="name" value="src_ostools"/>
+				<set name="include" value="src_sfl_ostools_*.zip"/>
+			</config>
+			<config>
+				<set name="name" value="src_tools"/>
+				<set name="include" value="src_sfl_tools_*.zip"/>
+			</config>
+		</config>
 		<!-- Specify this config to package all outputs from the build -->
 		<config name="bin" abstract="true">
 			<!-- This config will be populated with exclusions for the rnd bins -->