merge with stable

CHANGES.txt

@@ -22,6 +22,7 @@
 * Bug 3232160: Environment variables are cut off
 * Patch 3043933 Allow gmake to use static lib when shared lib of same name exists (Jonathan Derque)
 * Bug 3294459: vs10 x86_64 using incorrect debug format for minimal rebuild (learner)
+* Bug 3297634: Special characters in directory name Xcode3 (jdale)
 
 -------
   4.3

src/actions/xcode/xcode_common.lua

@@ -402,7 +402,7 @@
 						if node.parent.path then
 							p = path.getrelative(node.parent.path, node.path)
 						end
-						_p(3,'path = %s;', p)
+						_p(3,'path = "%s";', p)
 					end
 				end
 				

tests/actions/xcode/test_xcode_project.lua

@@ -358,7 +358,7 @@
 				[premake] /* premake */,
 			);
 			name = "include";
-			path = include;
+			path = "include";
 			sourceTree = "<group>";
 		};
 		[premake] /* premake */ = {
@@ -367,13 +367,20 @@
 				[source.h] /* source.h */,
 			);
 			name = "premake";
-			path = premake;
+			path = "premake";
 			sourceTree = "<group>";
 		};
 		]]
 	end
 
 
+	function suite.PBXGroup_pathHasPlusPlus_PathIsQuoted()
+		files { "RequiresQuoting++/h.h" }
+		prepare()
+		xcode.PBXGroup(tr)
+		test.string_contains( io.endcapture(),'path = "RequiresQuoting%+%+";' )
+	end
+	
 	function suite.PBXGroup_SortsFiles()
 		files { "test.h", "source.h", "source.cpp" }
 		prepare()