Fix file references inside .pbxproject

Fatme · Kristian D. Dimitrov · commit 71f488cbb2a2 · 2019-01-31T15:12:50.000+02:00
diff --git a/lib/pbxProject.js b/lib/pbxProject.js
@@ -1303,11 +1303,7 @@ pbxProject.prototype.addToLibrarySearchPaths = function(file) {
             buildSettings['LIBRARY_SEARCH_PATHS'] = [INHERITED];
         }
 
-        if (typeof file === 'string') {
-            buildSettings['LIBRARY_SEARCH_PATHS'].push(file);
-        } else {
-            buildSettings['LIBRARY_SEARCH_PATHS'].push(searchPathForFile(file, this));
-        }
+        buildSettings['LIBRARY_SEARCH_PATHS'].push(searchPathForFile(file, this));
     }
 }
 
@@ -1316,7 +1312,7 @@ pbxProject.prototype.removeFromHeaderSearchPaths = function(file) {
         INHERITED = '"$(inherited)"',
         SEARCH_PATHS = 'HEADER_SEARCH_PATHS',
         config, buildSettings, searchPaths;
-        var new_path = typeof file === 'string' ? file : searchPathForFile(file, this);
+        var new_path = searchPathForFile(file, this);
 
     for (config in configurations) {
         buildSettings = configurations[config].buildSettings;
@@ -1351,11 +1347,7 @@ pbxProject.prototype.addToHeaderSearchPaths = function(file) {
             buildSettings['HEADER_SEARCH_PATHS'] = [INHERITED];
         }
 
-        if (typeof file === 'string') {
-            buildSettings['HEADER_SEARCH_PATHS'].push(file);
-        } else {
-            buildSettings['HEADER_SEARCH_PATHS'].push(searchPathForFile(file, this));
-        }
+        buildSettings['HEADER_SEARCH_PATHS'].push(searchPathForFile(file, this));
     }
 }
 
@@ -1720,8 +1712,27 @@ function correctForPath(file, project, group) {
 }
 
 function searchPathForFile(file, proj) {
+    const getPathString = (filePath) => {
+        return `"\\"${filePath}\\""`;
+    }
+
+    const getRelativePathString = (filePath) => {
+        return getPathString(`$(SRCROOT)/${filePath}`);
+    }
+
+    if (typeof file === 'string') {
+        const relativeFilePath = file;
+
+        if ($path.isAbsolute(file)) {
+            const srcRoot = $path.dirname($path.dirname(proj.filepath));
+            relativeFilePath = $path.relative(srcRoot, file);
+        }
+
+        return getRelativePathString(relativeFilePath);
+    }
+
     if (file.relativePath) {
-        return '"\$(SRCROOT)/' + file.relativePath + '\"';
+        return getRelativePathString(file.relativePath);
     }
 
     var plugins = proj.pbxGroupByName('Plugins'),
@@ -1735,11 +1746,11 @@ function searchPathForFile(file, proj) {
     }
 
     if (file.plugin && pluginsPath) {
-        return '"\\"$(SRCROOT)/' + unquote(pluginsPath) + '\\""';
+        return getRelativePathString(unquote(pluginsPath));
     } else if (file.customFramework && file.dirname) {
-        return '"\\"' + file.dirname + '\\""';
+        return getPathString(file.dirname);
     } else {
-        return '"\\"$(SRCROOT)/' + proj.productName + fileDir + '\\""';
+        return getRelativePathString(proj.productName + fileDir);
     }
 }
 
