--- a/common/build.postbuild.xml	Thu Nov 26 16:02:05 2009 +0000
+++ b/common/build.postbuild.xml	Wed Nov 25 14:14:19 2009 +0000
@@ -3,13 +3,6 @@
     <target name="sf-postbuild">
         <echo>[SF-POSTBUILD]</echo>
         
-        <if><istrue value="${sf.spec.referenceroms.createimages.enable}"/>
-        <then>
-            <echo message="INFO Building ROMs defined for this project"/>
-            <runtarget target="sf-rombuild"/>
-        </then>
-        </if>
-        
         <if><istrue value="${sf.relicense.exported.headers}"/>
         <then>
             <runtarget target="sf-run-sfl-licence-munging"/>
@@ -50,16 +43,16 @@
             
             <!-- run build analysis tools -->
             <runtarget target="sf-run-analysis"/>
-        
+
             <if>
-              <istrue value="${sf.spec.publish.enable}"/>
-              <then>
-                <!-- Generate reports to compare this build to a previous one -->
-                <runtarget target="sf-compare-to-baseline"/>
-              </then>
+                <istrue value="${sf.spec.publish.enable}"/>
+                <then>
+                    <!-- Generate reports to compare this build to a previous one -->
+                    <runtarget target="sf-compare-to-baseline"/>
+                </then>
             </if>
         </parallel>
-
+        
         <!-- Generate release_metadata entries for the md5 zips -->
         <antcall target="sf-zip-content">
             <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
@@ -81,6 +74,9 @@
             </then>
         </if>
 
+        <!-- copy log files linked to the generation of roms for REE -->
+        <runtarget target="sf-copy-rom-logs"/>
+
         <!-- Zip up all the logs -->
         <runtarget target="sf-zip-logs"/>
         
@@ -807,4 +803,20 @@
         <stopwatch name="munge" action="total"/>
     </target>
 
+    <target name="sf-copy-rom-logs">
+        <property name="sf.rombuild.dir" value="${build.drive}/epoc32/rom/"/>
+        <!-- copy log files for each variant we have -->
+        <echo message="build.log.dir= ${build.log.dir}"/>
+        <echo message="sf.rombuild.dir= ${sf.rombuild.dir}"/>
+        <echo message="sf.spec.referenceroms.variant= ${sf.spec.referenceroms.variant}"/>
+        
+        <copy todir="${build.log.dir}" preservelastmodified="true" failonerror="false">
+            <fileset dir="${sf.rombuild.dir}/${sf.spec.referenceroms.variant}/"><include name="*ROMBUILD.LOG"/></fileset>
+        </copy>
+        
+        <copy todir="${build.log.dir}" preservelastmodified="true" failonerror="false">
+            <fileset dir="${sf.rombuild.dir}/${sf.spec.referenceroms.variant}/"><include name="*rom.oby"/></fileset>
+        </copy>
+    </target>
+
 </project>

--- a/common/build.xml	Thu Nov 26 16:02:05 2009 +0000
+++ b/common/build.xml	Wed Nov 25 14:14:19 2009 +0000
@@ -573,67 +573,5 @@
         <copy file="${sf.common.config.dir}/tools/brag/brag.xsl" toDir="${build.log.dir}/summary/"/>
     </target>
        
-
-    <target name="sf-rombuild">
-      <!-- TODO If ANT gets a better way to do conditions based on value then use it instead! -->
-      <property name="sf.rombuild.dir" value="${build.drive}/sf/os/kernelhwsrv/kernel/eka/rombuild"/>
-      
-      <for list="${sf.spec.sbs.config}" delimiter="," param="sf.spec.sbs.config.variant">
-          <sequential>
-          <propertyregex property="udeb" input="@{sf.spec.sbs.config.variant}" regexp="(armv5$|armv5\.|armv5_udeb)" select="\1"/>
-          <propertyregex property="urel" input="@{sf.spec.sbs.config.variant}" regexp="(armv5$|armv5\.|armv5_urel)" select="\1"/>
-          </sequential>
-      </for> 
-      
-      <condition property="sf.spec.sbs.config.expanded" value="udeb">
-      <and><isset property="udeb"/><not><isset property="urel"/></not></and>
-      </condition>
-      
-      <condition property="sf.spec.sbs.config.expanded" value="urel">
-      <and><isset property="urel"/><not><isset property="udeb"/></not></and>
-      </condition>
-      
-      <condition property="sf.spec.sbs.config.expanded" value="udeb,urel">
-      <and><isset property="udeb"/><isset property="urel"/></and>
-      </condition>
-      
-      <if><isset property="sf.spec.sbs.config.expanded"/>
-      <then>
-          <echo message="INFO Found armv5, building ${sf.spec.sbs.config.expanded}"/>      
-          
-          <for list="${sf.spec.referenceroms.list}" delimiter="," param="sf.spec.referenceroms.variant">
-              <sequential>
-              <for list="${sf.spec.sbs.config.expanded}" delimiter="," param="sf.spec.sbs.config.expanded.i">
-                  <sequential>
-                      <echo message="INFO Building textshell ROM variant @{sf.spec.sbs.config.expanded.i} @{sf.spec.referenceroms.variant}"/>
-                      <exec executable="cmd" dir="${sf.rombuild.dir}" failonerror="false" 
-                      output="${build.log.dir}/ROM_@{sf.spec.referenceroms.variant}_@{sf.spec.sbs.config.expanded.i}_out.log" logError="true">
-                          <arg value="/c"/>
-                          <arg value="rom --variant=@{sf.spec.referenceroms.variant} --inst=armv5 --build=@{sf.spec.sbs.config.expanded.i} --type=tshell"/>
-                      </exec>
-                      
-                      <if><available  file="${sf.rombuild.dir}/ROMBUILD.LOG"/>
-                      <then>
-                          <move file="${sf.rombuild.dir}/ROMBUILD.LOG" tofile="${build.log.dir}/ROMBUILD_@{sf.spec.referenceroms.variant}_@{sf.spec.sbs.config.expanded.i}.log"/>
-                      </then>
-                      <else>
-                          <echo message="ERROR Failed to build @{sf.spec.sbs.config.expanded.i} ROM for @{sf.spec.referenceroms.variant} variant"/>
-                      </else>
-                      </if>
-                  </sequential>
-             </for>
-             </sequential>
-          </for>
-          
-          <move todir="${build.drive}/epoc32/rom/"  verbose="true" failonerror="false">
-            <fileset dir="${sf.rombuild.dir}">
-              <include name="**/*.IMG"/>
-            </fileset>
-          </move>
-      </then>
-      <else><echo message="INFO ROM Build requested but no valid build variants defined by sf.spec.sbs.config. Skipping."/></else>
-      </if>
-    </target>
-
 </project>