# HG changeset patch # User timkelly # Date 1250201567 18000 # Node ID a29cb5e793d3c444f9d31e09b42610e7cffb820f # Parent 1137da10d4e52ccd53349190d3d90686614a0eca fixed GCCE error parser & tests to work with CDT 6.0 changes. diff -r 1137da10d4e5 -r a29cb5e793d3 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 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.input.txt Thu Aug 13 17:12:47 2009 -0500 @@ -2,3 +2,10 @@ arm-none-symbianelf-g++: no input files arm-none-symbianelf-g++: warning: `-x c++' after last input file has no effect arm-none-symbianelf-g++: error: some message +foo.cc:11:20: error: value with length 0 violates the length restriction: length (1 .. infinity) +foo.cc:11:20: error: value with length 0 violates the length restriction +/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/eikmenup.h:242: warning: enumeral mismatch in conditional expression: `TFalse' vs `TTrue' +/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 diff -r 1137da10d4e5 -r a29cb5e793d3 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 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/abstractgcce.regression.xml Thu Aug 13 17:12:47 2009 -0500 @@ -1,12 +1,25 @@ - - + + + + + + + + + + + + + + + + - diff -r 1137da10d4e5 -r a29cb5e793d3 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/2969.gcce.regression.xml --- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/2969.gcce.regression.xml Thu Aug 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/2969.gcce.regression.xml Thu Aug 13 17:12:47 2009 -0500 @@ -3,7 +3,7 @@ - + - + diff -r 1137da10d4e5 -r a29cb5e793d3 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/4541.gcce.regression.xml --- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/4541.gcce.regression.xml Thu Aug 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/4541.gcce.regression.xml Thu Aug 13 17:12:47 2009 -0500 @@ -1,6 +1,6 @@ - + diff -r 1137da10d4e5 -r a29cb5e793d3 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/5824.gcce.regression.xml --- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/5824.gcce.regression.xml Thu Aug 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/5824.gcce.regression.xml Thu Aug 13 17:12:47 2009 -0500 @@ -1,25 +1,25 @@ - + - + - + - + diff -r 1137da10d4e5 -r a29cb5e793d3 builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/6417.gcce.regression.xml --- a/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/6417.gcce.regression.xml Thu Aug 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/bugzilla/6417.gcce.regression.xml Thu Aug 13 17:12:47 2009 -0500 @@ -1,165 +1,165 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -169,69 +169,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff -r 1137da10d4e5 -r a29cb5e793d3 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 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/regression.capture.xml Thu Aug 13 17:12:47 2009 -0500 @@ -1,20 +1,26 @@ - - + + - + - + - + - + - + - + - + + + + + + + diff -r 1137da10d4e5 -r a29cb5e793d3 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 Aug 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/data/errorpatterns/regression_capture/your.input.errorparser.txt Thu Aug 13 17:12:47 2009 -0500 @@ -1,32 +1,11 @@ -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 - -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" - +arm-none-symbianelf-g++: \test\test.cpp: No such file or directory +arm-none-symbianelf-g++: no input files +arm-none-symbianelf-g++: warning: `-x c++' after last input file has no effect +arm-none-symbianelf-g++: error: some message +foo.cc:11:20: error: value with length 0 violates the length restriction: length (1 .. infinity) +foo.cc:11:20: error: value with length 0 violates the length restriction +/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/eikmenup.h:242: warning: enumeral mismatch in conditional expression: `TFalse' vs `TTrue' +/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 diff -r 1137da10d4e5 -r a29cb5e793d3 builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/CarbideErrorParserTestHarness.java --- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/CarbideErrorParserTestHarness.java Thu Aug 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/CarbideErrorParserTestHarness.java Thu Aug 13 17:12:47 2009 -0500 @@ -222,7 +222,7 @@ } if (result.description.equals(expected.description) == false) { if (expected.description.equals(EMPTY) == false) { - Assert.fail("Message from IDE marker is null, expected value is " + expected.description); + Assert.fail("Unexpected message: EXPECTED value is: " + expected.description + ", ACTUAL: " + result.description); } } else { if (result.description.equals(expected.description) == false) { diff -r 1137da10d4e5 -r a29cb5e793d3 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/AbstractGCCEErrorParser.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/AbstractGCCEErrorParser.java Thu Aug 13 14:56:19 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/AbstractGCCEErrorParser.java Thu Aug 13 17:12:47 2009 -0500 @@ -19,12 +19,11 @@ package com.nokia.carbide.cdt.internal.builder.error.parsers; import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.eclipse.cdt.core.ErrorParserManager; import org.eclipse.cdt.core.IMarkerGenerator; -import org.eclipse.cdt.internal.errorparsers.AbstractErrorParser; -import org.eclipse.cdt.internal.errorparsers.ErrorPattern; +import org.eclipse.cdt.core.errorparsers.AbstractErrorParser; +import org.eclipse.cdt.core.errorparsers.ErrorPattern; /* * AbstractErrorParser/ErrorPattern are going to public API in CDT 5.1 diff -r 1137da10d4e5 -r a29cb5e793d3 core/carbide_releases/run.jstack.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/carbide_releases/run.jstack.bat Thu Aug 13 17:12:47 2009 -0500 @@ -0,0 +1,37 @@ +echo off + +rem This is a utility batch file to get stack information from the Carbide.c++.2.2.exe process. +rem In order to run it successfully, you will need to have a full JDK installed of version 1.6 or higher. +rem See http://java.sun.com/javase/downloads/index.jsp for download information. +rem If the Carbide process is found (and only one should be running) then stack information will be found in %OUTFILE%. + + +echo Executing jstack on Carbide.c++.exe... + +set JSTACK=c:\APPS\Java\jdk1.6.0_14\bin\jstack.exe +set OUTFILE=.\stack.txt + +if not exist %JSTACK% echo ERROR: jstack.exe cannot be found in %JSTACK%. jstack is provided under JDK 1.6 and higher, but is not distributed with Carbide. Please find the location of jstack and update the JSTACK variable in this batch file. + +if not exist %JSTACK% GOTO END + + +del %OUTFILE% + +rem echo Carbide.c++.2.2.exe > %outfile% + +echo +echo Searching for Carbide.c++ process... + +FOR /F "tokens=2" %%i IN ('tasklist /FI "IMAGENAME eq Carbide.c++.2.2.exe" +/NH') DO @%JSTACK% %%i > %OUTFILE% + + +echo +if exist %OUTFILE% echo Check for results in %OUTFILE% +if not exist %OUTFILE% echo ERROR: Results not written. Is Carbide.c++.2.2.exe running? + +:END + +pause +