core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/processes/CheckS60CustKitSupport.java
equal
deleted
inserted
replaced
40 private static final String SELECTED_BUILD_CONFIGS_VALUE_KEY = "selectedBuildConfigs"; //$NON-NLS-1$ |
40 private static final String SELECTED_BUILD_CONFIGS_VALUE_KEY = "selectedBuildConfigs"; //$NON-NLS-1$ |
41 // copied from ProjectCreatedTasks (YUCK) |
41 // copied from ProjectCreatedTasks (YUCK) |
42 private static final String SBSV2_BUILDER_ATTRIBUTE = "useSBSv2Builder"; //$NON-NLS-1$ |
42 private static final String SBSV2_BUILDER_ATTRIBUTE = "useSBSv2Builder"; //$NON-NLS-1$ |
43 |
43 |
44 private static final String S60_50_BUILD_MACROS = "S60_50_CustomBuildIncludes"; |
44 private static final String S60_50_BUILD_MACROS = "S60_50_CustomBuildIncludes"; |
|
45 private static final String EXPLICIT_EPOC32_SYSTEM_INCLUDE = "EPOC32SystemInclude"; |
45 |
46 |
46 private static final String S60_INC_MACROS = "#include <data_caging_paths.hrh>\n#include <domain/osextensions/platform_paths.hrh>\nMW_LAYER_SYSTEMINCLUDE"; |
47 private static final String S60_INC_MACROS = "#include <data_caging_paths.hrh>\n#include <domain/osextensions/platform_paths.hrh>\nMW_LAYER_SYSTEMINCLUDE"; |
47 private static final String S60_MIDDWARE_INC = "epoc32/include/middleware"; |
48 private static final String S60_MIDDWARE_INC = "epoc32/include/middleware"; |
48 |
49 |
49 private static final String S60_MIDDWARE_INC2 = "epoc32/include/mw"; |
50 private static final String S60_MIDDWARE_INC2 = "epoc32/include/mw"; |
77 super.process(template, parameters, monitor); |
78 super.process(template, parameters, monitor); |
78 |
79 |
79 String includesValue = ""; |
80 String includesValue = ""; |
80 includesValue = createCustKitIncludes(template); |
81 includesValue = createCustKitIncludes(template); |
81 template.getTemplateValues().put(S60_50_BUILD_MACROS, includesValue); |
82 template.getTemplateValues().put(S60_50_BUILD_MACROS, includesValue); |
82 |
83 |
|
84 String explicitEpoc32Include = ""; |
|
85 if (!includesValue.contains(APP_LAYER_SYSTEM_INCLUDES)){ |
|
86 explicitEpoc32Include = "SYSTEMINCLUDE /epoc32/include"; |
|
87 } |
|
88 template.getTemplateValues().put(EXPLICIT_EPOC32_SYSTEM_INCLUDE, explicitEpoc32Include); //$NON-NLS-1$ |
|
89 |
83 String helpCompiler = findHelpCompiler(template); |
90 String helpCompiler = findHelpCompiler(template); |
84 String enableHelpString = ""; |
91 String enableHelpString = ""; |
85 String enableHelpSISString = ""; |
92 String enableHelpSISString = ""; |
86 String helpSupportString = ""; |
93 String helpSupportString = ""; |
87 if (helpCompiler != null) { |
94 if (helpCompiler != null) { |