# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1278081179 18000
# Node ID b1641b8ccefba7d3181fb3ad5624313e446922f5
# Parent  ab85ee3ba5860c05a5322a74bb5d52625467b0f8
Fix bug 11324.  Prefer *.flm over *.mk/*.meta for the actual extension makefile driver files

diff -r ab85ee3ba586 -r b1641b8ccefb 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	Thu Jul 01 13:28:31 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Fri Jul 02 09:32:59 2010 -0500
@@ -199,14 +199,26 @@
 							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);
+								normalFiles.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 ab85ee3ba586 -r b1641b8ccefb 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	Thu Jul 01 13:28:31 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java	Fri Jul 02 09:32:59 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;
 							}