Skip to content

Use correct path separator when dealing with FRAMEWORK_SEARCH_PATHS #81

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
imhotep merged 1 commit into from
Mar 10, 2016
Merged

Use correct path separator when dealing with FRAMEWORK_SEARCH_PATHS #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions lib/pbxFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,12 @@ function pbxFile(filepath, opt) {
// for custom frameworks
if (opt.customFramework == true) {
this.customFramework = true;
this.dirname = path.dirname(filepath);
this.dirname = path.dirname(filepath).replace(/\\/g, '/');
}

this.path = defaultPath(this, filepath);
this.path = defaultPath(this, filepath).replace(/\\/g, '/');
this.fileEncoding = this.defaultEncoding = opt.defaultEncoding || defaultEncoding(self);


// When referencing products / build output files
if (opt.explicitFileType) {
this.explicitFileType = opt.explicitFileType;
Expand Down
2 changes: 1 addition & 1 deletion lib/pbxProject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ pbxProject.prototype.removeFramework = function(fpath, opt) {
this.removeFromPbxEmbedFrameworksBuildPhase(file); // PBXCopyFilesBuildPhase

if (opt && opt.customFramework) {
this.removeFromFrameworkSearchPaths(path.dirname(fpath));
this.removeFromFrameworkSearchPaths(file.dirname);
}

return file;
Expand Down
3 changes: 2 additions & 1 deletion test/dataModelDocument.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ exports.dataModelDocument = {
test.equal(xcVersionGroupEntry.children[0], newFile.models[0].fileRef);
test.equal(xcVersionGroupEntry.currentVersion, newFile.currentModel.fileRef);
test.equal(xcVersionGroupEntry.name, path.basename(singleDataModelFilePath));
test.equal(xcVersionGroupEntry.path, singleDataModelFilePath);
// Need to validate against normalized path, since paths should contain forward slash on OSX
test.equal(xcVersionGroupEntry.path, singleDataModelFilePath.replace(/\\/g, '/'));
test.equal(xcVersionGroupEntry.sourceTree, '"<group>"');
test.equal(xcVersionGroupEntry.versionGroupType, 'wrapper.xcdatamodel');

Expand Down