--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Tue Jul 06 11:46:46 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Tue Jul 06 13:43:56 2010 -0500
@@ -171,14 +171,28 @@
BldInfViewPathHelper helper = new BldInfViewPathHelper(data, context);
for (IExtension extension : data.getExtensions()) {
IPath extensionMakefileBase = helper.convertExtensionTemplateToFilesystem(extension.getTemplatePath());
- normalFiles.add(extensionMakefileBase.addFileExtension("mk")); //$NON-NLS-1$
+ IPath makefile = getControllingFile(extensionMakefileBase);
+ normalFiles.add(makefile);
}
for (IExtension extension : data.getTestExtensions()) {
IPath extensionMakefileBase = helper.convertExtensionTemplateToFilesystem(extension.getTemplatePath());
- testFiles.add(extensionMakefileBase.addFileExtension("mk")); //$NON-NLS-1$
+ IPath makefile = getControllingFile(extensionMakefileBase);
+ testFiles.add(makefile);
}
return null;
}
+
+ private IPath getControllingFile(
+ IPath extensionMakefileBase) {
+ IPath candidate = extensionMakefileBase.addFileExtension("mk"); //$NON-NLS-1$
+ if (candidate.toFile().exists())
+ return candidate;
+ if ("export".equals(extensionMakefileBase.getFileExtension())) //$NON-NLS-1$
+ candidate = extensionMakefileBase.removeFileExtension().addFileExtension("flm"); //$NON-NLS-1$
+ else
+ candidate = extensionMakefileBase.addFileExtension("flm"); //$NON-NLS-1$
+ return candidate;
+ }
});
monitor.worked(1);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java Tue Jul 06 11:46:46 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java Tue Jul 06 13:43:56 2010 -0500
@@ -59,7 +59,10 @@
fProjText.setToolTipText(Messages.getString("RunModeMainTab.8")); //$NON-NLS-1$
createVerticalSpacer(comp, 1);
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ /* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet;
+ * this isn't a problem, though, since all stock connections support TRK anyway */
+ //clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
clientSiteUI.createComposite(comp);
clientSiteUI.addListener(new IListener() {
public void connectionSelected() {
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java Tue Jul 06 11:46:46 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java Tue Jul 06 13:43:56 2010 -0500
@@ -81,7 +81,10 @@
if (wantsConnectionUI)
{
createVerticalSpacer(comp, 1);
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ /* TODO: do not filter by service: we need to match either TRK or TCF TRK and the API does not support this yet;
+ * this isn't a problem, though, since all stock connections support TRK anyway */
+ //clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(LaunchPlugin.getTRKService());
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(null);
clientSiteUI.createComposite(comp);
clientSiteUI.addListener(new IListener() {
public void connectionSelected() {
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Tue Jul 06 11:46:46 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Tue Jul 06 13:43:56 2010 -0500
@@ -867,12 +867,24 @@
visitedPaths.add(baseExtensionMakefilePath);
IPath extensionMakefilePath = baseExtensionMakefilePath.addFileExtension("mk");
- IPath extensionMetaPath = baseExtensionMakefilePath.addFileExtension("meta");
-
- addBldInfExtensionMakefile(objects, project, cpi, view,
- extensionMakefilePath);
- addBldInfExtensionMakefile(objects, project, cpi, view,
- extensionMetaPath);
+
+ if (extensionMakefilePath.toFile().exists()) {
+ // old-style
+ IPath extensionMetaPath = baseExtensionMakefilePath.addFileExtension("meta");
+ addBldInfExtensionMakefile(objects, project, cpi, view,
+ extensionMakefilePath);
+ addBldInfExtensionMakefile(objects, project, cpi, view,
+ extensionMetaPath);
+ } else {
+ // new-style (default for the future)
+ IPath flmMakefilePath;
+ if ("export".equals(baseExtensionMakefilePath.getFileExtension()))
+ flmMakefilePath = baseExtensionMakefilePath.removeFileExtension().addFileExtension("flm");
+ else
+ flmMakefilePath = baseExtensionMakefilePath.addFileExtension("flm");
+ addBldInfExtensionMakefile(objects, project, cpi, view,
+ flmMakefilePath);
+ }
}
return null;
}