github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 12:03:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-11244: Changing directory creation, will most likely hide this behind a flag for the next release of Cordova-Android, and then make it default in the next major pending feedback

Browse Source
This commit is contained in:
Joe Bowser 2017-01-04 11:48:18 -08:00
parent 69260fb96a
commit a216f0db75
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/lib/create.js
View File

@ -276,6 +276,7 @@ exports.create = function(project_path, config, options, events) {
copyJsAndLibrary(project_path, options.link, safe_activity_name); copyJsAndLibrary(project_path, options.link, safe_activity_name);
//Set up ther Android Studio paths //Set up ther Android Studio paths
var app_path = path.join(project_path, 'app', 'src', 'main');
var java_path = path.join(app_path, 'java'); var java_path = path.join(app_path, 'java');
var assets_path = path.join(app_path, 'assets'); var assets_path = path.join(app_path, 'assets');
var resource_path = path.join(app_path, 'res'); var resource_path = path.join(app_path, 'res');
@ -285,8 +286,9 @@ exports.create = function(project_path, config, options, events) {
// interpolate the activity name and package // interpolate the activity name and package
var packagePath = package_name.replace(/\./g, path.sep); var packagePath = package_name.replace(/\./g, path.sep);
var activity_dir = path.join(project_path, 'src', packagePath); var activity_dir = path.join(java_path, packagePath);
var activity_path = path.join(activity_dir, safe_activity_name + '.java'); var activity_path = path.join(activity_dir, safe_activity_name + '.java');
shell.mkdir('-p', activity_dir); shell.mkdir('-p', activity_dir);
shell.cp('-f', path.join(project_template_dir, 'Activity.java'), activity_path); shell.cp('-f', path.join(project_template_dir, 'Activity.java'), activity_path);
shell.sed('-i', /__ACTIVITY__/, safe_activity_name, activity_path); shell.sed('-i', /__ACTIVITY__/, safe_activity_name, activity_path);
@ -298,7 +300,7 @@ exports.create = function(project_path, config, options, events) {
.setTargetSdkVersion(target_api.split('-')[1]) .setTargetSdkVersion(target_api.split('-')[1])
.getActivity().setName(safe_activity_name); .getActivity().setName(safe_activity_name);
var manifest_path = path.join(project_path, 'AndroidManifest.xml'); var manifest_path = path.join(app_path, 'AndroidManifest.xml');
manifest.write(manifest_path); manifest.write(manifest_path);
copyScripts(project_path); copyScripts(project_path);