github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-5793 Add work-around for library references not working with custom output directory (ugh).

Browse Source
This commit is contained in:
Andrew Grieve
2014-01-21 15:09:15 -05:00
parent 7094047b3d
commit f83d7a7cd1
4 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/lib/create.js
+7
View File
@@ -87,6 +87,11 @@ function runAndroidUpdate(projectPath, target_api, shared) {
return exec('android update project --subprojects --path "' + projectPath + '" --target ' + target_api + ' --library "' + path.relative(projectPath, targetFrameworkDir) + '"');
}
function copyAntRules(projectPath) {
var srcDir = path.join(ROOT, 'bin', 'templates', 'project');
shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
}
function copyScripts(projectPath) {
var srcScriptsDir = path.join(ROOT, 'bin', 'templates', 'cordova');
var destScriptsDir = path.join(projectPath, 'cordova');
@@ -186,6 +191,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
shell.sed('-i', /__PACKAGE__/, package_name, manifest_path);
shell.sed('-i', /__APILEVEL__/, target_api.split('-')[1], manifest_path);
copyScripts(project_path);
copyAntRules(project_path);
});
// Link it to local android install.
return runAndroidUpdate(project_path, target_api, use_shared_project);
@@ -209,6 +215,7 @@ exports.updateProject = function(projectPath) {
var target_api = check_reqs.get_target();
copyJsAndLibrary(projectPath, false, null);
copyScripts(projectPath);
copyAntRules(projectPath);
removeDebuggableFromManifest(projectPath);
return runAndroidUpdate(projectPath, target_api, false)
.then(function() {