# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1251121028 -3600
# Node ID 71d64162329a4ecb519f6de4b3675131926f922a
# Parent  598bc53daddb2d71e44e1b0b0b53e91e7c8b3a53# Parent  ea854a4b723d0324a485fef870dc7d0db8a3e1c6
catchup merge

diff -r ea854a4b723d -r 71d64162329a common/build.xml
--- a/common/build.xml	Mon Aug 24 11:17:40 2009 +0100
+++ b/common/build.xml	Mon Aug 24 14:37:08 2009 +0100
@@ -175,7 +175,7 @@
             <istrue value="${sf.spec.publish.enable}"/>
             <then>
                 <runtarget target="diamonds"/>
-                <runtarget target="sf-tag-build"/>
+                <runtarget target="sf-diamonds-tag-build"/>
             </then>
         </if>
         
@@ -291,8 +291,8 @@
       </if>
     </target>
     
-    <target name="sf-tag-build">
-      <echo>[SF-TAG-BUILD]</echo>
+    <target name="sf-diamonds-tag-build">
+      <echo>[SF-DIAMONDS-TAG-BUILD]</echo>
       <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-tag-build.xml.ftl" outputFile="${build.drive}/output/logs/sf-tag-build.xml">
         <data expandProperties="yes">
           ant: antProperties()
diff -r ea854a4b723d -r 71d64162329a common/common_props.ant.xml
--- a/common/common_props.ant.xml	Mon Aug 24 11:17:40 2009 +0100
+++ b/common/common_props.ant.xml	Mon Aug 24 14:37:08 2009 +0100
@@ -4,8 +4,6 @@
 
     <property name="sf.drive.space.needed" value="0"/>
 
-    <property name="sf.project.type" value="package"/>
-	
     <property name="sf.spec.job.name" value="myproduct"/>
     <property name="sf.spec.job.codeline" value="MCL"/>
     <property name="sf.spec.job.number" value="001"/> <!-- this is always overriden from the commandline -->
diff -r ea854a4b723d -r 71d64162329a common/diamonds/config.xml.ftl
--- a/common/diamonds/config.xml.ftl	Mon Aug 24 11:17:40 2009 +0100
+++ b/common/diamonds/config.xml.ftl	Mon Aug 24 14:37:08 2009 +0100
@@ -71,7 +71,7 @@
             defer="true"/>
             
         <!-- SF specific -->
-        <target name="sf-tag-build"/>
+        <target name="sf-diamonds-tag-build"/>
         <target name="sf-diamondize-bom"/>
         <target name="sf-run-analysis"/>
     </targets>
diff -r ea854a4b723d -r 71d64162329a sf-package/package_props.ant.xml
--- a/sf-package/package_props.ant.xml	Mon Aug 24 11:17:40 2009 +0100
+++ b/sf-package/package_props.ant.xml	Mon Aug 24 14:37:08 2009 +0100
@@ -4,6 +4,8 @@
   
   <property name="sf.drive.space.needed" value="10G"/>
 
+  <property name="sf.project.type" value="package"/>
+	
   <property name="sf.spec.baseline.enable" value="true"/>
   <property name="sf.spec.baseline.select" value="location"/>
   <property name="sf.spec.baseline.location" value="\\bishare\Releases\PDK_candidate_2.0.d_flat"/>
diff -r ea854a4b723d -r 71d64162329a sf-platform/build.xml
--- a/sf-platform/build.xml	Mon Aug 24 11:17:40 2009 +0100
+++ b/sf-platform/build.xml	Mon Aug 24 14:37:08 2009 +0100
@@ -17,11 +17,48 @@
    -->
 
   <!-- MattD - workaround until generating a model from package definitions works-->
-  <target name="sf-build-noprep" depends="sf-compile,sf-postbuild">
+  <target name="sf-build-noprep" depends="sf-platform-bootstrap,sf-compile,sf-postbuild">
     <echo>[SF-BUILD-NOPREP] (platform)</echo>
     <echo>[SF-BUILD-NOPREP] WARNING: Not generating model from packages</echo>
   </target>
 
+  <target name="sf-platform-bootstrap" depends="sf-platform-bootstrap-gt,sf-platform-bootstrap-s60"/>
+
+  <target name="sf-platform-bootstrap-gt" >
+    <echo>[SF-platform-bootstrap-gt] Warning: hard-coded to tb91!</echo>
+    <!-- do initial stuff to get raptor working -->
+    <copy file="${build.drive}/sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS.hrh" tofile="${build.drive}/epoc32/include/variant/Symbian_OS.hrh" failonerror="true" verbose="true" />
+    <copy file="${build.drive}/sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb91sf.cfg" tofile="${build.drive}/epoc32/tools/variant/variant.cfg" failonerror="true" verbose="true" preservelastmodified="true" />
+  </target>
+
+  <target name="sf-platform-bootstrap-s60" >    
+    <!-- Do touch on S60 variant.cfg to force raptor to export -->
+    <touch file="${build.drive}/${sf.spec.bldmefirst.s60.sbs.variant.cfg}" />
+    <delete file="${build.log.dir}/${build.id}_bldmefirst-s60.log"/>
+
+    <property name="sf.compile.bldmefirst.command.sbsexport" value="sbs EXPORT --ignore-os-detection --export-only"/>
+    <!-- do bldmefirst stage 1-->
+    <for list="${sf.spec.bldmefirst.s60.exports}" delimiter="," param="sf.spec.bldmefirst.s60.export">
+      <sequential>
+          <echo message="Performing bldmefirst export on @{sf.spec.bldmefirst.s60.export}"/>
+          <exec executable="cmd" dir="${build.drive}" failonerror="true" append="true" output="${build.log.dir}/${build.id}_bldmefirst-s60.log">
+            <arg value="/c"/>
+            <arg value="${sf.compile.bldmefirst.command.sbsexport}" />
+            <arg value="-b"/>
+            <arg value="${build.drive}/@{sf.spec.bldmefirst.s60.export}/bld.inf"/>
+          </exec>  
+      </sequential>
+    </for>  
+    <copy todir="${build.drive}/epoc32/tools/makefile_templates/s60">
+        <fileset dir="${build.drive}/sf/tools/makefile_templates">
+          <exclude name=".hg*"/>
+          <exclude name=".hg/**"/>
+          <exclude name="layers.sysdef.xml"/>
+        </fileset>
+    </copy>
+  </target>
+            
+
   <!-- workaround until GenXML can merge v2.0.0 fragments -->
   <!--
     This target is effectively a callback, called from compile-main.
diff -r ea854a4b723d -r 71d64162329a sf-platform/platform_props.ant.xml
--- a/sf-platform/platform_props.ant.xml	Mon Aug 24 11:17:40 2009 +0100
+++ b/sf-platform/platform_props.ant.xml	Mon Aug 24 14:37:08 2009 +0100
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <project name="SF-PLATFORM-PROPS">
   
+  <property name="sf.project.type" value="platform" />
+    
   <property name="sf.drive.space.needed" value="150G"/>
 
 </project>