From 4cca665465054f156c40452bff58e6181d8ef79e Mon Sep 17 00:00:00 2001 From: Ignacio Calderon Date: Fri, 29 Nov 2013 16:05:07 +0100 Subject: [PATCH 01/10] 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 02/10] 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 From 31462a9d35ca54712ec63a4b1d60189403c78251 Mon Sep 17 00:00:00 2001 From: Braden Shepherdson Date: Fri, 10 Jan 2014 14:37:09 -0500 Subject: [PATCH 03/10] Add test/ to .npmignore Now tests are not included when installing from npm. --- .npmignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmignore diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..65e3ba2 --- /dev/null +++ b/.npmignore @@ -0,0 +1 @@ +test/ From d40003d2016d254624d0fe855604b89706b33f2a Mon Sep 17 00:00:00 2001 From: Braden Shepherdson Date: Fri, 10 Jan 2014 14:37:29 -0500 Subject: [PATCH 04/10] Bump version to 0.6.4. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b7ff0b..dab5ad1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Andrew Lunny ", "name": "xcode", "description": "parser for xcodeproj/project.pbxproj files", - "version": "0.6.3", + "version": "0.6.4", "main":"index.js", "repository": { "url": "https://github.com/alunny/node-xcode.git" From 47c9d8daa5685fe54dda7aee4957ee350dd33479 Mon Sep 17 00:00:00 2001 From: Ignacio Calderon Date: Tue, 14 Jan 2014 16:48:04 +0100 Subject: [PATCH 05/10] 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 06/10] 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 07/10] 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); From d2374f0c52b9a34643a3091eefcfacb525c28fad Mon Sep 17 00:00:00 2001 From: Braden Shepherdson Date: Thu, 16 Jan 2014 13:30:53 -0500 Subject: [PATCH 08/10] Fix missing comma in var block. --- lib/pbxProject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pbxProject.js b/lib/pbxProject.js index c202903..608c0fa 100644 --- a/lib/pbxProject.js +++ b/lib/pbxProject.js @@ -718,7 +718,7 @@ function correctForFrameworksPath(file, project) { } function searchPathForFile(file, proj) { - var plugins = proj.pbxGroupByName('Plugins') + var plugins = proj.pbxGroupByName('Plugins'), pluginsPath = plugins ? plugins.path : null, fileDir = path.dirname(file.path); From a825f32ad66d4d15c27d83b707cb542b91c90904 Mon Sep 17 00:00:00 2001 From: Braden Shepherdson Date: Thu, 16 Jan 2014 13:31:07 -0500 Subject: [PATCH 09/10] Bump version to 0.6.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dab5ad1..875ecca 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Andrew Lunny ", "name": "xcode", "description": "parser for xcodeproj/project.pbxproj files", - "version": "0.6.4", + "version": "0.6.5", "main":"index.js", "repository": { "url": "https://github.com/alunny/node-xcode.git" From a429a59a52aa063c521c711683755237cf7a0259 Mon Sep 17 00:00:00 2001 From: Braden Shepherdson Date: Thu, 16 Jan 2014 17:37:40 -0500 Subject: [PATCH 10/10] Update version to 0.6.6. No changes, just overriding old NPM version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 875ecca..b09cc91 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Andrew Lunny ", "name": "xcode", "description": "parser for xcodeproj/project.pbxproj files", - "version": "0.6.5", + "version": "0.6.6", "main":"index.js", "repository": { "url": "https://github.com/alunny/node-xcode.git"