Fix extra separator added when project has no specific directory.

Normalizing a path doesn't remove trailing directory separators, so all paths relative to the working directory gained an extra separator when the working directory itself ended in a separator.
facebookarchive · Jul 22, 2016 · 08575f6 · 08575f6
1 parent f7dc274
commit 08575f6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Libraries/pbxproj/Sources/PBX/Project.cpp b/Libraries/pbxproj/Sources/PBX/Project.cpp
@@ -52,7 +52,11 @@ settings(void) const
 std::string Project::
 sourceRoot() const
 {
- return FSUtil::NormalizePath(_basePath + "/" + _projectDirPath);
+ std::string root = _basePath;
+ if (!_projectDirPath.empty()) {
+ root += "/" + _projectDirPath;
+ }
+ return FSUtil::NormalizePath(root);
 }
 
 bool Project::