# HG changeset patch
# User timkelly
# Date 1251399325 18000
# Node ID 5dbf7a006edfb7c341920fdf8bd06f3879040b72
# Parent  b729d175bf7f217973a1b47581b165186dabc57c
fix bug 9690, GCCErrorParser missing some errors from WINSCW builds

diff -r b729d175bf7f -r 5dbf7a006edf builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.input.txt
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.input.txt	Thu Aug 27 12:01:13 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.input.txt	Thu Aug 27 13:55:25 2009 -0500
@@ -8,4 +8,8 @@
 /runtime-EclipseApplication/GUIFooey/src/guifooeyappui.cpp:39: error: invalid function declaration
 /runtime-EclipseApplication/GUIFooey/src/guifooeyappui.cpp:39: error: expected unqualified-id before ':' token
 /runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h:34: error: candidate is: virtual void CGUIFooeyAppUi::ConstructL()
-/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h:49: warning: unused variable 'j'
\ No newline at end of file
+/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h:49: warning: unused variable 'j'
+..\src\lalaApplication.cpp:26: ';' expected
+..\src\lalaApplication.cpp:26: expression syntax error
+..\src\lalaApplication.cpp:33: ';' expected
+..\src\lalaApplication.cpp:34: expression syntax error
diff -r b729d175bf7f -r 5dbf7a006edf builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.regression.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.regression.xml	Thu Aug 27 12:01:13 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.regression.xml	Thu Aug 27 13:55:25 2009 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
- <!--Error Marker at index 0-->
+  <!--Error Marker at index 0-->
   <marker_info file="^EMPTY^" line_number="0" message="No such file or directory" severity="2" variable_name="^EMPTY^" external_path_string="test/test.cpp:" />
   <!--Error Marker at index 1-->
   <marker_info file="^EMPTY^" line_number="0" message="no input files" severity="2" variable_name="^EMPTY^" external_path_string="^EMPTY^" />
@@ -22,4 +22,13 @@
   <marker_info file="^EMPTY^" line_number="34" message="candidate is: virtual void CGUIFooeyAppUi::ConstructL()" severity="2" variable_name="^EMPTY^" external_path_string="/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h" />
   <!--Error Marker at index 10-->
   <marker_info file="^EMPTY^" line_number="49" message="unused variable 'j'" severity="1" variable_name="^EMPTY^" external_path_string="/runtime-EclipseApplication/GUIFooey/inc/GUIFooeyAppUi.h" />
+  <!--Error Marker at index 11-->
+  <marker_info file="^EMPTY^" line_number="26" message="';' expected" severity="2" variable_name="^EMPTY^" external_path_string="../src/lalaApplication.cpp" />
+  <!--Error Marker at index 12-->
+  <marker_info file="^EMPTY^" line_number="26" message="expression syntax error" severity="2" variable_name="^EMPTY^" external_path_string="../src/lalaApplication.cpp" />
+  <!--Error Marker at index 13-->
+  <marker_info file="^EMPTY^" line_number="33" message="';' expected" severity="2" variable_name="^EMPTY^" external_path_string="../src/lalaApplication.cpp" />
+  <!--Error Marker at index 14-->
+  <marker_info file="^EMPTY^" line_number="34" message="expression syntax error" severity="2" variable_name="^EMPTY^" external_path_string="../src/lalaApplication.cpp" />
 </root>
+
diff -r b729d175bf7f -r 5dbf7a006edf builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/makmake.errors.regression.1.xml
--- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/makmake.errors.regression.1.xml	Thu Aug 27 12:01:13 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/makmake.errors.regression.1.xml	Thu Aug 27 13:55:25 2009 -0500
@@ -14,5 +14,7 @@
   <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>
 
diff -r b729d175bf7f -r 5dbf7a006edf 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 Aug 27 12:01:13 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml	Thu Aug 27 13:55:25 2009 -0500
@@ -14,5 +14,7 @@
   <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>
 
diff -r b729d175bf7f -r 5dbf7a006edf 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 Aug 27 12:01:13 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/ErrorParserRegressionGenerator.java	Thu Aug 27 13:55:25 2009 -0500
@@ -44,7 +44,7 @@
 
 	private static final String PROJECT_NAME = "TestErrorParser";
 	// Platform matters, set this before you build
-	private static final String PLATFORM_STRING = ISymbianBuildContext.EMULATOR_PLATFORM;
+	private static final String PLATFORM_STRING = ISymbianBuildContext.GCCE_PLATFORM;
 
 	CarbideErrorParserTestHarness harness;
 	private IProject project;
diff -r b729d175bf7f -r 5dbf7a006edf core/com.nokia.carbide.cpp/plugin.xml
--- a/core/com.nokia.carbide.cpp/plugin.xml	Thu Aug 27 12:01:13 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Thu Aug 27 13:55:25 2009 -0500
@@ -66,13 +66,13 @@
 		<!-- Splash screen attributes -->
 		<property 
 			name="startupProgressRect" 
-			value="0,245,469,22" /> 
+			value="0,244,469,21" /> 
 		<property 
 			name="startupForegroundColor" 
 			value="777777" />
 		<property 
 			name="startupMessageRect" 
-			value="12,180,441,15" /> 
+			value="12,190,441,15" /> 
 	</product> 
 
    </extension>