cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgreb...@apache.org
Subject [1/2] android commit: CB-6511 Fixes build for android when app name contains unicode characters.
Date Mon, 29 Sep 2014 08:24:47 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/3.6.x e2e38ad2b -> 1c3f7e6f9


CB-6511 Fixes build for android when app name contains unicode characters.


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

Branch: refs/heads/3.6.x
Commit: e65bfa41a5185dd0ce726081e1fef68c258f906b
Parents: e2e38ad
Author: Vladimir Kotikov <v-vlkoti@microsoft.com>
Authored: Tue Sep 23 13:21:17 2014 +0400
Committer: Vladimir Kotikov <v-vlkoti@microsoft.com>
Committed: Fri Sep 26 11:59:05 2014 +0400

----------------------------------------------------------------------
 bin/lib/create.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e65bfa41/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index c4c6f1b..e38acc5 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -210,9 +210,11 @@ exports.createProject = function(project_path, package_name, project_name,
proje
                            project_template_dir : 
                            path.join(ROOT, 'bin', 'templates', 'project');
 
-    var safe_activity_name = project_name.replace(/\W/g, '');
     var package_as_path = package_name.replace(/\./g, path.sep);
     var activity_dir    = path.join(project_path, 'src', package_as_path);
+    // safe_activity_name is being hardcoded to avoid issues with unicode app name (https://issues.apache.org/jira/browse/CB-6511)
+    // TODO: provide option to specify activity name via CLI (proposal: https://issues.apache.org/jira/browse/CB-7231)
+    var safe_activity_name = "CordovaApp";
     var activity_path   = path.join(activity_dir, safe_activity_name + '.java');
     var target_api      = check_reqs.get_target();
     var manifest_path   = path.join(project_path, 'AndroidManifest.xml');


Mime
View raw message