# HG changeset patch # User fturovic # Date 1265227801 21600 # Node ID 067c6d73417138e0f4e3c2c69393932a65ccd5a7 # Parent 0d2baa78c988db846a39a50f90192ce73539511d# Parent 3419376b791a51a60940f2c9f71c32a8b14371c4 daily merge diff -r 0d2baa78c988 -r 067c6d734171 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 Wed Feb 03 14:09:26 2010 -0600 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/RVCTCompilerErrorParser.java Wed Feb 03 14:10:01 2010 -0600 @@ -37,7 +37,7 @@ // check for other errors that don't have a common pattern // 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")){ + if (aLine.contains("No such file or directory") && !aLine.contains(" line ")){ aErrorParserManager.generateMarker(aErrorParserManager.getProject(), 0, aLine, IMarkerGenerator.SEVERITY_ERROR_BUILD, null); return true; } diff -r 0d2baa78c988 -r 067c6d734171 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java Wed Feb 03 14:09:26 2010 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java Wed Feb 03 14:10:01 2010 -0600 @@ -89,6 +89,9 @@ } private void checkPrerequisites() { + if (WorkbenchUtils.isJUnitRunning()) + return; + final Map agentToStatusMap = new HashMap(); diff -r 0d2baa78c988 -r 067c6d734171 core/carbide_releases/run.jstack.bat --- a/core/carbide_releases/run.jstack.bat Wed Feb 03 14:09:26 2010 -0600 +++ b/core/carbide_releases/run.jstack.bat Wed Feb 03 14:10:01 2010 -0600 @@ -1,6 +1,6 @@ echo off -rem This is a utility batch file to get stack information from the Carbide.c++.2.4.exe process. +rem This is a utility batch file to get stack information from the Carbide.c++.2.5.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%. @@ -18,18 +18,18 @@ del %OUTFILE% -rem echo Carbide.c++.2.4.exe > %outfile% +rem echo Carbide.c++.2.5.exe > %outfile% echo echo Searching for Carbide.c++ process... -FOR /F "tokens=2" %%i IN ('tasklist /FI "IMAGENAME eq Carbide.c++.2.4.exe" +FOR /F "tokens=2" %%i IN ('tasklist /FI "IMAGENAME eq Carbide.c++.2.5.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.4.exe running? +if not exist %OUTFILE% echo ERROR: Results not written. Is Carbide.c++.2.5.exe running? :END diff -r 0d2baa78c988 -r 067c6d734171 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/DynamicFeatureInstaller.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/DynamicFeatureInstaller.java Wed Feb 03 14:09:26 2010 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/DynamicFeatureInstaller.java Wed Feb 03 14:10:01 2010 -0600 @@ -93,13 +93,13 @@ // Having a manifest does not require that you actually install anything. So errors should not be thrown. // You simply should not run the dynamic installer if the SDK has nothing to install. if (!featureDirectory.isDirectory()) { - //throw new FileNotFoundException(featureDirectory + " is not a directory."); + throw new FileNotFoundException(featureDirectory + " is not a directory."); } if (!(new File(featureDirectory, "features").isDirectory())) { - //throw new FileNotFoundException(featureDirectory + " does not contain \"features\" directory."); + throw new FileNotFoundException(featureDirectory + " does not contain \"features\" directory."); } if (!(new File(featureDirectory, "plugins").isDirectory())) { - //throw new FileNotFoundException(featureDirectory + " does not contain \"plugins\" directory."); + throw new FileNotFoundException(featureDirectory + " does not contain \"plugins\" directory."); } } @@ -113,7 +113,7 @@ * the installation progress as a Progress Bar to the user. * Can be null. */ - public DynamicFeatureInstaller(URL featureDirectoryURL, IProgressMonitor progressMonitor) { + private DynamicFeatureInstaller(URL featureDirectoryURL, IProgressMonitor progressMonitor) { this.featureURL = featureDirectoryURL; this.progressMonitor = progressMonitor; } diff -r 0d2baa78c988 -r 067c6d734171 core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java --- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Wed Feb 03 14:09:26 2010 -0600 +++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Wed Feb 03 14:10:01 2010 -0600 @@ -17,7 +17,6 @@ package com.nokia.carbide.cpp.internal.sdk.ui; import com.nokia.carbide.cpp.internal.sdk.core.model.DynamicFeatureInstaller; -import com.nokia.carbide.cpp.internal.sdk.core.model.InstallationFailureException; import com.nokia.carbide.cpp.sdk.core.ISymbianSDK; import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin; import com.nokia.carbide.cpp.sdk.ui.SDKUIPlugin; @@ -31,14 +30,12 @@ import org.eclipse.ui.IWorkbenchWindow; import java.io.File; -import java.io.FileNotFoundException; -import java.net.MalformedURLException; import java.util.List; @SuppressWarnings("restriction") public class NewPluginChecker { - private static final String SDK_FEATURE_SUBDIR = "epoc32/kit/feature"; //$NON-NLS-1$ + private static final String SDK_FEATURE_SUBDIR = "epoc32/kit"; //$NON-NLS-1$ public static void checkForNewlyInstalledPlugins(final IWorkbench workbench){ final List sdkList = SDKCorePlugin.getSDKManager().getSDKList(); @@ -49,28 +46,23 @@ boolean oneSDKWasScanned = false; for (ISymbianSDK sdk : sdkList) { - if (sdk.isPreviouslyScanned() == false){ + if (sdk.isPreviouslyScanned() == false) { oneSDKWasScanned = true; // XML was parsed, now try to run the feature installer + sdk.setPreviouslyScanned(true); + try { - sdk.setPreviouslyScanned(true); - String eclipsePluginsPath = sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR; - DynamicFeatureInstaller installer = new DynamicFeatureInstaller(new File(eclipsePluginsPath), null); + DynamicFeatureInstaller installer = new DynamicFeatureInstaller(new File(sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR), null); if (installer.install()) { installed = true; } - // Boog 8383: We should fail silently, since this will not break anything and may SDKs will not have any documentation - // Otherwise, these errors will be logged every time this check is done (workspace is opened) - // Originally, this was used to install MBS build support, but now is only used for SDK documentation - } catch (MalformedURLException e) { - // ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e)); - } catch (FileNotFoundException e) { - // ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e)); - } catch (InstallationFailureException e) { + } catch (Exception e) { + // Boog 8383: We should fail silently, since this will not break anything and may SDKs will not have any documentation + // Otherwise, these errors will be logged every time this check is done (workspace is opened) + // Originally, this was used to install MBS build support, but now is only used for SDK documentation // ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e)); } } - } if (oneSDKWasScanned) {