# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1264525099 0
# Node ID 0e553fdaa2185c7dd1a7a0d40cb927f2be56b379
# Parent  9d6a5309852c742712cb702f6cf14501181e7e69
Added framework for specifying a "sources.csv" for test repos (separate from both the FBF and the sources repos).

diff -r 9d6a5309852c -r 0e553fdaa218 common/build.xml
--- a/common/build.xml	Tue Jan 26 15:39:24 2010 +0000
+++ b/common/build.xml	Tue Jan 26 16:58:19 2010 +0000
@@ -172,11 +172,16 @@
         <!-- TODO: 2. Change fmpp data to be a full property rather than relative path -->
         <delete file="${temp.build.dir}/source-spec.ant.xml"/>
         
+        <property name="sf.test.csv.file" value="nul:"/>
+
         <fmpp sourceFile="${sf.common.config.dir}/templates/source-spec.ant.xml.ftl"
               outputFile="${temp.build.dir}/source-spec.ant.xml">
               <data expandProperties="yes">
                     ant: antProperties()
-                    data: csv(${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
+                    data: [
+                        csv(${sf.test.csv.file}, {separator:','})
+                        csv(${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
+                    ]
               </data>
         </fmpp>
     </target>
diff -r 9d6a5309852c -r 0e553fdaa218 common/templates/source-spec.ant.xml.ftl
--- a/common/templates/source-spec.ant.xml.ftl	Tue Jan 26 15:39:24 2010 +0000
+++ b/common/templates/source-spec.ant.xml.ftl	Tue Jan 26 16:58:19 2010 +0000
@@ -23,7 +23,8 @@
         <delete file="${ant['build.drive']}/output/logs/BOM/sources.csv" quiet="true"/>
     </target>
 
-<#list data as pkg_detail>
+<#list data as csv_file>
+  <#list csv_file as pkg_detail>
     <target name="sf-prebuild-${count}">
         <sequential>
             <!-- create sf\layer dir  -->
@@ -136,6 +137,7 @@
     <#assign bom_list = "${bom_list}" + "<runtarget target=\"sf-bom-info-${count}\"/>\r\n  "/>
     <#assign change_list = "${change_list}" + "<runtarget target=\"sf-bom-change-info-${count}\"/>\r\n  "/>
     <#assign count = count + 1 />
+  </#list>
 </#list>
 
     <path id="system.definition.files">