cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kam...@apache.org
Subject git commit: CB-6992 Fix ios platform add/prepare when app name contains unicode chars
Date Thu, 03 Jul 2014 16:43:59 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 7fc66be7c -> 9bb739e1c


CB-6992 Fix ios platform add/prepare when app name contains unicode chars

It is necessary to normalize characters because node and shell scripts handles
unicode symbols differently.

github: close #40


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

Branch: refs/heads/master
Commit: 9bb739e1cca095613ac656fc562cabe1c6f2af11
Parents: 7fc66be
Author: Vladimir Kotikov <v-vlkoti@microsoft.com>
Authored: Mon Jun 23 17:36:54 2014 +0400
Committer: Mark Koudritsky <kamrik@gmail.com>
Committed: Thu Jul 3 12:18:11 2014 -0400

----------------------------------------------------------------------
 cordova-lib/package.json                       | 3 ++-
 cordova-lib/src/cordova/metadata/ios_parser.js | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9bb739e1/cordova-lib/package.json
----------------------------------------------------------------------
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 779aaf9..71bb362 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -35,7 +35,8 @@
     "tar": "0.1.x",
     "underscore": "1.4.4",
     "xcode": "0.6.6",
-    "cordova-js": "3.x.x"
+    "cordova-js": "3.x.x",
+    "unorm": ">=1.3"
   },
   "devDependencies": {
     "temp": "0.6.x",

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9bb739e1/cordova-lib/src/cordova/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/ios_parser.js b/cordova-lib/src/cordova/metadata/ios_parser.js
index 972c05a..48308ee 100644
--- a/cordova-lib/src/cordova/metadata/ios_parser.js
+++ b/cordova-lib/src/cordova/metadata/ios_parser.js
@@ -23,6 +23,7 @@
 */
 
 var fs            = require('fs'),
+    unorm         = require('unorm'),
     path          = require('path'),
     xcode         = require('xcode'),
     util          = require('../util'),
@@ -39,11 +40,14 @@ module.exports = function ios_parser(project) {
         if (!xcodeproj_dir) throw new CordovaError('The provided path "' + project + '" is
not a Cordova iOS project.');
         this.xcodeproj = path.join(project, xcodeproj_dir);
         this.originalName = this.xcodeproj.substring(this.xcodeproj.lastIndexOf(path.sep)+1,
this.xcodeproj.indexOf('.xcodeproj'));
+        // CB-6992 it is necessary to normalize characters
+        // because node and shell scripts handles unicode symbols differently
+        this.originalName = unorm.nfd(this.originalName);
         this.cordovaproj = path.join(project, this.originalName);
     } catch(e) {
         throw new CordovaError('The provided path "'+project+'" is not a Cordova iOS project.');
     }
-    this.path = project;
+    this.path = unorm.nfd(project);
     this.pbxproj = path.join(this.xcodeproj, 'project.pbxproj');
     this.config_path = path.join(this.cordovaproj, 'config.xml');
 };


Mime
View raw message