--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/reference/api_Change_Notes.htm Fri Jun 12 11:01:33 2009 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/reference/api_Change_Notes.htm Fri Jun 12 11:04:45 2009 -0500
@@ -83,6 +83,11 @@
</ul>
</li>
</ul>
+
+ <li>Added <em> com.nokia.carbide.cpp.sdk.core.ISymbianSDK#setPreviouslyScanned( boolean )</em>.</li>
+ <li>Added <em> com.nokia.carbide.cpp.sdk.core.ISymbianSDK#isPreviouslyScanned( )</em>.</li>
+
+
</ul>
<h3>Deprecated APIs</h3>
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java Fri Jun 12 11:01:33 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java Fri Jun 12 11:04:45 2009 -0500
@@ -62,6 +62,7 @@
private static final String SDK_CACHE_OS_VERSION_ATTRIB = "osVersion";
private static final String SDK_CACHE_OS_BRANCH_ATTRIB = "osBranch";
private static final String SDK_CACHE_SDK_VERSION_ATTRIB = "sdkVersion";
+ private static final String SDK_SCANNED_FOR_PLUGINS = "sdkScanned";
private static final String EMPTY_STRING = "";
private static boolean enableBSFScanner;
@@ -420,9 +421,21 @@
if (sdkVersionItem != null)
sdkVersion = sdkVersionItem.getNodeValue();
+ // get whether or not this SDK has been scanned
+ String wasScanned = "false";
+ Node sdkScannedItem = attribs.getNamedItem(SDK_SCANNED_FOR_PLUGINS);
+ if (sdkScannedItem != null)
+ wasScanned = sdkScannedItem.getNodeValue();
+
ISymbianSDK sdk = getSDK(id, false);
if (sdk != null){
+ if (wasScanned.equalsIgnoreCase("true")){
+ sdk.setPreviouslyScanned(true);
+ } else {
+ sdk.setPreviouslyScanned(false);
+ }
+
if (sdkEnabled.equalsIgnoreCase("true")){
sdk.setEnabled(true);
} else {
@@ -506,6 +519,14 @@
}
attribs.setNamedItem(enabledNode);
+ Node wasScannedNode = d.createAttribute(SDK_SCANNED_FOR_PLUGINS);
+ if (true == currSDK.isPreviouslyScanned()) {
+ wasScannedNode.setNodeValue("true");
+ } else {
+ wasScannedNode.setNodeValue("false");
+ }
+ attribs.setNamedItem(wasScannedNode);
+
Node osVerNode = d.createAttribute(SDK_CACHE_OS_VERSION_ATTRIB);
osVerNode.setNodeValue(currSDK.getOSVersion().toString());
attribs.setNamedItem(osVerNode);
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Fri Jun 12 11:01:33 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Fri Jun 12 11:04:45 2009 -0500
@@ -72,6 +72,7 @@
protected DeviceType deviceEntry = null;
private boolean enabled = true;
+ private boolean wasScanned = false;
private Version osVersion;
private Version sdkVersion;
private String sdkOSBranch;
@@ -1223,5 +1224,13 @@
}
return sbvCatalog;
}
+
+ public void setPreviouslyScanned(boolean wasScanned) {
+ this.wasScanned = wasScanned;
+ }
+
+ public boolean isPreviouslyScanned() {
+ return wasScanned;
+ }
}
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java Fri Jun 12 11:01:33 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianSDK.java Fri Jun 12 11:04:45 2009 -0500
@@ -366,4 +366,17 @@
* Get the Symbian Binary Variation (SBV) catalog for the SDK.
*/
ISBVCatalog getSBVCatalog();
+
+ /**
+ * Tells whether or not the plug-in installer has sniffed this SDK for eclipse plug-ins to install.
+ * @return true if the SDK was scanned.
+ */
+ boolean isPreviouslyScanned();
+
+ /**
+ * Set flag to tell whether or not the SDK was scanned for eclipse plugins to install.
+ * @param wasScanned was the SDK scanned for plugins?
+ */
+ void setPreviouslyScanned(boolean wasScanned);
+
}
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Fri Jun 12 11:01:33 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/NewPluginChecker.java Fri Jun 12 11:04:45 2009 -0500
@@ -46,28 +46,41 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
boolean installed = false;
+ boolean oneSDKWasScanned = false;
for (ISymbianSDK sdk : sdkList) {
- // XML was parsed, now try to run the feature installer
- try {
- String eclipsePluginsPath = sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR;
- DynamicFeatureInstaller installer = new DynamicFeatureInstaller(new File(eclipsePluginsPath), null);
- if (installer.install()) {
- installed = true;
+
+ if (sdk.isPreviouslyScanned() == false){
+ oneSDKWasScanned = true;
+ // XML was parsed, now try to run the feature installer
+ try {
+ sdk.setPreviouslyScanned(true);
+ String eclipsePluginsPath = sdk.getEPOCROOT() + SDK_FEATURE_SUBDIR;
+ DynamicFeatureInstaller installer = new DynamicFeatureInstaller(new File(eclipsePluginsPath), 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) {
+ // ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", 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
- } 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) {
-// ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.PLUGIN_ID, IStatus.ERROR, "Unable to install plug-ins dynamically.", e));
}
+
+ }
+
+ if (oneSDKWasScanned) {
+ SDKCorePlugin.getSDKManager().updateCarbideSDKCache();
}
if (installed) {
+ // plugins from some SDK were installed
doEclipseRestartDialog(workbench);
}
+
return Status.OK_STATUS;
}
};
--- a/core/com.nokia.carbide.templatewizard.symbian.tests/src/com/nokia/carbide/templatewizard/symbian/tests/TestSymbianSDK.java Fri Jun 12 11:01:33 2009 -0500
+++ b/core/com.nokia.carbide.templatewizard.symbian.tests/src/com/nokia/carbide/templatewizard/symbian/tests/TestSymbianSDK.java Fri Jun 12 11:04:45 2009 -0500
@@ -228,6 +228,14 @@
public ISBVCatalog getSBVCatalog() {
return null;
}
+ public boolean isPreviouslyScanned() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+ public void setPreviouslyScanned(boolean wasScanned) {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Fri Jun 12 11:01:33 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java Fri Jun 12 11:04:45 2009 -0500
@@ -722,10 +722,6 @@
setInstallationTab(configuration, project);
}
- if (settingsGroup.equals(LaunchConfig_SysTRK)) {
- setFileTransferTab(configuration, project);
- }
-
if (settingsGroup.equals(LaunchConfig_Trace32) ||
settingsGroup.equals(LaunchConfig_SophiaSTI))
{
@@ -737,6 +733,7 @@
if (settingsGroup.equals(LaunchConfig_AppTRK) || settingsGroup.equals(LaunchConfig_SysTRK)) {
setTrkMainTab(configuration, project);
setTrkDebuggerTab(configuration, project);
+ setFileTransferTab(configuration, project);
// TRK Debugging: specify TRK protocol plugin.
//
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java Fri Jun 12 11:01:33 2009 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java Fri Jun 12 11:04:45 2009 -0500
@@ -271,20 +271,27 @@
programName = AbstractCLaunchDelegate.getProgramName(configuration);
} catch (CoreException e) {
}
- boolean resetProgramName = true;
- // check to see if the current program name is one of the executables to target
- for (ExeFileToDebug exeFileToDebug : executablesToTarget) {
- if (exeFileToDebug.getExePath().equalsIgnoreCase(programName)) {
- resetProgramName = false;
- break;
+
+ // only do this when the current program name is not empty. if it is, we'll be changing it
+ // which causes the apply button to become enabled which is not expected behavior. this will
+ // be called later if/when they do specify the main program, so we'll make sure then that it's
+ // actually being targeted.
+ if (programName.length() > 0) {
+ boolean resetProgramName = true;
+ // check to see if the current program name is one of the executables to target
+ for (ExeFileToDebug exeFileToDebug : executablesToTarget) {
+ if (exeFileToDebug.getExePath().equalsIgnoreCase(programName)) {
+ resetProgramName = false;
+ break;
+ }
}
- }
- if (resetProgramName) {
- // ensure one of the enabled files to target is set as the program name
- for (ExeFileToDebug exeFileToDebug : executablesToTarget) {
- if (exeFileToDebug.getEnabled()) {
- configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, exeFileToDebug.getExePath());
- break;
+ if (resetProgramName) {
+ // ensure one of the enabled files to target is set as the program name
+ for (ExeFileToDebug exeFileToDebug : executablesToTarget) {
+ if (exeFileToDebug.getEnabled()) {
+ configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME, exeFileToDebug.getExePath());
+ break;
+ }
}
}
}