# HG changeset patch
# User timkelly
# Date 1270754261 18000
# Node ID bb47b3646d60e7865acccd314ed4fc4ed2c84c65
# Parent  a47f09a34a78e183d0333ffcdb0e7f8d8e67a63d# Parent  09a65e9def081d11da480cdbe65003bf508de744
merge commit

diff -r 09a65e9def08 -r bb47b3646d60 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/3053.rvct.regression.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/3053.rvct.regression.xml	Thu Apr 08 14:07:17 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/3053.rvct.regression.xml	Thu Apr 08 14:17:41 2010 -0500
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
   <!--Error Marker at index 0-->
+  <marker_info file="^EMPTY^" line_number="0" message="C3492W: Site License not found, falling back to normal license" severity="1" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
+  <!--Error Marker at index 1-->
   <marker_info file="^EMPTY^" line_number="0" message="Error: C3397E: Cannot obtain license for Compiler (feature compiler) with" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
 </root>
 
diff -r 09a65e9def08 -r bb47b3646d60 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml	Thu Apr 08 14:07:17 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml	Thu Apr 08 14:17:41 2010 -0500
@@ -1,20 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<root>
-  <!--Error Marker at index 0-->
-  <marker_info file="^EMPTY^" line_number="2" message="Unrecognised Keyword &quot;TARGE&quot;[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="1" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
-  <!--Error Marker at index 1-->
-  <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Target specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
-  <!--Error Marker at index 2-->
-  <marker_info file="^EMPTY^" line_number="11" message="SOURCEPATH &quot;\APPS\Nokia\DDB21Nightly\workspace\ListBox\datx\&quot; not found[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="1" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
-  <!--Error Marker at index 3-->
-  <marker_info file="^EMPTY^" line_number="6" message="Stack size doesn't fit expected number format[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="3" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
-  <!--Error Marker at index 4-->
-  <marker_info file="^EMPTY^" line_number="42" message="BITMAP color depth &quot;listboxlistbox.cpp&quot; - unexpected format[\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP]" severity="3" variable_name="^EMPTY^" external_path_string="/APPS/Nokia/DDB21Nightly/workspace/ListBox/group/LISTBOX.MMP" />
-  <!--Error Marker at index 5-->
-  <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Sources specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
-  <!--Error Marker at index 6-->
-  <marker_info file="^EMPTY^" line_number="-1" message="ERROR: No Sources specified" severity="3" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
-  <!--Error Marker at index 7-->
-  <marker_info file="^EMPTY^" line_number="23" message="#error test" severity="2" variable_name="^EMPTY^" external_path_string="C:/runtime-EclipseApplication/GUIFooey/group/BLD.INF" />
-</root>
+<root />
 
diff -r 09a65e9def08 -r bb47b3646d60 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/your.input.errorparser.txt
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/your.input.errorparser.txt	Thu Apr 08 14:07:17 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/your.input.errorparser.txt	Thu Apr 08 14:17:41 2010 -0500
@@ -1,32 +1,20 @@
-MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
-Died at C:\Symbian\9.3\S60_3rd_FP2_Beta\epoc32\tools\/MMP.PM line 1814.
-make: *** [MAKEFILELISTBOX] Error 255
-perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
-WARNING: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(2) : Unrecognised Keyword "TARGE"
-
-FATAL ERROR: ERROR: No Target specified
-
-MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
-perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
-WARNING: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(11) : SOURCEPATH "\APPS\Nokia\DDB21Nightly\workspace\ListBox\datx\" not found
+make[1]: Leaving directory `C:/Symbian/9.1/S60_3rd_MR/S60Ex/AddressBook/group'
+  make -r  -f
+"\Symbian\9.1\S60_3rd_MR\EPOC32\BUILD\Symbian\9.1\S60_3rd_MR\S60Ex\AddressBook\group\ARMV5.make"
+TARGET CFG=UDEB
+Warning: C3492W: Site License not found, falling back to normal license
+ARM/Thumb C/C++ Compiler, RVCT2.2 [Build 593]
+Error: C3397E: Cannot obtain license for Compiler (feature compiler) with
+license version >= 2.2: 
+The desired vendor daemon is down
+ 1) Check the lmgrd log file, or 2) Try lmreread
+Feature:       compiler
+Vendor:Host:   asqarun1.americas.nokia.com
+License path:  7166@asqarun1.americas.nokia.com
+FLEXlm error:  -97,121
+For further information, refer to the FLEXlm End User Manual,
+available at "www.macrovision.com".
 
-MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
-Died at C:\Symbian\9.3\S60_3rd_FP2_Beta\epoc32\tools\/MMP.PM line 1814.
-make: *** [MAKEFILELISTBOX] Error 255
-perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
-FATAL ERROR: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(6) : Stack size doesn't fit expected number format
-
-MMPFILE "\APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP"
-Died at C:\Symbian\9.3\S60_3rd_FP2_Beta\epoc32\tools\/MMP.PM line 1814.
-make: *** [MAKEFILELISTBOX] Error 255
-perl -S makmake.pl -nd -D \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX ARMV5  
-FATAL ERROR: \APPS\Nokia\DDB21Nightly\workspace\ListBox\group\LISTBOX.MMP(42) : BITMAP color depth "listboxlistbox.cpp" - unexpected format
-
-FATAL ERROR: ERROR: No Sources specified
-
-FATAL ERROR: ERROR: No Sources specified
-
-C:\runtime-EclipseApplication\GUIFooey\group\BLD.INF:23: #error test
-BLDMAKE ERROR: ERROR: cpp.exe returned non-zero exit status (8448)
-	cpp.EXE -undef -nostdinc -+  -I "C:\S60\devices\S60_5th_Edition_SDK_v1.0\epoc32\include" -I . -I "C:\runtime-EclipseApplication\GUIFooey\group\"  -I "C:\S60\devices\S60_5th_Edition_SDK_v1.0\EPOC32\include\variant" -include "C:\S60\devices\S60_5th_Edition_SDK_v1.0\EPOC32\include\variant\Symbian_OS.hrh" "C:\runtime-EclipseApplication\GUIFooey\group\BLD.INF"
-
+make[1]: ***
+[..\..\..\EPOC32\BUILD\Symbian\9.1\S60_3rd_MR\S60Ex\AddressBook\group\ADDRESSBOOK\ARMV5\UDEB\AddressBookApp.o]
+Error 1
diff -r 09a65e9def08 -r bb47b3646d60 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java	Thu Apr 08 14:07:17 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java	Thu Apr 08 14:17:41 2010 -0500
@@ -45,7 +45,7 @@
 	private static final String PROJECT_NAME = "TestErrorParser";
 
 	// Platform matters, set this before you build
-	private static final String PLATFORM_STRING = ISymbianBuildContext.GCCE_PLATFORM;
+	private static final String PLATFORM_STRING = ISymbianBuildContext.ARMV5_PLATFORM;
 
 	CarbideErrorParserTestHarness harness;
 	private IProject project;
diff -r 09a65e9def08 -r bb47b3646d60 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Thu Apr 08 14:07:17 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/sharedui/BuilderSelectionComposite.java	Thu Apr 08 14:17:41 2010 -0500
@@ -79,6 +79,7 @@
 				if (!SBSv2Utils.enableSBSv1Support()) {
 					status = new Status(Status.ERROR, ProjectUIPlugin.PLUGIN_ID, "SBSv1 is not supported on this system.");
 				}
+				useSBSv2Builder = false;
 			}
 			else if (builderCombo.getSelectionIndex() == 1) {