cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject cordova-lib git commit: CB-8757 ios: Make paths with --link relative to the real project path (close #192)
Date Thu, 26 Mar 2015 17:01:23 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master cc596a37d -> 43adf9756


CB-8757 ios: Make paths with --link relative to the real project path (close #192)


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/43adf975
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/43adf975
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/43adf975

Branch: refs/heads/master
Commit: 43adf9756b30d4b796407e54bbe5809038987f39
Parents: cc596a3
Author: Martin Bektchiev <martin.bektchiev@telerik.com>
Authored: Thu Mar 26 17:09:06 2015 +0200
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Mar 26 13:00:56 2015 -0400

----------------------------------------------------------------------
 cordova-lib/src/plugman/platforms/ios.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/43adf975/cordova-lib/src/plugman/platforms/ios.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/ios.js b/cordova-lib/src/plugman/platforms/ios.js
index 2719dcb..6a97713 100644
--- a/cordova-lib/src/plugman/platforms/ios.js
+++ b/cordova-lib/src/plugman/platforms/ios.js
@@ -49,7 +49,7 @@ function installHelper(type, obj, plugin_dir, project_dir, plugin_id, options,
p
         // Make the Xcode reference the file directly.
         // Note: Can't use path.join() here since it collapses 'Plugins/..', and xcode
         // library special-cases Plugins/ prefix.
-        project_ref = 'Plugins/' + fixPathSep(path.relative(project.plugins_dir, trueSrc));
+        project_ref = 'Plugins/' + fixPathSep(path.relative(fs.realpathSync(project.plugins_dir),
trueSrc));
     } else {
         common.copyNewFile(plugin_dir, srcFile, project_dir, destFile, link);
         project_ref = 'Plugins/' + fixPathSep(path.relative(project.plugins_dir, destFile));
@@ -75,7 +75,7 @@ function uninstallHelper(type, obj, project_dir, plugin_id, options, project)
{
     var link = !!(options && options.link);
     if (link) {
         var trueSrc = fs.readlinkSync(destFile);
-        project_ref = 'Plugins/' + fixPathSep(path.relative(project.plugins_dir, trueSrc));
+        project_ref = 'Plugins/' + fixPathSep(path.relative(fs.realpathSync(project.plugins_dir),
trueSrc));
     } else {
         project_ref = 'Plugins/' + fixPathSep(path.relative(project.plugins_dir, destFile));
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message