# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1278441836 18000
# Node ID bbceeefede97d1d003bfe59c3d2a20694b7d143b
# Parent  07cfb1a5f33f10f2f3d846bea14d0d91aa981bf1# Parent  ceccb3d7ade9a0e478e85d1bc47e1727c7c59a26
Merge commit

diff -r ceccb3d7ade9 -r bbceeefede97 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java
--- 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);
diff -r ceccb3d7ade9 -r bbceeefede97 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/AttachMainTab.java
--- 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() {
diff -r ceccb3d7ade9 -r bbceeefede97 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java
--- 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() {
diff -r ceccb3d7ade9 -r bbceeefede97 project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java
--- 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;
 							}