--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Mon Jun 22 15:40:21 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Mon Jun 22 15:42:52 2009 -0500
@@ -571,7 +571,7 @@
String buildTarget = buildConfig.getPlatformString().toLowerCase() + "_" + buildConfig.getTargetString().toLowerCase();
- String[] sbsArgs = new String[] {"--source-target=\"" + file.toOSString() + "\"", COMPILE_ARG, buildTarget, COMPONENT_ARG, fullMMPPath.toFile().getName()};
+ String[] sbsArgs = new String[] {"--source-target=" + file.toOSString(), COMPILE_ARG, buildTarget, COMPONENT_ARG, fullMMPPath.toFile().getName()};
launcher.setErrorParserManager(buildConfig.getCarbideProject().getINFWorkingDirectory(), buildConfig.getErrorParserList());
int retVal = launcher.executeCommand(SBS_BAT, sbsArgs, getResolvedEnvVars(buildConfig), workingDirectory);
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java Mon Jun 22 15:40:21 2009 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/BuilderUtilsPropertyTester.java Mon Jun 22 15:42:52 2009 -0500
@@ -63,7 +63,7 @@
// disable for SBSv2 projects for now. see
// http://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=7659 for details.
if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(file.getProject())) {
- return false;
+ return true;
}
}
return true;
--- a/core/carbide_releases/readme/readme_sdks.html Mon Jun 22 15:40:21 2009 -0500
+++ b/core/carbide_releases/readme/readme_sdks.html Mon Jun 22 15:42:52 2009 -0500
@@ -15,7 +15,7 @@
<h2>You're not done installing just yet... </h2>
<p>Release: 2.1.0<br>
- Revised: April 2009</p>
+ Revised: June 2009</p>
<p>Read the <b>Release Notes</b> and <b>Bug Fixes</b> for the latest infomation about this product. In Carbide.c++ simply click the <b>Help > Help Contents > Carbide.c++ User Guide</b> to find the pages.</p>
<p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span> install the following: </p>
<table width="80%" border="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Mon Jun 22 15:40:21 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Mon Jun 22 15:42:52 2009 -0500
@@ -45,7 +45,7 @@
<li><b>Executables View Refreshing</b> - The Executables view refresh was impacting everything from IDE start-up to import and project creation as well refreshes during rebuilds. Some of our wall clock tests on large projects (such as contacts the browser) show the executables job running from 15-25 seconds down to about 5 seconds.</li>
</ul>
</li>
- <li><b>New Launch Configuration improvements</b> - The <b>New Launch Configuration</b> wizard now starts with a new <b>Category Selection</b> page which helps guide developers in choosing the correct launch configuration for a project, whether it be for Phones, Boards, or other target devices. In addition, the <span class="fix">??</span> page enables developers to define if a project is automatically built or not at the launch configuration level.</li>
+ <li><b>New Launch Configuration improvements</b> - The <b>New Launch Configuration</b> wizard now starts with a new <a href="projects/launch/wiz_new_launch_config.htm#CATEGORY">Category Selection</a> page which helps guide developers in choosing the correct launch configuration for a project, whether it be for Phones, Boards, or other target devices. In addition, the Build Options Selection page enables developers to define if a project is automatically built or not at the launch configuration level.</li>
<li><b>Customization (.bsf) and Symbian Variant Binary (.var) platform</b> discovery is now supported. See the Platform Filtering Preference panel for details.</li>
<li><b>Keywords in preference panels</b> - All Carbide related preference panels now include keywords to make searching for options a bit easier.</li>
<li><b>New Carbide Extensions section</b> - Project Property dialogs now include a <b>Carbide Extensions</b> section which allows Carbide plug-in and utilities a place to add their own project settings.</li>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Mon Jun 22 15:40:21 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml Mon Jun 22 15:42:52 2009 -0500
@@ -10,7 +10,7 @@
<group style-id="content-group" id="carbide-cpp">
<link
- label="Carbide.c++ Release Notes"
+ label="Carbide.c++ Release Notes (2.1)"
url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm"
id="carbide-link"
style-id="content-link">
@@ -20,6 +20,36 @@
<group style-id="content-group" id="carbide-cpp">
<link
+ label="Performance Improvements (2.1)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm"
+ id="carbide-link"
+ style-id="content-link">
+ <text>Carbide performance improvements for large project importing, building, and other critical areas.</text>
+ </link>
+ </group>
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
+ label="Hover Help (2.0.4)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm"
+ id="carbide-link"
+ style-id="content-link">
+ <text>See Symbian API Reference information appear when you hover over a Symbian symbol in C/C++ editors.</text>
+ </link>
+ </group>
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
+ label="Carbide.c++ News Reader (2.0.3)"
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm"
+ id="carbide-link"
+ style-id="content-link">
+ <text>Provides updates on the latest Carbide, Symbian, and S60 news.</text>
+ </link>
+ </group>
+
+ <group style-id="content-group" id="carbide-cpp">
+ <link
label="On-Device Connection (2.0)"
url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm"
id="carbide-link"
--- a/core/com.nokia.carbide.cpp/html/intro/overviewExtensionContent.xml Mon Jun 22 15:40:21 2009 -0500
+++ b/core/com.nokia.carbide.cpp/html/intro/overviewExtensionContent.xml Mon Jun 22 15:42:52 2009 -0500
@@ -12,7 +12,7 @@
<link label="Carbide.c++ Welcome message"
url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp/html/welcome_note.htm"
id="carbide"
- style-id="overview-links">
+ style-id="content-link">
<text>Welcome message to Carbide.c++ developers</text>
</link>
</group>
--- a/core/com.nokia.carbide.cpp/intro/css/overview/overview.css Mon Jun 22 15:40:21 2009 -0500
+++ b/core/com.nokia.carbide.cpp/intro/css/overview/overview.css Mon Jun 22 15:42:52 2009 -0500
@@ -101,7 +101,10 @@
#overview-links a > .link-label { width : 700px; }
#overview-links a p > .text { width : 700px; }
-#overview-links a:hover { border-right : 5px; }
+/* #overview-links a:hover { border-right : 5px; } */
+#overview-links a:hover {
+ background-image : url(../graphics/contentpage/page-link-wide.gif);
+}
a#basics img { background-image : url(../graphics/icons/obj48/wbbasics_obj.gif); }
a#basics:hover img { background-image : url(../graphics/icons/obj48/wbbasicshov_obj.gif); }
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/page-link-wide.gif has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/etool/migrate48sel.gif has changed
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/root.css Mon Jun 22 15:40:21 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/root.css Mon Jun 22 15:42:52 2009 -0500
@@ -22,7 +22,7 @@
#page-links a .link-label, #action-links a .link-label {
font-size : 13pt;
font-weight : 600;
- color : #0A94D6;
+ color : #EEEEEE;
}
#page-links a p .text, #action-links a p .text {
font-size : 13pt;
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css Mon Jun 22 15:40:21 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css Mon Jun 22 15:42:52 2009 -0500
@@ -396,7 +396,7 @@
float : none;
clear : both;
text-align : left;
- color: #03c;
+ color: #0A94D6;
/* Carbide branding mod
margin-bottom : 0px;
/* background-image : url(../graphics/contentpage/page-link-wide.gif); */
@@ -405,6 +405,7 @@
*/
}
+
.categoryContentnav {
font-size: 9pt;
font-weight: bold;
@@ -417,7 +418,11 @@
color: #00507C;
}
-.content-link:hover { border-right : 0px; }
+/* .content-link:hover { border-right : 0px; } */
+.content-link:hover {
+ background-image : url(../graphics/contentpage/page-link-wide.gif);
+}
+
iframe {
position:relative;
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css Mon Jun 22 15:40:21 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/standby.css Mon Jun 22 15:42:52 2009 -0500
@@ -50,7 +50,7 @@
/* background-image : url(../graphics/root/background.jpg); */
background-repeat : no-repeat;
background-position : top left;
- background-color : #7169D1;
+ /* background-color : #7169D1; */
}
.page {
--- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestBldInfImportDataLoader.java Mon Jun 22 15:40:21 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestBldInfImportDataLoader.java Mon Jun 22 15:42:52 2009 -0500
@@ -110,7 +110,7 @@
BldInfImportWrapper infWrapper = new BldInfImportWrapper(projectName, rootDirPath, infPath,
componentsList, makMakRefList, buildConfigs);
- infWrapper.createProjectFromBldInf();
+ infWrapper.createProjectFromBldInf(false);
IProject project = infWrapper.getProject();
assertNotNull(project);
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/utils/BldInfImportWrapper.java Mon Jun 22 15:40:21 2009 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/utils/BldInfImportWrapper.java Mon Jun 22 15:42:52 2009 -0500
@@ -28,6 +28,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
+import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
import com.nokia.carbide.cdt.builder.EpocEngineHelper;
import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
@@ -77,7 +78,7 @@
/**
* Create a Carbide project from member variable data. This is basically the same code as from com.nokia.carbide.cpp.internal.project.ui.importWizards#performFinish()
*/
- public void createProjectFromBldInf(){
+ public void createProjectFromBldInf(final boolean isSBSv2){
final String projectRelativePath = bldInfFile.removeFirstSegments(rootDirectory.segmentCount()).setDevice(null).toOSString();
@@ -108,7 +109,12 @@
project = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
monitor.worked(1);
+
+ project.setSessionProperty(CarbideBuilderPlugin.SBSV2_PROJECT, isSBSv2);
+
// TODO pass PKG file path to postProjectCreatedActions, currently passing null
+
+
ProjectCorePlugin.postProjectCreatedActions(project, projectRelativePath, selectedConfigs, components, debugMMP, null, monitor);
if (monitor.isCanceled()) {
