From 4cca665465054f156c40452bff58e6181d8ef79e Mon Sep 17 00:00:00 2001 From: Ignacio Calderon Date: Fri, 29 Nov 2013 16:05:07 +0100 Subject: [PATCH 1/2] Removed the customFramework check on the correctPath, since it's better to use the filepath instead. Xcode can navigate the location of the framework for inspection of the files. --- lib/pbxFile.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/pbxFile.js b/lib/pbxFile.js index 9e04504..3235d1b 100644 --- a/lib/pbxFile.js +++ b/lib/pbxFile.js @@ -54,8 +54,6 @@ function correctPath(file, filepath) { return 'System/Library/Frameworks/' + filepath; } else if (file.lastType == DYLIB) { return 'usr/lib/' + filepath; - } else if (file.customFramework == true) { - return file.basename; } else { return filepath; } From 70b3e29b2f54c19952bb84bb4805b36f26fde36d Mon Sep 17 00:00:00 2001 From: Ignacio Calderon Date: Fri, 29 Nov 2013 16:41:38 +0100 Subject: [PATCH 2/2] Modified unit test to reflect the right behaviour --- test/addFramework.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/addFramework.js b/test/addFramework.js index 2bfb6f2..626978a 100644 --- a/test/addFramework.js +++ b/test/addFramework.js @@ -182,7 +182,7 @@ exports.addFramework = { test.equal(newFile.basename, 'Custom.framework'); test.equal(newFile.dirname, '/path/to'); // XXX framework has to be copied over to PROJECT root. That is what XCode does when you drag&drop - test.equal(newFile.path, 'Custom.framework'); + test.equal(newFile.path, '/path/to/Custom.framework'); // should add path to framework search path