# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1259860514 21600
# Node ID 31201e26500f443ceaf0253d3afc32d9a515baac
# Parent  7fc87e3b88bdf4a2e961f12d789d006d16e03f97# Parent  82ff57b1eb805ea47677396d791de6eea70dd42c
daily merge

diff -r 7fc87e3b88bd -r 31201e26500f core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Tue Dec 01 11:52:18 2009 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Thu Dec 03 11:15:14 2009 -0600
@@ -1,3 +1,4 @@
+<<<<<<< local
 <?xml version="1.0" encoding="utf-8" ?>
 
 <introContent>
@@ -59,4 +60,67 @@
        	</group>
 
   	</extensionContent>
+=======
+<?xml version="1.0" encoding="utf-8" ?>
+
+<introContent>
+  	<extensionContent 
+		  id="com.nokia.carbide.cpp.doc.user-whatsnew" 
+		  style="carbide.css" 
+		  alt-style="carbide.properties" 
+		  name="Carbide.c++ Release Notes" 
+		  path="whatsnew/@">
+		  
+		<group style-id="content-group" id="carbide-cpp">
+       		<link 
+       		label="Carbide.c++ Release Notes (2.4)" 
+       		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>Learn about what's new in Carbide.c++ for Symbian OS developers.</text>
+       		</link>
+       	</group>
+		  
+		<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#210" 
+       		id="carbide-link" 
+       		style-id="content-link">
+          	<text>Carbide performance improvements in 2.1 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.sysdoc.hover/resources/help%20context/dl_hover/html/getting_started.html" 
+       		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" 
+       		style-id="content-link">
+          	<text>Create remote connection settings and update Carbide software services on devices.</text>
+       		</link>
+       	</group>
+
+  	</extensionContent>
+>>>>>>> other
 </introContent>
\ No newline at end of file
diff -r 7fc87e3b88bd -r 31201e26500f core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Tue Dec 01 11:52:18 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Thu Dec 03 11:15:14 2009 -0600
@@ -46,7 +46,9 @@
 	private static final String S60_INC_MACROS_SF = "#include <platform_paths.hrh>\n#include <data_caging_paths.hrh>\nAPP_LAYER_SYSTEMINCLUDE";
 
 	private static final String BUILD_HELP_PREFIX = "buildHelpPrefix";
+	private static final String BUILD_HELP_SIS_PREFIX = "buildHelpSISPrefix"; 
 	private static final String DISABLE_HELP_STRING = "//";
+	private static final String DISABLE_HELP_PKG = ";"; 
 	private static final String HELP_COMPILER = "epoc32/tools/cshlpcmp.bat";
 	private static final String HELP_SUPPORT_MACRO = "helpSupport";
 	private static final String HELP_SUPPORT_STRING = "MACRO _HELP_AVAILABLE_";
@@ -64,13 +66,16 @@
 		boolean hasHelp = isHelpCompilerAvailable(template);
 		String enableHelpString = "";
 		String helpSupportString = "";
+		String enableHelpSISString = ""; 
 		if (hasHelp) {
 			helpSupportString = HELP_SUPPORT_STRING;
 		}
 		else {
 			enableHelpString = DISABLE_HELP_STRING;
+			enableHelpSISString = DISABLE_HELP_PKG; 
 		}
 		template.getTemplateValues().put(BUILD_HELP_PREFIX, enableHelpString);
+		template.getTemplateValues().put(BUILD_HELP_SIS_PREFIX, enableHelpSISString); 
 		template.getTemplateValues().put(HELP_SUPPORT_MACRO, helpSupportString);
 	}
 
diff -r 7fc87e3b88bd -r 31201e26500f templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/sis/baseName.pkg
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/sis/baseName.pkg	Tue Dec 01 11:52:18 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/sis/baseName.pkg	Thu Dec 03 11:15:14 2009 -0600
@@ -28,7 +28,7 @@
 "$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).rsc"		-"!:\resource\apps\$(baseName)_$(uid3).rsc"
 "$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_$(uid3)_reg.rsc"	-"!:\private\10003a3f\import\apps\$(baseName)_$(uid3)_reg.rsc"
 "$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).mif" -"!:\resource\apps\$(baseName)_$(uid3).mif"
-"..\$(helpDir)\$(baseName)_$(uid3).hlp"							 -"!:\resource\help\$(baseName)_$(uid3).hlp"
+$(buildHelpSISPrefix)"..\$(helpDir)\$(baseName)_$(uid3).hlp"							 -"!:\resource\help\$(baseName)_$(uid3).hlp"
 
 ; Add any installation notes if applicable
 ;"$(baseName).txt"		-"!:\private\$(uid3-WITHOUT_0X)\$(baseName).txt"
diff -r 7fc87e3b88bd -r 31201e26500f templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg	Tue Dec 01 11:52:18 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg	Thu Dec 03 11:15:14 2009 -0600
@@ -28,7 +28,7 @@
 "$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).rsc"		-"!:\resource\apps\$(baseName)_$(uid3).rsc"
 "$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\$(baseName)_$(uid3)_reg.rsc"	-"!:\private\10003a3f\import\apps\$(baseName)_$(uid3)_reg.rsc"
 "$(EPOCROOT)Epoc32\data\z\resource\apps\$(baseName)_$(uid3).mif" -"!:\resource\apps\$(baseName)_$(uid3).mif"
-"..\$(helpDir)\$(baseName)_$(uid3).hlp"							 -"!:\resource\help\$(baseName)_$(uid3).hlp"
+$(buildHelpSISPrefix)"..\$(helpDir)\$(baseName)_$(uid3).hlp"							 -"!:\resource\help\$(baseName)_$(uid3).hlp"
 
 ; Add any installation notes if applicable
 ;"$(baseName).txt"		-"!:\private\$(uid3-WITHOUT_0X)\$(baseName).txt"