diff options
-rw-r--r-- | src/base/tree.lua | 2 | ||||
-rw-r--r-- | tests/actions/xcode/test_file_references.lua | 49 | ||||
-rw-r--r-- | tests/premake4.lua | 1 |
3 files changed, 52 insertions, 0 deletions
diff --git a/src/base/tree.lua b/src/base/tree.lua index 527aa4c..73c85af 100644 --- a/src/base/tree.lua +++ b/src/base/tree.lua @@ -101,6 +101,8 @@ function premake.tree.getlocalpath(node) if node.parent.path then return node.name + elseif node.cfg then + return node.cfg.name else return node.path end diff --git a/tests/actions/xcode/test_file_references.lua b/tests/actions/xcode/test_file_references.lua new file mode 100644 index 0000000..5cbd9e7 --- /dev/null +++ b/tests/actions/xcode/test_file_references.lua @@ -0,0 +1,49 @@ +-- +-- tests/actions/xcode/test_file_references.lua +-- Verify generation of PBXFileReference section of Xcode project +-- Copyright (c) 2011 Jason Perkins and the Premake project +-- + + T.xcode3_filerefs = { } + local suite = T.xcode3_filerefs + local xcode = premake.xcode + + +-- +-- Setup and teardown +-- + + local sln + + function suite.setup() + _ACTION = "xcode3" + xcode.used_ids = { } -- reset the list of generated IDs + sln = test.createsolution() + end + + local function prepare() + premake.bake.buildconfigs() + xcode.preparesolution(sln) + local prj = premake.solution.getproject(sln, 1) + tr = xcode.buildprjtree(prj) + xcode.PBXFileReference(tr) + end + + +-- +-- Bug #3410213: regression in xcode generation in 4.4 beta3 +-- When a location has been set on a project, a file at the top of +-- the source tree (i.e. not in a folder) should use the relative +-- path to the project. +-- + + function suite.canFindFile_onLocationSet() + location "build" + files "hello.c" + prepare() + test.capture [[ +/* Begin PBXFileReference section */ + [hello.c] /* hello.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "hello.c"; path = "../hello.c"; sourceTree = "<group>"; }; + ]] + end + diff --git a/tests/premake4.lua b/tests/premake4.lua index fa86e99..ca4ecff 100644 --- a/tests/premake4.lua +++ b/tests/premake4.lua @@ -119,6 +119,7 @@ dofile("actions/make/test_wiidev.lua") -- Xcode3 tests + dofile("actions/xcode/test_file_references.lua") dofile("actions/xcode/test_xcode_common.lua") dofile("actions/xcode/test_xcode_project.lua") dofile("actions/xcode/test_xcode_dependencies.lua") |