();
+ warningLinePrefixes.add("atof may have failed for "); //$NON-NLS-1$
+
+ if (checkForLineBeginnings(line, warningLinePrefixes.toArray(new String[warningLinePrefixes.size()]))) {
+ errorParserManager.generateMarker(null, -1, line, IMarkerGenerator.SEVERITY_WARNING, null);
+ return true;
+ }
// check for MBM build failure. This string is part of the help text spewed out
// for an invalid command line. Same in Symbian 7.0s and 9.2, so assumed static.
if (line.indexOf("epocmbm [-h headerfile]") >= 0) { //$NON-NLS-1$
errorParserManager.generateMarker(null, -1,
- "epocmbm build failed (perhaps due to an empty image list or invalid color format specification): please check the Console",
+ "epocmbm build failed (perhaps due to an empty image list or invalid color format specification): please check the Console", //$NON-NLS-1$
IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
return true;
}
@@ -163,7 +107,7 @@
if (!setFileNameAndLineNumber(line) && !setDetailsFromCppOutput(line)) {
return false;
}
- String[] extensionsToExclude = {".pkg", ".def", ".defi"}; //$NON-NLS-1$ //$NON-NLS-2$
+ String[] extensionsToExclude = {".pkg", ".def", ".defi", ".asm", ".c" ,".c++", ".cc", ".cia", ".cpp", ".cxx", "h", ".hh", ".hpp", ".hxx", ".s"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$
if (hasExcludedExtension(extensionsToExclude)) {
return false;
}
@@ -208,7 +152,7 @@
// Remove the warning.
msgDescription = msgDescription.substring("warning".length()).trim(); //$NON-NLS-1$
msgSeverity = IMarkerGenerator.SEVERITY_WARNING;
- } else if (msgDescription.matches("(?i)error.*")) {
+ } else if (msgDescription.matches("(?i)error.*")) { //$NON-NLS-1$
// Remove the error.
msgDescription = msgDescription.substring("error".length()).trim(); //$NON-NLS-1$
}
diff -r 37df159d7f81 -r c937102a5510 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java Sat Apr 25 12:50:39 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java Sat Apr 25 12:54:10 2009 -0500
@@ -39,6 +39,7 @@
// e.g. "no source": Error: #5: cannot open source input file "\CarbideB18_workspace\BlackFlag\group\SRC\dbg_debug_menu.cpp": No such file or directory
if (aLine.contains("No such file or directory")){
aErrorParserManager.generateMarker(aErrorParserManager.getProject(), 0, aLine, IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
+ return true;
}
diff -r 37df159d7f81 -r c937102a5510 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/ArgumentsTabComposite.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/ArgumentsTabComposite.java Sat Apr 25 12:50:39 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/ArgumentsTabComposite.java Sat Apr 25 12:54:10 2009 -0500
@@ -25,9 +25,9 @@
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
+import com.nokia.carbide.cdt.builder.BuildArgumentsInfo;
import com.nokia.carbide.cdt.builder.project.IBuildArgumentsInfo;
import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
-import com.nokia.carbide.cdt.internal.builder.BuildArgumentsInfo;
import com.nokia.carbide.cdt.internal.builder.CarbideBuildConfiguration;
import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
diff -r 37df159d7f81 -r c937102a5510 builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ABLDCommandHandler.java
diff -r 37df159d7f81 -r c937102a5510 builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java Sat Apr 25 12:50:39 2009 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java Sat Apr 25 12:54:10 2009 -0500
@@ -27,6 +27,7 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -177,7 +178,9 @@
for (final ICarbideBuildConfiguration currConfig : buildConfigList) {
launcher.setErrorParserManager(cpi.getINFWorkingDirectory(), CarbideCPPBuilder.getParserIdArray(currConfig.getErrorParserId()));
-
+ if (monitor.isCanceled()) {
+ return new Status(IStatus.CANCEL, "Carbide.c++ builder utils plugin", IStatus.CANCEL, "Build Cancelled", null);
+ }
// kick off a build for each configuration...
CarbideCPPBuilder.invokeBuild(currConfig, launcher, subMonitor.newChild(1), false);
diff -r 37df159d7f81 -r c937102a5510 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/gettingStarted/background.htm
--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/gettingStarted/background.htm Sat Apr 25 12:50:39 2009 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/gettingStarted/background.htm Sat Apr 25 12:54:10 2009 -0500
@@ -12,7 +12,7 @@
Carbide.c++ is built on the Eclipse platform. The Eclipse components used are:
- Eclipse 3.4
-- A slightly modified version of CDT 5.0.0
+- A slightly modified version of CDT 5.0.1
- EMF 2.4.1
- GEF 3.4.1
diff -r 37df159d7f81 -r c937102a5510 carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/gettingStarted/env_setup.htm
--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/gettingStarted/env_setup.htm Sat Apr 25 12:50:39 2009 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/gettingStarted/env_setup.htm Sat Apr 25 12:54:10 2009 -0500
@@ -16,26 +16,25 @@
This section will describe how to set up a basic Eclipse development environment
to develop a plugin against the Carbide.c++ development environment.
-Download the Eclipse 3.4 SDK
-Carbide.c++ is developed against the Eclipse 3.4 release build. You can download the build
-here. Carbide.c++ is only tested and supported on the Windows platform.
-You can extract the Eclipse platform anywhere you like.
-NOTE When you launch eclipse, choose a workspace location without spaces. This will help to prevent build issues later on with Symbian SDKs.
-Set-up the Target Platform
+Download the Carbide.c++ Development Kit (CDK)
+Carbide.c++ is developed against the Eclipse 3.4 release build which includes the Java Development Tools (JDT) and Plug-in Development Environment (PDE). You will need these items as well as the Carbide.c++/CDT source code to develop Eclipse/Carbide.c++ plug-ins. If you want to install the CDK you will need to run the Software Updates under the Help menu to update your installation to include the CDK.
+For more information on running the Software Updater please see the page Updating Carbide.c++.
+Importing source projects
-Once you have your Eclipse environment extracted and launched, you can set up your Target Platform to have your fresh installation reference all the Carbide.c++/CDT/Eclipse plugins.
-The Eclipse Target Platform feature allows you to compile and run against a different Eclipse installation than the
-one you're using for development. In this case you'll be targeting the Carbide.c++ installation. The Target Platform is a workspace-wide setting, so you may want to dedicate a separate workspace for your Carbide.c++ plugin development.
-
+Once you have your Carbide environment updated to include the CDK, you can create new Eclipse plug-in projects and debug the Carbide.c++ sources. How to create eclipse plug-ins is beyond the scope of this demonstration. If you want to debug any of the Carbide.c++ or Ecilpse platform source follow these steps to verify your CDK isntallation:
- - Choose Window > Preferences > Plug-in Development > Target Platform.
- - Browse for the Location of your Carbide.c++ installation. This is the location that contains the Carbide.c++.exe and plugins folder. When you have chosen the new location eclipse will load the plugins found in Carbide.c++ installation you will work against. Your Target Platform preference should look something like this:
-
- 
- - Select OK.
+ - Switch to the Plug-in Development perspective.
+ - Select the Plug-ins view.
+ - Select the binary plug-in you want view the source of. Don't select the *source feature.
+ - Right-click on the plug-in you want to import and select Import As > Source Project. For example, the com.nokia.carbide.cpp.leavescan plug-in as shown below.
+
+ 
+ - Now you can return to the Package Explorer view and navigate the source files for the imported plug-in. It should look like a normal plug-in project:
+
+ 
+
+ You can now create a launch configuration and debug Carbide.
-You are now ready to import or create new projects into your Eclipse workspace.
-