# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1260891767 0
# Node ID 3325a05ec9ed46a78216395651e29d8ff581afe6
# Parent  9eea79386bb7ca6961154193d21196ca68702186
Fix Bug 1303 by removing -ignore-os-detection and use buildinfo.txt.

diff -r 9eea79386bb7 -r 3325a05ec9ed PDK_Helium/config.xml
--- a/PDK_Helium/config.xml	Thu Dec 10 15:34:31 2009 +0000
+++ b/PDK_Helium/config.xml	Tue Dec 15 15:42:47 2009 +0000
@@ -108,8 +108,10 @@
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>tip</string>
+              <string>PDK_2.0.2</string>
               <string>PDK_2.0.1</string>
               <string>PDK_2.0.0</string>
+              <string>PDK_3.0.d</string>
               <string>PDK_3.0.c</string>
               <string>PDK_3.0.b</string>
               <string>PDK_3.0.a</string>
@@ -139,6 +141,7 @@
     <hudson.tasks.BatchFile>
       <command>%BUILD_DRIVE%
 cd\
+set HG_PASSWORD=
 set PROJECT=single
 set TOOLS_BASELINE_ENABLE=true
 set TOOLS_CONFIG=tools_rel.whatlog,tools2_rel.whatlog
@@ -193,6 +196,7 @@
     <hudson.tasks.BatchFile>
       <command>%BUILD_DRIVE%
 cd\
+set HG_PASSWORD=
 set PROJECT=single
 set TOOLS_BASELINE_ENABLE=true
 set TOOLS_CONFIG=tools_rel.whatlog,tools2_rel.whatlog
diff -r 9eea79386bb7 -r 3325a05ec9ed PDK_Raptor/config.xml
--- a/PDK_Raptor/config.xml	Thu Dec 10 15:34:31 2009 +0000
+++ b/PDK_Raptor/config.xml	Tue Dec 15 15:42:47 2009 +0000
@@ -87,7 +87,7 @@
         </hudson.model.ChoiceParameterDefinition>
         <hudson.model.ChoiceParameterDefinition>
           <name>TARGET</name>
-          <description>What target to build. Building armv5 targets requires RVCT arm compiler installed.</description>
+          <description>What target to build. Building armv5 targets requires RVCT arm compiler installed. If you need a different target, then select &lt;i&gt;configure&lt;/i&gt; on the left, and add it to the choice option.</description>
           <choices class="java.util.Arrays$ArrayList">
             <a class="string-array">
               <string>-c winscw_udeb</string>
@@ -120,20 +120,21 @@
 hg clone http://developer.symbian.org/oss/MCL/utilities</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
-      <command>%SUBST_DRIVE%
+      <command>@echo off
+%SUBST_DRIVE%
 cd \
-copy %RELEASE_ZIP_LOCATION%\build_BOM.zip %SUBST_DRIVE%\tmp
-copy %RELEASE_ZIP_LOCATION%\*_rndonly*.zip %SUBST_DRIVE%\tmp
-copy %RELEASE_ZIP_LOCATION%\bin_redist*.zip %SUBST_DRIVE%\tmp
-copy %RELEASE_ZIP_LOCATION%\binaries_epoc_additional.zip %SUBST_DRIVE%\tmp
-copy %RELEASE_ZIP_LOCATION%\binaries_bldmefirst.zip %SUBST_DRIVE%\tmp
-%SUBST_DRIVE%\tmp
+xcopy %RELEASE_ZIP_LOCATION%\build_BOM.zip %SUBST_DRIVE%\tmp /q
+xcopy %RELEASE_ZIP_LOCATION%\*_rndonly*.zip %SUBST_DRIVE%\tmp /q
+xcopy %RELEASE_ZIP_LOCATION%\bin_redist*.zip %SUBST_DRIVE%\tmp /q
+xcopy %RELEASE_ZIP_LOCATION%\binaries_epoc_additional.zip %SUBST_DRIVE%\tmp /q
+xcopy %RELEASE_ZIP_LOCATION%\binaries_bldmefirst.zip %SUBST_DRIVE%\tmp /q
+
 IF %SRC_LOCATION% == BOM goto TOOLSZIP
-copy %RELEASE_ZIP_LOCATION%\src_*.zip %SUBST_DRIVE%\tmp
+xcopy %RELEASE_ZIP_LOCATION%\src_*.zip %SUBST_DRIVE%\tmp /q
 :TOOLSZIP
 IF %REBUILD_TOOLS% == true exit 0
-copy %RELEASE_ZIP_LOCATION%\binaries_epoc32_stlport.zip %SUBST_DRIVE%\tmp
-copy %RELEASE_ZIP_LOCATION%\tools_*.zip %SUBST_DRIVE%\tmp
+xcopy %RELEASE_ZIP_LOCATION%\binaries_epoc32_stlport.zip %SUBST_DRIVE%\tmp /q
+xcopy %RELEASE_ZIP_LOCATION%\tools_*.zip %SUBST_DRIVE%\tmp /q
 exit 0</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
@@ -208,7 +209,7 @@
 cd\
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml -c tools_rel.whatlog -c tools2_rel.whatlog %TARGET% -i EXPORT -k -f exports.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml -c tools_rel.whatlog -c tools2_rel.whatlog %TARGET% EXPORT -k -f exports.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>if %REBUILD_TOOLS% == false exit
@@ -218,7 +219,7 @@
 cd\
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml  -c tools2_rel.whatlog.v%VARIANT% -i -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools2_gt.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml  -c tools2_rel.whatlog.v%VARIANT% -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools2_gt.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>if %REBUILD_TOOLS% == false exit
@@ -228,7 +229,7 @@
 cd\
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml  -c tools_rel.whatlog.v%VARIANT% -i -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools_gt.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml  -c tools_rel.whatlog.v%VARIANT% -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools_gt.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>cd %SUBST_DRIVE%
@@ -237,7 +238,7 @@
 cd\
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml  %TARGET% -i -j %NUMBER_OF_PROCESSORS% -t 5 -k -f build.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_GT_%VARIANT%.xml  %TARGET% -j %NUMBER_OF_PROCESSORS% -t 5 -k -f build.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>IF %SPLIT_BUILD% == false exit
@@ -250,7 +251,7 @@
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
 IF %PLATFORM% == symbian3 set S60VARIANT=5_2
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml -c tools_rel.whatlog -c tools2_rel.whatlog %TARGET% -i EXPORT -k -f exports.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml -c tools_rel.whatlog -c tools2_rel.whatlog %TARGET% EXPORT -k -f exports_s60.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>IF %SPLIT_BUILD% == false exit
@@ -263,7 +264,7 @@
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
 IF %PLATFORM% == symbian3 set S60VARIANT=5_2
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml  -c tools2_rel.whatlog.v%VARIANT% -i -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools2_gt.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml  -c tools2_rel.whatlog.v%VARIANT% -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools2_s60.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>IF %SPLIT_BUILD% == false exit
@@ -276,7 +277,7 @@
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
 IF %PLATFORM% == symbian3 set S60VARIANT=5_2
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml  -c tools_rel.whatlog.v%VARIANT% -i -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools_gt.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml  -c tools_rel.whatlog.v%VARIANT% -j %NUMBER_OF_PROCESSORS% -t 5 -k -f tools_s60.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>IF %SPLIT_BUILD% == false exit
@@ -288,7 +289,7 @@
 set VARIANT=tb91sf
 IF %PLATFORM% == symbian3 set VARIANT=tb92sf
 IF %PLATFORM% == symbian3 set S60VARIANT=5_2
-cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml  %TARGET% -i -j %NUMBER_OF_PROCESSORS% -t 5 -k -f build.log</command>
+cmd /c sbs -s %SUBST_DRIVE%\build_info\logs\BOM\canonical_system_definition_S60_%S60VARIANT%_sf.xml  %TARGET% -j %NUMBER_OF_PROCESSORS% -t 5 -k -f build_s60.log</command>
     </hudson.tasks.BatchFile>
     <hudson.tasks.BatchFile>
       <command>cd %SUBST_DRIVE%