# HG changeset patch # User Ed Swartz # Date 1285086938 18000 # Node ID 588b26a6b387ddcf824d321d98842b1f4768c349 # Parent 8a7ea8bb2e31e34169129a5a80883cce02265594# Parent efbf4aa05426ef330e41f14e48d387297e23ad9a Merge commit diff -r 8a7ea8bb2e31 -r 588b26a6b387 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Tue Sep 21 11:35:22 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Tue Sep 21 11:35:38 2010 -0500 @@ -476,11 +476,7 @@ args.add(cpi.getAbsoluteBldInfPath().toOSString()); args.add("-c"); //$NON-NLS-1$ IPath componentPath = null; - if (sbsArgs.size() >= 2){ - componentPath = new Path(sbsArgs.get(sbsArgs.indexOf("-p")+ 1)); - sbsArgs.remove(1); - sbsArgs.add(componentPath.lastSegment()); - } + String configName = getConfigName(buildConfig, componentPath); if (isTest) { diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.doc.user/html/qt_help/images/qt_dlg_add_version.png Binary file core/com.nokia.carbide.cpp.doc.user/html/qt_help/images/qt_dlg_add_version.png has changed diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.doc.user/html/qt_help/images/qt_dlg_edit_version.png Binary file core/com.nokia.carbide.cpp.doc.user/html/qt_help/images/qt_dlg_edit_version.png has changed diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.doc.user/html/qt_help/images/qt_pref_panel.png Binary file core/com.nokia.carbide.cpp.doc.user/html/qt_help/images/qt_pref_panel.png has changed diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_pref_panel.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_pref_panel.htm Tue Sep 21 11:35:22 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_pref_panel.htm Tue Sep 21 11:35:38 2010 -0500 @@ -10,7 +10,7 @@

Qt Preference Panel

The Qt preference panel provides global settings for Qt-based projects. Use it to add, edit, remove, and assign the default Qt version for projects.

Figure 1. Qt preference panel

The following commands appear on the toolbar within the Qt preference panel:

@@ -25,13 +25,13 @@ diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_carbide_portal.png Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_carbide_portal.png has changed diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm Tue Sep 21 11:35:22 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm Tue Sep 21 11:35:38 2010 -0500 @@ -10,37 +10,80 @@

Carbide.c++ Portal view

The Carbide.c++ Portal view provides a single point of information on Carbide news, new releases, additional extensions, and support. The Carbide.c++ Portal view is shown by clicking Help > Carbide.c++ Portal.

Figure 1. Install Extensions page in the Carbide Portal view

Click on the (Show Overview) icon to show an information popup with additional information on the selected plug-in.

Figure 1. Customize page in the Carbide.c++ Portal view

If the Show Installed option is checkmarked, the list only shows the extensions currently installed. To show more information on a specific extension click the (Show Overview) icon (Figure 2).

Figure 2. Install Extensions Plug-in Information popup

Install Extensions page options

Table 1 Install Actions options

Figure 2. Extension information popup

Install section

The Install section provides options for installing additional Carbide extensions.

Table 1. Install options

Add...

Click Add to open the Add new Qt version dialog where you can specify a Qt SDK by name and location.

Figure 2. Add new Qt version dialog

Edit...

Click Edit to open the Edit Qt Version dialog where you can modify the Qt SDK information for the selected Qt version.

Figure 3. Edit Qt Version dialog

+ + + + - + - + - - + + + +

Item	Explanation
Install...	Installs only the checked items in the extension list.
Refresh	Refreshes the plug-in list.
Check All Items	Select all	Marks all extensions for installation.
Uncheck All Items	Deselect all	Unchecks all extensions to prevent installation.
Installed Checked Items	Installs only the checked items in the extension list.	Advanced install...	Launches the Install New Software wizard.

Migrate section

The Migrate section provides options for saving or restoring the custom settings.

Table 2. Migrate options

+ + + + + + + + - - + + + +

Item	Explanation
Export...	Click to export the current feature configuration.
Advanced Install...	Launches the Install New Software wizard.	Import...	Click to import a saved feature configuration settings file.

Settings section

The Settings section provides access to several common ways to customize the Carbide program.

Table 3. Settings options

+ + + + + + + + + + + + + + + + + + + +

Item	Explanation
Capabilities	Click to open the Capabilities preference panel where you can control which product components.
Code Style	Click to open the Code Style preference panel to customize the C/C++ editor appearance and behavior.
Key Bindings	Click to open the Keys preference panel to customize program key bindings.
Proxies	Click to open the Network Connections preference panel to change proxy settings.

Related references

diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml --- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Sep 21 11:35:22 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Sep 21 11:35:38 2010 -0500 @@ -284,7 +284,6 @@ - diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2QueryUtils.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2QueryUtils.java Tue Sep 21 11:35:22 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/sbsv2/SBSv2QueryUtils.java Tue Sep 21 11:35:38 2010 -0500 @@ -143,18 +143,25 @@ } @SuppressWarnings("unchecked") + /** + * Adds build config info for a single Raptor build config in an SDK. If the config exists in the map it + * will be overwritten + */ public static void storeConfigQueryDataForSDK(ISymbianSDK sdk, String alias, SBSv2ConfigQueryData configQueryData) { Map configsMap = SDKCacheUtils.getCache().getCachedData(CONFIG_CACHE_KEY, Map.class, 0); String key = (new SBSv2SDKKey(sdk)).toString() + "[" + alias + "]"; if (configsMap == null) { configsMap = new HashMap(); - } else { - if (configsMap.get(key) != null) { - // configQueryData already exist in cache - return; - } } + // Always add the config, b/c if there's an erro in the config we want to be able to update it + // when the IDE rescans at startup checking for Raptor config errors that were saved to the cache +// else { +// if (configsMap.get(key) != null) { +// // configQueryData already exist in cache +// // return; +// } +// } configsMap.put(key, configQueryData); SDKCacheUtils.getCache().putCachedData(CONFIG_CACHE_KEY, (Serializable)configsMap, 0); diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Tue Sep 21 11:35:22 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SBSv2BuildInfo.java Tue Sep 21 11:35:38 2010 -0500 @@ -68,7 +68,7 @@ public List getAllBuildConfigurations() { // This really only applies to SBSv1. We never return the full list of configs for SBSv2, only the filtered ones - return sortContexts(sbsv2FilteredContexts); + return getFilteredBuildConfigurations(); } public void clearDataFromBuildCache(){ @@ -122,14 +122,11 @@ } } - - return sortContexts(sbsv2FilteredContexts); } private void initSBSv2BuildContextList(List allowedConfigs) throws SBSv2MinimumVersionException { List filteredAliasList = new ArrayList(); - for (String alias : aliasToMeaningMap.keySet()){ for (String checkedAlias : allowedConfigs){ if (checkedAlias.equalsIgnoreCase(alias)){ @@ -155,20 +152,28 @@ List processedAliasList = new ArrayList(); sbsv2FilteredContexts.clear(); + // First check if we have scanned configs already this IDE session. + // We don't want to scan broken configs over and over + boolean isStartUpScan = !((SymbianSDK)sdk).hasScannedRaptor(); + for (String alias : filteredAliasList) { SBSv2ConfigQueryData configQueryData = SBSv2QueryUtils.getConfigQueryDataForSDK(sdk, alias); - if (configQueryData != null && configQueryData.getConfigurationErrorMessage().trim().length() == 0) { - ISBSv2BuildContext sbsv2Context = new BuildContextSBSv2(sdk, alias, configQueryData); - sbsv2FilteredContexts.add(sbsv2Context); - processedAliasList.add(alias); + if (configQueryData != null) { + if (configQueryData.getConfigurationErrorMessage().trim().length() == 0 || isStartUpScan == false){ + ISBSv2BuildContext sbsv2Context = new BuildContextSBSv2(sdk, alias, configQueryData); + sbsv2FilteredContexts.add(sbsv2Context); + processedAliasList.add(alias); + } } } if (!processedAliasList.isEmpty()) { - filteredAliasList.removeAll(processedAliasList); + filteredAliasList.removeAll(processedAliasList); // Get the configs that had errors } if (!filteredAliasList.isEmpty()) { + // These configs have no data or had errors in them reported by Raptor + String configQueryXML = SBSv2QueryUtils.getConfigQueryXMLforSDK(sdk, filteredAliasList); for (String alias : filteredAliasList) { @@ -189,6 +194,11 @@ } checkWINSCWSupport(); + if (!((SymbianSDK)sdk).hasScannedRaptor()){ + ((SymbianSDK)sdk).setScannedRaptor(true); + SBSv2QueryUtils.flushAllSBSv2Caches(); + } + } private void checkWINSCWSupport() { diff -r 8a7ea8bb2e31 -r 588b26a6b387 core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java --- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Tue Sep 21 11:35:22 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java Tue Sep 21 11:35:38 2010 -0500 @@ -78,6 +78,8 @@ private Map prefixFileMap = new HashMap(); private Set