Skip to content

Merge node-xcode to 0.6.6 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Feb 18, 2014
Merged

Merge node-xcode to 0.6.6 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4cca665
Removed the customFramework check on the correctPath, since it's bett…
Nov 29, 2013
70b3e29
Modified unit test to reflect the right behaviour
Nov 29, 2013
05fed86
Merge pull request #25 from kronenthaler/master
bshepherdson Jan 10, 2014
31462a9
Add test/ to .npmignore
bshepherdson Jan 10, 2014
d40003d
Bump version to 0.6.4.
bshepherdson Jan 10, 2014
47c9d8d
FIX escaping search path of custom frameworks.
Jan 14, 2014
7e14b97
FIX adding ;
Jan 14, 2014
0759498
FIX unit test for escaped paths
Jan 15, 2014
d2374f0
Fix missing comma in var block.
bshepherdson Jan 16, 2014
a825f32
Bump version to 0.6.5
bshepherdson Jan 16, 2014
a429a59
Update version to 0.6.6. No changes, just overriding old NPM version.
bshepherdson Jan 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .npmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test/
2 changes: 0 additions & 2 deletions lib/pbxFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/pbxProject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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 + '\\""';
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Andrew Lunny <[email protected]>",
"name": "xcode",
"description": "parser for xcodeproj/project.pbxproj files",
"version": "0.6.3",
"version": "0.6.6",
"main":"index.js",
"repository": {
"url": "https://github.com/alunny/node-xcode.git"
Expand Down
6 changes: 3 additions & 3 deletions test/addFramework.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,13 @@ 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
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);
Expand Down