cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [12/19] android commit: CB-3445 Add .gradle template files for "update" as well as "create"
Date Tue, 19 Aug 2014 16:03:18 GMT
CB-3445 Add .gradle template files for "update" as well as "create"


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

Branch: refs/heads/4.0.x
Commit: 36eab713a1837f315dc1719314d8370f1d5207f3
Parents: 7133576
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Mon Aug 18 14:50:27 2014 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Mon Aug 18 14:50:27 2014 -0400

----------------------------------------------------------------------
 bin/lib/create.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/36eab713/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 312881c..d1f43e6 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -88,11 +88,13 @@ 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) {
+function copyBuildRules(projectPath) {
     var srcDir = path.join(ROOT, 'bin', 'templates', 'project');
-    if (fs.existsSync(path.join(srcDir, 'custom_rules.xml'))) {
-        shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
-    }
+    shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
+
+    shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
+    shell.cp('-f', path.join(srcDir, 'libraries.gradle'), projectPath);
+    shell.cp('-f', path.join(srcDir, 'settings.gradle'), projectPath);
 }
 
 function copyScripts(projectPath) {
@@ -263,7 +265,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);
+            copyBuildRules(project_path);
         });
         // Link it to local android install.
         return runAndroidUpdate(project_path, target_api, use_shared_project);
@@ -298,7 +300,7 @@ exports.updateProject = function(projectPath) {
         var target_api = check_reqs.get_target();
         copyJsAndLibrary(projectPath, false, projectName);
         copyScripts(projectPath);
-        copyAntRules(projectPath);
+        copyBuildRules(projectPath);
         removeDebuggableFromManifest(projectPath);
         return runAndroidUpdate(projectPath, target_api, false)
         .then(function() {


Mime
View raw message