diff options
| author | Liam Devine <dmail00@gmail.com> | 2011-05-07 05:30:28 +0400 |
|---|---|---|
| committer | Liam Devine <dmail00@gmail.com> | 2011-05-07 05:30:28 +0400 |
| commit | fb7f74d4bdc2eddb30e45fb102d54b07d8ad0134 (patch) | |
| tree | 0d3d6d981983e259ea288b7686d8c761082c6004 | |
| parent | 5c015131c8c89c9bc89ffe64bb0402dadea2c42e (diff) | |
Fixed bug 3297634 - UnitTest++ folder breaks Xcode 3
Xcode itself only quotes when it needs to yet it is fine to always quote the string.
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/actions/xcode/xcode_common.lua | 2 | ||||
| -rw-r--r-- | tests/actions/xcode/test_xcode_project.lua | 11 |
3 files changed, 12 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index cfb2f87..73e655b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,8 +11,9 @@ * Bug 3163703: pdb file being set in the wrong section. (hodsondd) * Bug 3157645: Full path for xcode frameworks * Bug 3232160: Environment variables are cut off -* Patch 3043933 gmake incorrectly links using -l when a solution contains a .so and .a of the same name and the static lib is wanted (Jonathan Derque) +* 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 @@ -135,7 +136,6 @@ - Bug 2790865: SharedLib on OSX fixes (Ash Berlin) - Bug 2790882: Trailing slash in path.getabsolute (Ash Berlin) - RC2 -> RC3 - Bug 2805763: GCC PCH breaks on path diff --git a/src/actions/xcode/xcode_common.lua b/src/actions/xcode/xcode_common.lua index 5d823a1..6f430dc 100644 --- a/src/actions/xcode/xcode_common.lua +++ b/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 diff --git a/tests/actions/xcode/test_xcode_project.lua b/tests/actions/xcode/test_xcode_project.lua index d667bd1..91a83d1 100644 --- a/tests/actions/xcode/test_xcode_project.lua +++ b/tests/actions/xcode/test_xcode_project.lua @@ -359,7 +359,7 @@ [premake] /* premake */, ); name = "include"; - path = include; + path = "include"; sourceTree = "<group>"; }; [premake] /* premake */ = { @@ -368,13 +368,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() |