Bug 2909463: Fix Xcode handling of Obj-C++ .mm files

CHANGES.txt

@@ -7,6 +7,8 @@
 - Added project kind to list of configuration filters
 - Clean action now removes MonoDevelop .pidb files correctly
 - Added os.executef()
+- Bug 2909463: Fix Xcode handling of Obj-C++ .mm files
+
 
 -------
  4.1.2

src/actions/xcode/xcode_common.lua

@@ -26,6 +26,7 @@
 			[".cxx"] = "Sources",
 			[".framework"] = "Frameworks",
 			[".m"] = "Sources",
+			[".mm"] = "Sources",
 			[".strings"] = "Resources",
 			[".nib"] = "Resources",
 			[".xib"] = "Resources",
@@ -75,6 +76,7 @@
 			[".html"]      = "text.html",
 			[".lua"]       = "sourcecode.lua",
 			[".m"]         = "sourcecode.c.objc",
+			[".mm"]        = "sourcecode.cpp.objc",
 			[".nib"]       = "wrapper.nib",
 			[".pch"]       = "sourcecode.c.h",
 			[".plist"]     = "text.plist.xml",

tests/actions/xcode/test_xcode_project.lua

@@ -35,7 +35,7 @@
 -- PBXBuildFile tests
 ---------------------------------------------------------------------------
 
-	function suite.PBXBuildFile_ListsBuildableSources()
+	function suite.PBXBuildFile_ListsCppSources()
 		files { "source.h", "source.c", "source.cpp", "Info.plist" }
 		prepare()
 		xcode.PBXBuildFile(tr)
@@ -47,6 +47,17 @@
 		]]
 	end
 
+	function suite.PBXBuildFile_ListsObjCSources()
+		files { "source.h", "source.m", "source.mm", "Info.plist" }
+		prepare()
+		xcode.PBXBuildFile(tr)
+		test.capture [[
+/* Begin PBXBuildFile section */
+		[source.m:build] /* source.m in Sources */ = {isa = PBXBuildFile; fileRef = [source.m] /* source.m */; };
+		[source.mm:build] /* source.mm in Sources */ = {isa = PBXBuildFile; fileRef = [source.mm] /* source.mm */; };
+/* End PBXBuildFile section */
+		]]
+	end
 
 	function suite.PBXBuildFile_ListsResourceFilesOnlyOnceWithGroupID()
 		files { "English.lproj/MainMenu.xib", "French.lproj/MainMenu.xib" }