Repository: cordova-android Updated Branches: refs/heads/4.0.x 2af8daff1 -> 7ad16e5b0 refs/heads/master fbeb379f1 -> 9f4190689
CB-6511 Fixes build for android when app name contains unicode characters. github: close #124 Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/9f419068 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/9f419068 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/9f419068 Branch: refs/heads/4.0.x Commit: 9f4190689567e48f16d62440ce18d9978a2ce5b6 Parents: fbeb379 Author: Vladimir Kotikov <[email protected]> Authored: Tue Sep 23 13:21:17 2014 +0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Oct 7 15:24:12 2014 -0400 ---------------------------------------------------------------------- bin/lib/create.js | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9f419068/bin/lib/create.js ---------------------------------------------------------------------- diff --git a/bin/lib/create.js b/bin/lib/create.js index f9c4224..c0d0c50 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 = 'MainActivity'; 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'); http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9f419068/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index a61927a..a152ceb 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ ], "scripts": { "test": "jasmine-node --color spec", - "test-build": "rm -rf \"test create\"; ./bin/create \"test create\" com.test.app Test && \"./test create/cordova/build\" && rm -rf \"test create\"" + "test-build": "rm -rf \"test create\"; ./bin/create \"test create\" com.test.app å¿ç¨ && \"./test create/cordova/build\" && rm -rf \"test create\"" }, "author": "Apache Software Foundation", "license": "Apache version 2.0", --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
