# HG changeset patch
# User shaberazvi@LON-ENGBUILD88.prod.ad.symbian.intra
# Date 1236351938 0
# Node ID 29394d95b3e1a63e73a3f3e31f9bab42cc1437f5
# Parent  b7bfb0cc6f4a153a44e77d37700c4d8893722a4b# Parent  8bbcf7b2218dd9324e7bcee3170c994452782fdc
Merge all changes

diff -r b7bfb0cc6f4a -r 29394d95b3e1 common/build.xml
--- a/common/build.xml	Thu Mar 05 18:25:31 2009 +0000
+++ b/common/build.xml	Fri Mar 06 15:05:38 2009 +0000
@@ -19,7 +19,20 @@
     
     <!--
     ** TARGET DEFINITIONS
-    -->
+    -->   
+    
+    <target name="sf-prep" depends="sf-generate-source-spec, prep-drive,init-build-area,check-tool-dependencies,create-bom,log-build-env">
+        <echo>[SF-PREP]</echo>
+        <tempfile property="prep.dynamic.config" suffix="ant.xml" destdir="${temp.build.dir}"/>
+    </target>
+        
+    <target name="sf-build-all" depends="sf-prebuild,sf-build-noprep,sf-postbuild">
+        <echo>[SF-BUILD-ALL]</echo>
+    </target>
+    
+    <target name="sf-build" depends="sf-prep,sf-prebuild,sf-build-noprep,sf-postbuild">
+        <echo>[SF-BUILD]</echo>
+    </target>
     
     <target name="sf-parse-project-config">
     <!-- TODO: Parse the project config and generate properties and csv file to be
@@ -41,15 +54,6 @@
         </fmpp>
     </target>
     
-    <target name="sf-build" depends="sf-prep,sf-prebuild,sf-build-noprep,sf-postbuild">
-        <echo>[SF-BUILD]</echo>
-    </target>   
-    
-    <target name="sf-prep" depends="sf-generate-source-spec, prep-drive,init-build-area,check-tool-dependencies,create-bom,log-build-env">
-        <echo>[SF-PREP]</echo>
-        <tempfile property="prep.dynamic.config" suffix="ant.xml" destdir="${temp.build.dir}"/>
-    </target>
-    
     <target name="sf-prebuild">
         <echo>[SF-PREBUILD]</echo>
         
diff -r b7bfb0cc6f4a -r 29394d95b3e1 common/hlm.bat
--- a/common/hlm.bat	Thu Mar 05 18:25:31 2009 +0000
+++ b/common/hlm.bat	Fri Mar 06 15:05:38 2009 +0000
@@ -2,6 +2,6 @@
 setlocal
 if not defined HELIUM_HOME set HELIUM_HOME=%~dp0..\..\..\..\helium
 echo %HELIUM_HOME%
-call ..\..\build\env.bat
+rem call ..\..\build\env.bat
 call %HELIUM_HOME%\hlm.bat %*
 endlocal     
\ No newline at end of file
diff -r b7bfb0cc6f4a -r 29394d95b3e1 common/properties.default.ant.xml
--- a/common/properties.default.ant.xml	Thu Mar 05 18:25:31 2009 +0000
+++ b/common/properties.default.ant.xml	Fri Mar 06 15:05:38 2009 +0000
@@ -12,12 +12,12 @@
         <property name="ccm.project.wa_path" location="${data.drive.letter}:\Build_${data.drive.letter}\${env.USERNAME}\ido_wa\${build.name}"/>
 
         <!--  to get run getenv package/platform, what to get is defined by props below -->
-        <property name="sf.prebuild.getenv"               value="true"/>   
+        <property name="sf.baseline.enable" value="true" />
         <property name="sf.prebuild.getsrc"               value="true"/>   
              
         <property name="base_release.getenv_options"     value=""/>
-        <!--property name="base_release.path"               value="\\fasrrm01.europe.nokia.com\GRACE\s60_devices_sw\S60_5_1\S60.MCL_200904_S60.51"/-->
-        <property name="base_release.path"     value="\\lon-engbuild88\d$\TB91_Releases\week04.grace"/> 
+        <!-- property name="base_release.path"               value="\\fasrrm01.europe.nokia.com\GRACE\s60_devices_sw\S60_5_1\S60.MCL_200904_S60.51"/ -->
+        <property name="base_release.path"     value="\\lon-engbuild68\d$\GRACE\Dummy\Symbian_OS_vtb91sf\SY_TB91_200910_101"/> 
 
         
         <property name="email.from"        value="shabe.razvi@nokia.com"/>