From 47c9d8daa5685fe54dda7aee4957ee350dd33479 Mon Sep 17 00:00:00 2001 From: Ignacio Calderon Date: Tue, 14 Jan 2014 16:48:04 +0100 Subject: [PATCH 1/3] FIX escaping search path of custom frameworks. --- lib/pbxProject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pbxProject.js b/lib/pbxProject.js index 71b89ce..36cb70a 100644 --- a/lib/pbxProject.js +++ b/lib/pbxProject.js @@ -731,7 +731,7 @@ function searchPathForFile(file, proj) { if (file.plugin && pluginsPath) { return '"\\"$(SRCROOT)/' + unquote(pluginsPath) + '\\""'; } else if (file.customFramework && file.dirname) { - return '"' + file.dirname + '"' + return '"\\"' + file.dirname + '\\""' } else { return '"\\"$(SRCROOT)/' + proj.productName + fileDir + '\\""'; } From 7e14b97f0e9fab6ba6e57d8bed7ace622d418cec Mon Sep 17 00:00:00 2001 From: Ignacio Calderon Date: Tue, 14 Jan 2014 17:20:53 +0100 Subject: [PATCH 2/3] FIX adding ; --- lib/pbxProject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pbxProject.js b/lib/pbxProject.js index 36cb70a..c202903 100644 --- a/lib/pbxProject.js +++ b/lib/pbxProject.js @@ -731,7 +731,7 @@ function searchPathForFile(file, proj) { if (file.plugin && pluginsPath) { return '"\\"$(SRCROOT)/' + unquote(pluginsPath) + '\\""'; } else if (file.customFramework && file.dirname) { - return '"\\"' + file.dirname + '\\""' + return '"\\"' + file.dirname + '\\""'; } else { return '"\\"$(SRCROOT)/' + proj.productName + fileDir + '\\""'; } From 075949833c8f9eed6f09b3d1807436686bbb84fa Mon Sep 17 00:00:00 2001 From: Ignacio Calderon Date: Wed, 15 Jan 2014 10:07:54 +0100 Subject: [PATCH 3/3] FIX unit test for escaped paths --- test/addFramework.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/addFramework.js b/test/addFramework.js index 626978a..d4a4bf4 100644 --- a/test/addFramework.js +++ b/test/addFramework.js @@ -187,8 +187,8 @@ exports.addFramework = { // should add path to framework search path var frameworkPaths = frameworkSearchPaths(proj); - expectedPath = '"/path/to"'; - + expectedPath = '"\\"/path/to\\""'; + for (i = 0; i < frameworkPaths.length; i++) { var current = frameworkPaths[i]; test.ok(current.indexOf('"$(inherited)"') >= 0);