cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eymor...@apache.org
Subject [02/28] ios commit: CB-10773 Correct FRAMEWORKS_SEARCH_PATHS on win32
Date Mon, 04 Apr 2016 16:26:58 GMT
CB-10773 Correct FRAMEWORKS_SEARCH_PATHS on win32

 This closes #201


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

Branch: refs/heads/4.1.x
Commit: af5a5d86059d68d5011c557c215a0d785620453d
Parents: ef5eff4
Author: Vladimir Kotikov <v-vlkoti@microsoft.com>
Authored: Sat Mar 5 13:22:10 2016 +0300
Committer: Edna Morales <edna592@gmail.com>
Committed: Wed Mar 9 17:08:11 2016 -0500

----------------------------------------------------------------------
 bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/af5a5d86/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js b/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
index 173ce14..e5b2330 100644
--- a/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
+++ b/bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js
@@ -83,7 +83,8 @@ var handlers = {
             if (fs.existsSync(targetDir)) throw new CordovaError('target destination "' +
targetDir + '" already exists');
             shell.mkdir('-p', path.dirname(targetDir));
             shell.cp('-R', srcFile, path.dirname(targetDir)); // frameworks are directories
-            var project_relative = path.relative(project.projectDir, targetDir);
+            // CB-10773 translate back slashes to forward on win32
+            var project_relative = fixPathSep(path.relative(project.projectDir, targetDir));
             var pbxFile = project.xcode.addFramework(project_relative, {customFramework:
true});
             if (pbxFile) {
                 project.xcode.addToPbxEmbedFrameworksBuildPhase(pbxFile);
@@ -107,7 +108,7 @@ var handlers = {
                 return;
             }
 
-            var targetDir = path.resolve(project.plugins_dir, plugin.id, path.basename(src)),
+            var targetDir = fixPathSep(path.resolve(project.plugins_dir, plugin.id, path.basename(src))),
                 pbxFile = project.xcode.removeFramework(targetDir, {customFramework: true});
             if (pbxFile) {
                 project.xcode.removeFromPbxEmbedFrameworksBuildPhase(pbxFile);


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


Mime
View raw message