diff options
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/actions/xcode/xcode_common.lua | 2 | ||||
| -rw-r--r-- | tests/actions/xcode/test_xcode_project.lua | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 29c7eed..a40b51a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -58,6 +58,7 @@ * Patch 3305599: Add -Wextra to ExtraWarnings (ergosys) * Patch 3476176: Fix dependencies of precompiled header in makefile (Konstantin Tokarev) * Patch 3476176: Remove conditionals from makefile compiler assignments (Konstantin Tokarev) +* Pull 1: Fixed path to Info.plist in Xcode projects (Adrien Anselme) ------- diff --git a/src/actions/xcode/xcode_common.lua b/src/actions/xcode/xcode_common.lua index 286fd4c..1870d48 100644 --- a/src/actions/xcode/xcode_common.lua +++ b/src/actions/xcode/xcode_common.lua @@ -692,7 +692,7 @@ _p(4,'GCC_MODEL_TUNING = G5;') if tr.infoplist then - _p(4,'INFOPLIST_FILE = "%s";', tr.infoplist.path) + _p(4,'INFOPLIST_FILE = "%s";', tr.infoplist.cfg.name) end installpaths = { diff --git a/tests/actions/xcode/test_xcode_project.lua b/tests/actions/xcode/test_xcode_project.lua index 93a3fe7..a5071fe 100644 --- a/tests/actions/xcode/test_xcode_project.lua +++ b/tests/actions/xcode/test_xcode_project.lua @@ -961,7 +961,7 @@ end function suite.XCBuildConfigurationTarget_OnInfoPlist() - files { "MyProject-Info.plist" } + files { "../../MyProject-Info.plist" } prepare() xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1]) test.capture [[ @@ -972,7 +972,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; - INFOPLIST_FILE = "MyProject-Info.plist"; + INFOPLIST_FILE = "../../MyProject-Info.plist"; INSTALL_PATH = /usr/local/bin; PRODUCT_NAME = "MyProject"; }; |