) object;
+ return (ISymbianBuildContext[]) listOfBuildConfigs
+ .toArray(new ISymbianBuildContext[listOfBuildConfigs.size()]);
+ }
+ return new ISymbianBuildContext[0];
+ }
+
+ /**
+ * Check whether the help compiler is available, and what its name is.
+ * @param template
+ * @return
+ */
+ private String findHelpCompiler(ITemplate template) {
+ String[] helpCompilerNames;
+
+ if (HostOS.IS_WIN32) {
+ helpCompilerNames = new String[] { HELP_COMPILER_WIN32, HELP_COMPILER_PERL };
+ } else {
+ helpCompilerNames = new String[] { HELP_COMPILER_PERL };
+ }
+ for (ISymbianBuildContext symbianBuildContext : getBuildContexts(template)) {
+ ISymbianSDK sdk = symbianBuildContext.getSDK();
+ if (sdk != null) {
+ File tools = new File(sdk.getEPOCROOT(), "epoc32/tools");
+ for (String filename : helpCompilerNames) {
+ File contextHelpCompiler = new File(tools, filename);
if (contextHelpCompiler.exists()) {
- return true;
+ return contextHelpCompiler.getName();
}
}
}
}
- return false;
+ return null;
}
- @SuppressWarnings("unchecked")
/**
* Check the SDK version and certain includes to figure out which include macros to add.
* Starting with S60 5.0 CustKits (2007 WK 24), many source bases are using macros for include paths.
@@ -111,45 +135,39 @@
* values/logic here.
*/
private String createCustKitIncludes(ITemplate template){
- Object object = template.getTemplateValues().get(SELECTED_BUILD_CONFIGS_VALUE_KEY);
String S60_50_Macros_String = "";
- if (object instanceof List) {
- List listOfBuildConfigs = (List) object;
- for (Object obj : listOfBuildConfigs) {
- Check.checkContract(obj instanceof ISymbianBuildContext);
- ISymbianBuildContext symbianBuildContext = (ISymbianBuildContext)obj;
- ISymbianSDK sdk = symbianBuildContext.getSDK();
- if (sdk != null) {
- File middleWareInclude = new File(sdk.getEPOCROOT() + S60_MIDDWARE_INC);
-
- // NOTE: Here we need to check the SDK major version becuase
- // the 3.2 CustKit
- // has the middleware folder but doesn't use the new build
- // macros for include paths
- if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
- // add symbol as at least one build config is a CustKit
- S60_50_Macros_String = S60_INC_MACROS;
- break;
- }
-
- middleWareInclude = new File(sdk.getEPOCROOT() + S60_MIDDWARE_INC2);
- File sfoPath = new File(sdk.getEPOCROOT() + S60_SF_FOLDER);
- // check for middleware paths and /sf path (if SFO kit)
- if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists() && sfoPath.exists()) {
- // add symbol as at least one build config is a CustKit
- S60_50_Macros_String = S60_INC_MACROS_SF;
- break;
- }
-
- // try newer middleware paths moved to app layer includes
-
- if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
- // add symbol as at least one build config is a CustKit
- S60_50_Macros_String = S60_INC_MACROS2;
- break;
- }
+ for (ISymbianBuildContext symbianBuildContext : getBuildContexts(template)) {
+ ISymbianSDK sdk = symbianBuildContext.getSDK();
+ if (sdk != null) {
+ File middleWareInclude = new File(sdk.getEPOCROOT(), S60_MIDDWARE_INC);
+
+ // NOTE: Here we need to check the SDK major version becuase
+ // the 3.2 CustKit
+ // has the middleware folder but doesn't use the new build
+ // macros for include paths
+ if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
+ // add symbol as at least one build config is a CustKit
+ S60_50_Macros_String = S60_INC_MACROS;
+ break;
+ }
+
+ middleWareInclude = new File(sdk.getEPOCROOT(), S60_MIDDWARE_INC2);
+ File sfoPath = new File(sdk.getEPOCROOT(), S60_SF_FOLDER);
+ // check for middleware paths and /sf path (if SFO kit)
+ if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists() && sfoPath.exists()) {
+ // add symbol as at least one build config is a CustKit
+ S60_50_Macros_String = S60_INC_MACROS_SF;
+ break;
+ }
+
+ // try newer middleware paths moved to app layer includes
+
+ if (sdk.getSDKVersion().getMajor() >= 5 && middleWareInclude.exists()) {
+ // add symbol as at least one build config is a CustKit
+ S60_50_Macros_String = S60_INC_MACROS2;
+ break;
+ }
- }
}
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java Sun Dec 06 20:41:47 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/BuildPlatformFilterPage.java Sun Dec 06 20:47:07 2009 -0600
@@ -53,14 +53,16 @@
GridData tabFolderGridData = new GridData(SWT.FILL, SWT.FILL, true, true);
tabFolder.setLayoutData(tabFolderGridData);
- TabItem sbsv1TabItem = new TabItem(tabFolder, SWT.NONE);
- sbsv1TabItem.setText(Messages.getString("BuildPlatformFilterPage.SBSv1TabText")); //$NON-NLS-1$
- sbsv1TabItem.setToolTipText(Messages.getString("BuildPlatformFilterPage.SBSv1TabToolTip")); //$NON-NLS-1$
-
- sbsv1Tab = new SBSv1PlatformFilterComposite(tabFolder);
- sbsv1Tab.createControls();
- sbsv1TabItem.setControl(sbsv1Tab);
-
+ if (SBSv2Utils.enableSBSv1Support()) {
+ TabItem sbsv1TabItem = new TabItem(tabFolder, SWT.NONE);
+ sbsv1TabItem.setText(Messages.getString("BuildPlatformFilterPage.SBSv1TabText")); //$NON-NLS-1$
+ sbsv1TabItem.setToolTipText(Messages.getString("BuildPlatformFilterPage.SBSv1TabToolTip")); //$NON-NLS-1$
+
+ sbsv1Tab = new SBSv1PlatformFilterComposite(tabFolder);
+ sbsv1Tab.createControls();
+ sbsv1TabItem.setControl(sbsv1Tab);
+ }
+
if (SBSv2Utils.enableSBSv2Support()) {
TabItem sbsv2TabItem = new TabItem(tabFolder, SWT.NONE);
sbsv2TabItem.setText(Messages.getString("BuildPlatformFilterPage.SBSv2TabText")); //$NON-NLS-1$
@@ -81,7 +83,9 @@
}
public boolean performOk() {
- sbsv1Tab.performOk();
+ if (sbsv1Tab != null) {
+ sbsv1Tab.performOk();
+ }
if (sbsv2Tab != null) {
sbsv2Tab.performOk();
@@ -98,8 +102,12 @@
@Override
protected void performDefaults() {
- sbsv1Tab.setDefaults();
- sbsv2Tab.setDefaults();
+ if (sbsv1Tab != null) {
+ sbsv1Tab.setDefaults();
+ }
+ if (sbsv2Tab != null) {
+ sbsv2Tab.setDefaults();
+ }
super.performDefaults();
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties Sun Dec 06 20:41:47 2009 -0600
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/messages.properties Sun Dec 06 20:47:07 2009 -0600
@@ -118,8 +118,8 @@
BuildTargetsPage.BuildConfigsLabel=SDKs and Build Configurations
BuildTargetsPage.BuildConfigsToolTip=Select the build configurations to create for this project. You can add and remove these once the project has been created.
BuildTargetsPage.FilterText=Filter SDKs based on selected template
-BuildTargetsPage.NoMatchingSDKsError=There are no matching Symbian OS SDKs installed and enabled.
-BuildTargetsPage.NoSDKsError=There are no Symbian OS SDKs installed and enabled.
+BuildTargetsPage.NoMatchingSDKsError=There are no matching Symbian OS SDKs installed or enabled (check SDK Preferences and Platform Filtering preferences).
+BuildTargetsPage.NoSDKsError=There are no Symbian OS SDKs installed or enabled (check SDK Preferences and Platform Filtering preferences).
BuildTargetsPage.NoBuildConfigsSelectedError=Please select at least one build configuration.
BuildTargetsPage.DifferentDrivesError=There are known build problems when the bld.inf file and SDK are on different drives ({0})
BuildTargetsPage.NoDriveSpecWarning=You have chosen an SDK EPOCROOT without a drive specification. Building will work but other features such as the indexer and MMP editor may not fully function.
diff -r 1f0a706d24b2 -r 20fd716f8eaa core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/FileUtils.java
--- a/core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/FileUtils.java Sun Dec 06 20:41:47 2009 -0600
+++ b/core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/FileUtils.java Sun Dec 06 20:47:07 2009 -0600
@@ -297,7 +297,8 @@
* the workspace via links (very slow)
* @return new path (workspace-relative) or null if not resolvable to workspace
*/
- static public IPath convertToWorkspacePath(IPath cpath, boolean makeCanonical, boolean resolveLinks) {
+ @SuppressWarnings("deprecation")
+ static public IPath convertToWorkspacePath(IPath cpath, boolean makeCanonical, boolean resolveLinks) {
if (!Platform.isRunning() || cpath == null)
return null;
@@ -883,4 +884,83 @@
private static IStatus createErrorStatus(Exception e) {
return new Status(IStatus.ERROR, UtilsCorePlugin.ID, null, e);
}
+
+ /**
+ * Get the minimum timestamp resolution for a file in ms (based on heuristics for the OS).
+ * @param path path to file of interest, or null for worst case
+ * @return number of ms of resolution. E.g., 50 means only changes in 50ms increments are stored
+ */
+ public static long getMinimumFileTimestampResolution(IPath path) {
+ // VFAT on Win32 uses 2 second increments. Linux ext2/3 uses 1 second resolution,
+ // until ext4, where it becomes nanoseconds.
+ // Assume the worst format in all cases.
+ long res = HostOS.IS_WIN32 ? 2000 : 1000;
+ if (path != null) {
+ // todo
+ }
+ return res;
+ }
+
+ /**
+ * Locate the file on the filesystem which has the same path, but with
+ * only case sensitivity differences. This is only meaningful for fully
+ * case sensitive and case-preserving filesystems.
+ * @param path
+ * @return path pointing to existing file (possibly with different case in components) or
+ * original path if there is no match
+ */
+ public static IPath findMatchingPathCaseInsensitive(IPath path) {
+ // case is insensitive already
+ if (HostOS.IS_WIN32)
+ return path;
+
+ if (path == null || !path.isAbsolute() || path.toFile().exists())
+ return path;
+
+ StringBuilder builder = new StringBuilder();
+
+ if (path.getDevice() != null) {
+ builder.append(path.getDevice());
+ }
+
+ builder.append('/');
+
+ boolean failedLookup = false;
+
+ for (int seg = 0; seg < path.segmentCount(); seg++) {
+ final String segment = path.segment(seg);
+
+ final String[] matches = { segment };
+
+ if (!failedLookup) {
+ File dir = new File(builder.toString());
+ if (!new File(dir, matches[0]).exists()) {
+ // component has wrong case; find the first one matching case-insensitively
+ String[] names = dir.list(new FilenameFilter() {
+
+ public boolean accept(File dir, String name) {
+ if (name.equalsIgnoreCase(segment)) {
+ matches[0] = name;
+ return true;
+ }
+ return false;
+ }
+ });
+
+ if (names.length == 0) {
+ // no matches! the rest of the path won't match either
+ failedLookup = true;
+ }
+ }
+ }
+ builder.append(matches[0]);
+ builder.append('/');
+ }
+
+ if (!path.hasTrailingSeparator() && builder.length() > 0 && builder.charAt(builder.length() - 1) == '/') {
+ builder.setLength(builder.length() - 1);
+ }
+ return new Path(builder.toString());
+ }
+
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/HostOS.java
--- a/core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/HostOS.java Sun Dec 06 20:41:47 2009 -0600
+++ b/core/com.nokia.cpp.utils.core/src/com/nokia/cpp/internal/api/utils/core/HostOS.java Sun Dec 06 20:47:07 2009 -0600
@@ -30,10 +30,12 @@
public static boolean IS_WIN32 = File.separatorChar == '\\';
/** Is the host some Unix variant? */
public static boolean IS_UNIX = File.separatorChar == '/';
+ /** Executable file extension */
+ public static final String EXE_EXT = IS_WIN32 ? ".exe" : "";
/** The name of the PATH variable in the environment. Capitalized differently per OS. */
public static String PATH_VARIABLE_NAME = IS_WIN32 ? "Path" : "PATH";
-
+
/**
* Convert a variable constructed blindly for a Win32 environment into
* Unix-like syntax. This is typically used for PATH or lists
@@ -94,6 +96,21 @@
}
/**
+ * Create an IPath from a string which may be a Win32 path.
+ * (This won't work in Unix when using a Win32 path.)
+ * @param path
+ * @return converted string
+ */
+ public static IPath createPathFromString(String path) {
+ if (path == null) return null;
+ // handle Windows slashes and canonicalize
+ path = path.replaceAll("\\\\", "/");
+ return new Path(path);
+ }
+
+
+
+ /**
* Ensure that the executable name mentioned is canonical for the machine.
* This only affects Windows, currently, ensuring that an ".exe" is attached.
* @param executablePath
@@ -104,7 +121,7 @@
IPath executablePath = new Path(executable);
String ext = executablePath.getFileExtension();
if (ext == null) {
- executable += ".exe";
+ executable += EXE_EXT;
}
}
return executable;
@@ -156,6 +173,4 @@
return path;
}
-
-
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/DebuggerTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/DebuggerTab.java Sun Dec 06 20:41:47 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/DebuggerTab.java Sun Dec 06 20:47:07 2009 -0600
@@ -76,6 +76,7 @@
breakAtMain.setLayoutData(data);
breakAtMain.setFont(parent.getFont());
breakAtMain.setToolTipText(Messages.getString("DebuggerTab.7")); //$NON-NLS-1$
+ breakAtMain.setData(".uid", "DebuggerTab.breakAtMain"); //$NON-NLS-1$ //$NON-NLS-2$
breakAtMain.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
@@ -88,6 +89,7 @@
data.horizontalSpan = 1;
mainBreakSymbol.setLayoutData(data);
mainBreakSymbol.setToolTipText(Messages.getString("DebuggerTab.7")); //$NON-NLS-1$
+ mainBreakSymbol.setData(".uid", "DebuggerTab.mainBreakSymbol"); //$NON-NLS-1$ //$NON-NLS-2$
mainBreakSymbol.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
updateLaunchConfigurationDialog();
@@ -100,6 +102,7 @@
viewOutput.setLayoutData(data);
viewOutput.setFont(parent.getFont());
viewOutput.setToolTipText(Messages.getString("DebuggerTab.10")); //$NON-NLS-1$
+ viewOutput.setData(".uid", "DebuggerTab.viewOutput"); //$NON-NLS-1$ //$NON-NLS-2$
viewOutput.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
@@ -112,6 +115,7 @@
viewDebugTrace.setLayoutData(data);
viewDebugTrace.setFont(parent.getFont());
viewDebugTrace.setToolTipText(Messages.getString("DebuggerTab.17")); //$NON-NLS-1$
+ viewDebugTrace.setData(".uid", "DebuggerTab.viewDebugTrace"); //$NON-NLS-1$ //$NON-NLS-2$
viewDebugTrace.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
@@ -124,6 +128,7 @@
viewMessages.setLayoutData(data);
viewMessages.setFont(parent.getFont());
viewMessages.setToolTipText(Messages.getString("DebuggerTab.12")); //$NON-NLS-1$
+ viewMessages.setData(".uid", "DebuggerTab.viewMessages"); //$NON-NLS-1$ //$NON-NLS-2$
viewMessages.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
diff -r 1f0a706d24b2 -r 20fd716f8eaa debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java Sun Dec 06 20:41:47 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java Sun Dec 06 20:47:07 2009 -0600
@@ -109,13 +109,13 @@
gd.horizontalSpan = 2;
hostLabel.setLayoutData(gd);
hostLabel.setToolTipText(Messages.getString("EmulationMainTab.3")); //$NON-NLS-1$
- hostLabel.setData(".uid", "EmulationMainTab.hostLabel");
+ hostLabel.setData(".uid", "EmulationMainTab.hostLabel"); //$NON-NLS-1$ //$NON-NLS-2$
hostText = new Text(projComp, SWT.SINGLE | SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
hostText.setLayoutData(gd);
hostText.setToolTipText(Messages.getString("EmulationMainTab.3")); //$NON-NLS-1$
- hostText.setData(".uid", "EmulationMainTab.hostText");
+ hostText.setData(".uid", "EmulationMainTab.hostText"); //$NON-NLS-1$ //$NON-NLS-2$
hostText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent evt) {
@@ -124,7 +124,7 @@
});
hostBrowse = createPushButton(projComp, Messages.getString("EmulationMainTab.4"), null); //$NON-NLS-1$
- hostBrowse.setData(".uid", "EmulationMainTab.hostBrowse");
+ hostBrowse.setData(".uid", "EmulationMainTab.hostBrowse"); //$NON-NLS-1$ //$NON-NLS-2$
hostBrowse.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
diff -r 1f0a706d24b2 -r 20fd716f8eaa debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java Sun Dec 06 20:41:47 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java Sun Dec 06 20:47:07 2009 -0600
@@ -95,6 +95,7 @@
targetingRulesCombo.add(Messages.getString("ExecutablesTab.4")); //$NON-NLS-1$
}
targetingRulesCombo.setText(Messages.getString("ExecutablesTab.5")); //$NON-NLS-1$
+ targetingRulesCombo.setData(".uid", "ExecutablesTab.targetingRulesCombo"); //$NON-NLS-1$ //$NON-NLS-2$
final GridData gd_targetingRulesCombo = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
targetingRulesCombo.setLayoutData(gd_targetingRulesCombo);
targetingRulesCombo.addListener(SWT.Selection, new Listener() {
@@ -156,6 +157,7 @@
addButton = new Button(buttonComp, SWT.PUSH);
addButton.setText(Messages.getString("ExecutablesTab.6")); //$NON-NLS-1$
+ addButton.setData(".uid", "ExecutablesTab.addButton"); //$NON-NLS-1$ //$NON-NLS-2$
addButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
@@ -177,6 +179,7 @@
selectAllButton = new Button(buttonComp, SWT.PUSH);
selectAllButton.setText(Messages.getString("ExecutablesTab.9")); //$NON-NLS-1$
+ selectAllButton.setData(".uid", "ExecutablesTab.selectAllButton"); //$NON-NLS-1$ //$NON-NLS-2$
selectAllButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
executablesBlock.setAllChecked(true);
@@ -185,6 +188,7 @@
unselectAllButton = new Button(buttonComp, SWT.PUSH);
unselectAllButton.setText(Messages.getString("ExecutablesTab.10")); //$NON-NLS-1$
+ unselectAllButton.setData(".uid", "ExecutablesTab.unselectAllButton"); //$NON-NLS-1$ //$NON-NLS-2$
unselectAllButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
executablesBlock.setAllChecked(false);
diff -r 1f0a706d24b2 -r 20fd716f8eaa debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/InstallationTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/InstallationTab.java Sun Dec 06 20:41:47 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/InstallationTab.java Sun Dec 06 20:47:07 2009 -0600
@@ -119,11 +119,13 @@
data.horizontalSpan = 2;
hostLabel.setLayoutData(data);
hostLabel.setToolTipText(Messages.getString("InstallationTab.2")); //$NON-NLS-1$
+ hostLabel.setData(".uid", "InstallationTab.hostLabel"); //$NON-NLS-1$ //$NON-NLS-2$
hostPath = new Text(projComp, SWT.BORDER);
data = new GridData(GridData.FILL_HORIZONTAL);
hostPath.setLayoutData(data);
hostPath.setToolTipText(Messages.getString("InstallationTab.2")); //$NON-NLS-1$
+ hostPath.setData(".uid", "InstallationTab.hostPath"); //$NON-NLS-1$ //$NON-NLS-2$
hostPath.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
updatePULabel();
@@ -132,6 +134,7 @@
});
hostBrowse = createPushButton(projComp, Messages.getString("InstallationTab.3"), null); //$NON-NLS-1$
+ hostBrowse.setData(".uid", "InstallationTab.hostBrowse"); //$NON-NLS-1$ //$NON-NLS-2$
hostBrowse.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
@@ -156,11 +159,13 @@
data.horizontalSpan = 2;
targetLabel.setLayoutData(data);
targetLabel.setToolTipText(Messages.getString("InstallationTab.6")); //$NON-NLS-1$
+ targetLabel.setData(".uid", "InstallationTab.targetLabel"); //$NON-NLS-1$ //$NON-NLS-2$
targetPath = new Text(projComp, SWT.BORDER);
data = new GridData(GridData.FILL_HORIZONTAL);
targetPath.setLayoutData(data);
targetPath.setToolTipText(Messages.getString("InstallationTab.6")); //$NON-NLS-1$
+ targetPath.setData(".uid", "InstallationTab.targetPath"); //$NON-NLS-1$ //$NON-NLS-2$
targetPath.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
updateLaunchConfigurationDialog();
@@ -174,6 +179,7 @@
data.horizontalSpan = 2;
forceInstall.setLayoutData(data);
forceInstall.setToolTipText(Messages.getString("InstallationTab.8")); //$NON-NLS-1$
+ forceInstall.setData(".uid", "InstallationTab.forceInstall"); //$NON-NLS-1$ //$NON-NLS-2$
forceInstall.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
updateLaunchConfigurationDialog();
@@ -211,7 +217,7 @@
data.horizontalSpan = 1;
driveLabel.setLayoutData(data);
driveLabel.setToolTipText(Messages.getString("InstallationTab.12")); //$NON-NLS-1$
-
+ driveLabel.setData(".uid", "InstallationTab.driveLabel"); //$NON-NLS-1$ //$NON-NLS-2$
drive = new Combo(installerUIGroup.getGroup(), SWT.READ_ONLY);
for (int i=0; i getUsableBuildConfigs() {
for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()) {
List contexts = sdk.getUnfilteredBuildConfigurations();
- if (contexts.size() > 0)
- return contexts;
+ if (contexts.size() > 0) {
+ return contexts.subList(0, Math.min(contexts.size(), 8));
+ }
}
TestCase.fail("No installed SDKs provide build configurations");
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestBSFView.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestBSFView.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestBSFView.java Sun Dec 06 20:47:07 2009 -0600
@@ -52,7 +52,7 @@
}
public Collection getMacros() {
- return Collections.EMPTY_LIST ;
+ return Collections.emptyList() ;
}
public IViewParserConfiguration getViewParserConfiguration() {
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestModelProvider.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestModelProvider.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestModelProvider.java Sun Dec 06 20:47:07 2009 -0600
@@ -73,6 +73,7 @@
/* (non-Javadoc)
* @see com.nokia.carbide.cpp.epoc.engine.tests.BaseTest#setUp()
*/
+ @SuppressWarnings("unchecked")
@Override
protected void setUp() throws Exception {
super.setUp();
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestModelsAndViews.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestModelsAndViews.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestModelsAndViews.java Sun Dec 06 20:47:07 2009 -0600
@@ -28,7 +28,6 @@
import com.nokia.carbide.cpp.epoc.engine.preprocessor.IDefine;
import com.nokia.carbide.cpp.epoc.engine.preprocessor.IViewFilter;
import com.nokia.carbide.cpp.epoc.engine.tests.model.dummy.DummyModel;
-import com.nokia.carbide.cpp.epoc.engine.tests.model.dummy.IDummyModel;
import com.nokia.carbide.cpp.epoc.engine.tests.model.dummy.IDummyView;
import com.nokia.carbide.internal.api.cpp.epoc.engine.dom.IASTTranslationUnit;
import com.nokia.carbide.internal.cpp.epoc.engine.model.ViewASTBase;
@@ -67,7 +66,7 @@
}
public Collection getMacros() {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
public IViewParserConfiguration getViewParserConfiguration() {
@@ -148,7 +147,7 @@
assertEquals(model, view.getModel());
// ensure model knows
- IView[] views = model.getViews();
+ IView[] views = model.getViews();
assertEquals(1, views.length);
assertEquals(view, views[0]);
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestPKGView.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestPKGView.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestPKGView.java Sun Dec 06 20:47:07 2009 -0600
@@ -23,6 +23,7 @@
import com.nokia.carbide.cpp.epoc.engine.preprocessor.*;
import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.*;
import com.nokia.carbide.internal.cpp.epoc.engine.model.pkg.PKGView;
+import com.nokia.cpp.internal.api.utils.core.HostOS;
import com.nokia.cpp.internal.api.utils.core.Logging;
import org.eclipse.core.runtime.*;
@@ -67,7 +68,7 @@
"{\"c:\\users\\E0192828\\back.txt\", \"c:\\users\\E0FG\\front.txt\"}-\"sp ac es.txt\"\r\n" +
"\"c:\\users\\E0192828\\back.txt\" - \"sp ac es.txt\"";
- private static final Map lang2SrcFileMap = new HashMap();
+ private static final Map lang2SrcFileMap = new HashMap();
static {
for (String[] lang2SrcFileSpec : LANG_TO_SRC_FILES) {
lang2SrcFileMap.put(lang2SrcFileSpec[0], lang2SrcFileSpec[1]);
@@ -85,7 +86,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- this.path = new Path("c:\\symbian\\9.4\\epoc32\\tools\\Test.PKG");
+ this.path = new Path(getTokenAbsolutePath()).append("/symbian/9.4/epoc32/tools/Test.PKG");
config = new IViewConfiguration() {
@@ -94,7 +95,7 @@
}
public Collection getMacros() {
- return Collections.EMPTY_LIST ;
+ return Collections.emptyList() ;
}
public IViewParserConfiguration getViewParserConfiguration() {
@@ -139,24 +140,24 @@
// first install file is language dependent
IPKGInstallFile installFile = installFileList.get(0);
- assertEquals(new Path(LANG_DEST_FILE), installFile.getDestintationFile());
+ assertEquals(HostOS.createPathFromString(LANG_DEST_FILE), installFile.getDestintationFile());
List langs = view.getLanguages();
assertEquals(2, langs.size());
Map sourceFiles = installFile.getSourceFiles();
for (EPKGLanguage lang : langs) {
IPath srcFilePath = sourceFiles.get(lang);
String srcFile = lang2SrcFileMap.get(lang.getCode());
- assertEquals(new Path(srcFile), srcFilePath);
+ assertEquals(HostOS.createPathFromString(srcFile), srcFilePath);
}
// second install file is language independent
installFile = installFileList.get(1);
- assertEquals(new Path(NO_LANG_DEST_FILE), installFile.getDestintationFile());
+ assertEquals(HostOS.createPathFromString(NO_LANG_DEST_FILE), installFile.getDestintationFile());
sourceFiles = installFile.getSourceFiles();
assertEquals(1, sourceFiles.size());
assertTrue(sourceFiles.containsKey(EPKGLanguage.INDEPENDENT));
IPath srcFilePath = sourceFiles.get(EPKGLanguage.INDEPENDENT);
- assertEquals(new Path(NO_LANG_SRC_FILE), srcFilePath);
+ assertEquals(HostOS.createPathFromString(NO_LANG_SRC_FILE), srcFilePath);
assertEquals(1, installFile.getOptions().size());
assertEquals(NO_LANG_OPTION, installFile.getOptions().get(0));
@@ -186,7 +187,7 @@
IPath destintationFile = conditionalInstallFile.getDestintationFile();
assertTrue(destintationFile.isEmpty());
assertEquals(1, conditionalInstallFile.getSourceFiles().size());
- assertEquals(new Path(CONDITIONAL_SRC_FILE), conditionalInstallFile.getSourceFiles().get(EPKGLanguage.INDEPENDENT));
+ assertEquals(HostOS.createPathFromString(CONDITIONAL_SRC_FILE), conditionalInstallFile.getSourceFiles().get(EPKGLanguage.INDEPENDENT));
assertEquals(2, conditionalInstallFile.getOptions().size());
commitTest(view, modelText);
@@ -199,9 +200,9 @@
// fully create and add a language independent install file statement
IPKGInstallFile installFile1 = view.createInstallFile(null);
- installFile1.getSourceFiles().put(EPKGLanguage.INDEPENDENT, new Path(NO_LANG_SRC_FILE));
+ installFile1.getSourceFiles().put(EPKGLanguage.INDEPENDENT, HostOS.createPathFromString(NO_LANG_SRC_FILE));
installFile1.getOptions().add(NO_LANG_OPTION);
- installFile1.setDestinationFile(new Path(NO_LANG_DEST_FILE));
+ installFile1.setDestinationFile(HostOS.createPathFromString(NO_LANG_DEST_FILE));
view.addInstallFile(installFile1);
// create a language dependent install file and modify after add
@@ -209,9 +210,9 @@
view.addInstallFile(installFile2);
for (String[] lang2SrcFileArray : LANG_TO_SRC_FILES) {
installFile2.getSourceFiles().put(
- EPKGLanguage.forLangCode(lang2SrcFileArray[0]), new Path(lang2SrcFileArray[1]));
+ EPKGLanguage.forLangCode(lang2SrcFileArray[0]), HostOS.createPathFromString(lang2SrcFileArray[1]));
}
- installFile2.setDestinationFile(new Path(LANG_DEST_FILE));
+ installFile2.setDestinationFile(HostOS.createPathFromString(LANG_DEST_FILE));
// NOTE: the newlines are lost and shouldn't be
//String modifiedModelText = modelText + NO_LANG_INSTALL_FILE_STATEMENT + "\n" + LANG_INSTALL_FILE_STATEMENT;
@@ -244,13 +245,13 @@
IPKGInstallFile file = installFiles[0];
assertEquals(2, file.getSourceFiles().size());
- assertEquals(new Path("c:\\users\\E0192828\\back.txt"), file.getSourceFiles().get(EPKGLanguage.EN));
- assertEquals(new Path("c:\\users\\E0FG\\front.txt"), file.getSourceFiles().get(EPKGLanguage.FR));
+ assertEquals(new Path("c:/users/E0192828/back.txt"), file.getSourceFiles().get(EPKGLanguage.EN));
+ assertEquals(new Path("c:/users/E0FG/front.txt"), file.getSourceFiles().get(EPKGLanguage.FR));
assertEquals(new Path("sp ac es.txt"), file.getDestintationFile());
file = installFiles[1];
assertEquals(1, file.getSourceFiles().size());
- assertEquals(new Path("c:\\users\\E0192828\\back.txt"), file.getSourceFiles().get(EPKGLanguage.INDEPENDENT));
+ assertEquals(new Path("c:/users/E0192828/back.txt"), file.getSourceFiles().get(EPKGLanguage.INDEPENDENT));
assertEquals(new Path("sp ac es.txt"), file.getDestintationFile());
commitTest(view, ESCAPABLE_FILES);
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestStandaloneModelProvider.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestStandaloneModelProvider.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestStandaloneModelProvider.java Sun Dec 06 20:47:07 2009 -0600
@@ -70,6 +70,7 @@
/* (non-Javadoc)
* @see com.nokia.carbide.cpp.epoc.engine.tests.BaseTest#setUp()
*/
+ @SuppressWarnings("unchecked")
@Override
protected void setUp() throws Exception {
super.setUp();
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewChanging.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewChanging.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewChanging.java Sun Dec 06 20:47:07 2009 -0600
@@ -62,7 +62,7 @@
}
public Collection getMacros() {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
public IViewParserConfiguration getViewParserConfiguration() {
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewDOMSynchronizer.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewDOMSynchronizer.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewDOMSynchronizer.java Sun Dec 06 20:47:07 2009 -0600
@@ -192,7 +192,7 @@
}
public Pair getInsertAnchors() {
- return new Pair(null, null);
+ return new Pair(null, null);
}
};
}
@@ -212,7 +212,7 @@
}
public Pair getInsertAnchors() {
- return new Pair(before, after);
+ return new Pair(before, after);
}
};
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewDataCache.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewDataCache.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestViewDataCache.java Sun Dec 06 20:47:07 2009 -0600
@@ -61,7 +61,7 @@
private File projectDir;
// Try to wait long enough to ensure the timestamp-based check will detect a change
- private static final long FS_TIME_RESOLUTION = ViewDataCache.ModelFileTimestampCollection.MIN_TIMESTAMP_RESOLUTION;
+ private static final long FS_TIME_RESOLUTION = FileUtils.getMinimumFileTimestampResolution(null);
/* (non-Javadoc)
* @see com.nokia.carbide.cpp.epoc.engine.tests.BaseTest#setUp()
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/workspace/TestWorkspaceModelProvider.java
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/workspace/TestWorkspaceModelProvider.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/workspace/TestWorkspaceModelProvider.java Sun Dec 06 20:47:07 2009 -0600
@@ -471,7 +471,8 @@
*/
public void testExternalModification_bug3557() throws Exception {
// make the mmp
- IPath fullMmpPath = new Path("c:/tempmodel.mmp");
+ IPath fullMmpPath = new Path(getTokenAbsolutePath()).append("tempmodel.mmp");
+ fullMmpPath.toFile().getParentFile().mkdirs();
String text =
"START BITMAP foo.mbm\n"+
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/preprocessor/DefaultTranslationUnitProvider.java
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/preprocessor/DefaultTranslationUnitProvider.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/preprocessor/DefaultTranslationUnitProvider.java Sun Dec 06 20:47:07 2009 -0600
@@ -36,7 +36,7 @@
import com.nokia.cpp.internal.api.utils.core.*;
public class DefaultTranslationUnitProvider implements ITranslationUnitProvider {
- private static DefaultTranslationUnitProvider instance;
+ private static DefaultTranslationUnitProvider instance = new DefaultTranslationUnitProvider();
// not final or static for debugging
private boolean DUMP = false;
@@ -62,9 +62,6 @@
* @return instance, never null
*/
public static DefaultTranslationUnitProvider getInstance() {
- if (instance == null) {
- instance = new DefaultTranslationUnitProvider();
- }
return instance;
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/ViewDataCache.java
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/ViewDataCache.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/ViewDataCache.java Sun Dec 06 20:47:07 2009 -0600
@@ -218,13 +218,6 @@
public static class ModelFileTimestampCollection {
/**
- * The minimum timestamp resolution for a file in ms (based on heuristics for the OS).
- * VFAT on Win32 uses 2 second increments. Linux ext2/3 uses 1 second resolution,
- * until ext4, where it becomes nanoseconds.
- * Assume the worst format in all cases.
- */
- public static final long MIN_TIMESTAMP_RESOLUTION = HostOS.IS_WIN32 ? 2000 : 1000;
- /**
* Delay in ms between successive checks of the filesystem, to avoid wasting time
* when such checks are slow, and in cases where it's unlikely the human will edit files
* fast enough to care.
@@ -424,6 +417,7 @@
* @return
* @throws CoreException
*/
+ @SuppressWarnings("unchecked")
private Data getViewData(IPath modelPath, IViewConfiguration configuration,
ViewConfigState state, ViewConfigKey key) throws CoreException {
Data data;
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/pkg/PKGView.java
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/pkg/PKGView.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/pkg/PKGView.java Sun Dec 06 20:47:07 2009 -0600
@@ -366,7 +366,7 @@
IASTPKGInstallFileStatement installFileStmt = (IASTPKGInstallFileStatement) node;
PKGInstallFile installFile = new PKGInstallFile(installFileStmt, parentNode);
IASTLiteralTextNode targetFile = installFileStmt.getTargetFile();
- installFile.setDestinationFile(new Path(TextUtils.unquote(targetFile
+ installFile.setDestinationFile(HostOS.createPathFromString(TextUtils.unquote(targetFile
.getStringValue(), '"')));
IASTListNode optionNodes = installFileStmt
.getOptions();
@@ -388,7 +388,7 @@
} else {
for (IASTLiteralTextNode sourceNode : sourceNodes) {
sourceFiles.put(languages.get(languageIndex++),
- new Path(TextUtils.unquote(sourceNode
+ HostOS.createPathFromString(TextUtils.unquote(sourceNode
.getStringValue(), '"')));
}
}
@@ -397,7 +397,7 @@
// always return
// single source
// node
- sourceFiles.put(EPKGLanguage.INDEPENDENT, new Path(TextUtils
+ sourceFiles.put(EPKGLanguage.INDEPENDENT, HostOS.createPathFromString(TextUtils
.unquote(sourceNodes.get(0).getStringValue(), '"')));
}
if (parentNode == null)
@@ -460,13 +460,13 @@
for (IASTLiteralTextNode sourceNode : sourceNodes) {
// remove the leading '@'
sourceFiles.put(languages.get(languageIndex++),
- new Path(TextUtils.unquote(sourceNode.getStringValue().substring(1), '"')));
+ HostOS.createPathFromString(TextUtils.unquote(sourceNode.getStringValue().substring(1), '"')));
}
}
} else { // language independent
Check.checkContract(sourceNodes.size() == 1); // parser should
// always return single source node. remove the leading '@'.
- sourceFiles.put(EPKGLanguage.INDEPENDENT, new Path(TextUtils
+ sourceFiles.put(EPKGLanguage.INDEPENDENT, HostOS.createPathFromString(TextUtils
.unquote(sourceNodes.get(0).getStringValue().substring(1), '"')));
}
diff -r 1f0a706d24b2 -r 20fd716f8eaa project/com.nokia.carbide.cpp.project.core/src/com/nokia/carbide/cpp/internal/project/core/updater/SymbianBuildParser.java
--- a/project/com.nokia.carbide.cpp.project.core/src/com/nokia/carbide/cpp/internal/project/core/updater/SymbianBuildParser.java Sun Dec 06 20:41:47 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.core/src/com/nokia/carbide/cpp/internal/project/core/updater/SymbianBuildParser.java Sun Dec 06 20:47:07 2009 -0600
@@ -73,7 +73,7 @@
private static final String MACROS = "macros"; //$NON-NLS-1$
private static final String MBM = "mbm"; //$NON-NLS-1$
private static final String MIF = "mif"; //$NON-NLS-1$
- private static final String DEFAULT_TARGET = "untitled.exe"; //$NON-NLS-1$
+ private static final String DEFAULT_TARGET = HostOS.IS_WIN32 ? "untitled.exe" : "untitled"; //$NON-NLS-1$ //$NON-NLS-2$
private static final String DEFAULT_TARGETTYPE = "exe"; //$NON-NLS-1$
private static final String[] plaformMacros = {
"GCC32", "EPOC32", "MARM", "EABI", "GENERIC_MARM", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
diff -r 1f0a706d24b2 -r 20fd716f8eaa templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/bld.inf
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/bld.inf Sun Dec 06 20:41:47 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/bld.inf Sun Dec 06 20:47:07 2009 -0600
@@ -16,7 +16,7 @@
gnumakefile icons_scalable_dc.mk
-$(buildHelpPrefix)gnumakefile ..\$(helpDir)\build_help.mk
+$(buildHelpPrefix)gnumakefile ../$(helpDir)/build_help.mk
$(baseName).mmp
diff -r 1f0a706d24b2 -r 20fd716f8eaa templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/help/build_help.mk
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/help/build_help.mk Sun Dec 06 20:41:47 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/help/build_help.mk Sun Dec 06 20:47:07 2009 -0600
@@ -18,7 +18,7 @@
MAKMAKE : $(baseName)_$(uid3).hlp
$(baseName)_$(uid3).hlp : $(baseName).xml $(baseName).cshlp Custom.xml
- cshlpcmp $(baseName).cshlp
+ $(cshlpcmp) $(baseName).cshlp
ifeq (WINSCW,$(findstring WINSCW, $(PLATFORM)))
md $(EPOCROOT)epoc32\$(PLATFORM)\c\resource\help
copy $(baseName)_$(uid3).hlp $(EPOCROOT)epoc32\$(PLATFORM)\c\resource\help
diff -r 1f0a706d24b2 -r 20fd716f8eaa templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/bld.inf
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/bld.inf Sun Dec 06 20:41:47 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/bld.inf Sun Dec 06 20:47:07 2009 -0600
@@ -16,7 +16,7 @@
gnumakefile icons_scalable_dc.mk
-$(buildHelpPrefix)gnumakefile ..\$(helpDir)\build_help.mk
+$(buildHelpPrefix)gnumakefile ../$(helpDir)/build_help.mk
$(baseName).mmp
diff -r 1f0a706d24b2 -r 20fd716f8eaa templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/help/build_help.mk
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/help/build_help.mk Sun Dec 06 20:41:47 2009 -0600
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/help/build_help.mk Sun Dec 06 20:47:07 2009 -0600
@@ -18,7 +18,7 @@
MAKMAKE : $(baseName)_$(uid3).hlp
$(baseName)_$(uid3).hlp : $(baseName).xml $(baseName).cshlp Custom.xml
- cshlpcmp $(baseName).cshlp
+ $(cshlpcmp) $(baseName).cshlp
ifeq (WINSCW,$(findstring WINSCW, $(PLATFORM)))
md $(EPOCROOT)epoc32\$(PLATFORM)\c\resource\help
copy $(baseName)_$(uid3).hlp $(EPOCROOT)epoc32\$(PLATFORM)\c\resource\help