# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1270030266 -3600
# Node ID 13a65aba421361a996c33a69dd562113de640876
# Parent  0df7e5ced6cedd12bfd6000f8da01e33f670c9cd# Parent  57c6fb7e503c63d33e35a5eedc5947a8219b06cd
Merge

diff -r 57c6fb7e503c -r 13a65aba4213 symbian3/single/job_refs.ant.xml
--- a/symbian3/single/job_refs.ant.xml	Tue Mar 30 18:08:47 2010 +0100
+++ b/symbian3/single/job_refs.ant.xml	Wed Mar 31 11:11:06 2010 +0100
@@ -1,18 +1,56 @@
 <?xml version="1.0"?>
 
-<project name="SF-JOB-REFS">
+<project name="SF-JOB-REFS" xmlns:hlm="http://www.nokia.com/helium">
 
 <!-- For a combined model GT+S60, sf.spec.os.system.definition.files must be used -->
-<path id="sf.spec.os.system.definition.files">
+  <path id="sf.spec.os.system.definition.files">
     <fileset dir="${sf.project.location}/" casesensitive="false">
             <include name="sysdefs/system_model.xml" />
     </fileset>
- </path>
+  </path>
   
   <path id="sf.spec.s60.system.definition.files">
-	<fileset dir="${sf.project.location}/" casesensitive="false">
-			<include name="sysdefs/system_model_s60.xml" />
-	</fileset>
+    <fileset dir="${sf.project.location}/" casesensitive="false">
+        <include name="sysdefs/system_model_s60.xml" />
+    </fileset>
   </path>   
     
+  <!-- iMaker config to be used by build-roms Helium target -->
+  <hlm:imakerconfigurationset id="imaker.rom.config">
+     <imakerconfiguration regionalVariation="false">
+         <makefileset>
+             <!-- Note: case sensitive -->
+             <include name="**/*Syborg*.mk"/>
+         </makefileset>
+         <targetset>
+             <include name="^core$" />
+             <!--
+             include name="langpack_\d+" />
+             <include name="^custvariant_.*$" />
+             <include name="^udaerase$" /
+             -->
+         </targetset>
+         <variableset>
+             <variable name="TYPE" value="rnd"/>
+             <variable name="USE_SYMGEN" value="1"/>
+             <variable name="USE_UDEB" value="1"/>
+         </variableset>
+     </imakerconfiguration>
+     
+     <!--imakerconfiguration regionalVariation="false">
+         <makefileset>
+             <include name="**/*zoom2*.mk"/>
+         </makefileset>
+         <targetset>
+             <include name="^core$" />
+         </targetset>
+         <variableset>
+             <variable name="TYPE" value="rnd"/>
+             <variable name="USE_SYMGEN" value="1"/>
+             <variable name="USE_UDEB" value="1"/>
+         </variableset>
+     </imakerconfiguration -->
+     
+  </hlm:imakerconfigurationset>
+    
  </project>
\ No newline at end of file
diff -r 57c6fb7e503c -r 13a65aba4213 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Tue Mar 30 18:08:47 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Wed Mar 31 11:11:06 2010 +0100
@@ -2683,6 +2683,13 @@
       <!-- will shoudl give the id/path something more unique than cenrep -->
       <unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
      </component>
+     <component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" class="config">
+      <unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+     </component>
+     <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 ROM Config" purpose="development" class="config">      
+      <unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+     </component>
+     
     </collection>
     <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">