# HG changeset patch
# User timkelly
# Date 1258489038 21600
# Node ID 87c4919642a3a4c003e4f8a0868bb7bca7b9f996
# Parent  0c45a379d3544d5ce57bf1b533af79d55ebd0534
merge bug 9052 from default

diff -r 0c45a379d354 -r 87c4919642a3 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	Fri Nov 13 17:46:06 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java	Tue Nov 17 14:17:18 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 0c45a379d354 -r 87c4919642a3 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	Fri Nov 13 17:46:06 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/sis/baseName.pkg	Tue Nov 17 14:17:18 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 0c45a379d354 -r 87c4919642a3 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	Fri Nov 13 17:46:06 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/sis/baseName.pkg	Tue Nov 17 14:17:18 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"