cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [1/2] android commit: Don't show warning when prepEnv copies gradlew and it's read-only
Date Thu, 23 Apr 2015 19:39:03 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master bca7f62ef -> 85877d259


Don't show warning when prepEnv copies gradlew and it's read-only


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

Branch: refs/heads/master
Commit: 0b86db874823d84a773e6ccd48ec3ba11a7cd557
Parents: bca7f62
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Thu Apr 23 15:34:25 2015 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Apr 23 15:34:25 2015 -0400

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0b86db87/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index d427057..b4ab487 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -305,9 +305,11 @@ var builders = {
                 var sdkDir = process.env['ANDROID_HOME'];
                 var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
                 if (process.platform == 'win32') {
-                    shell.cp('-f', path.join(wrapperDir, 'gradlew.bat'), projectPath);
+                    shell.rm('-f', path.join(wrapperDir, 'gradlew.bat'), projectPath);
+                    shell.cp(path.join(wrapperDir, 'gradlew.bat'), projectPath);
                 } else {
-                    shell.cp('-f', path.join(wrapperDir, 'gradlew'), projectPath);
+                    shell.rm('-f', path.join(wrapperDir, 'gradlew'), projectPath);
+                    shell.cp(path.join(wrapperDir, 'gradlew'), projectPath);
                 }
                 shell.rm('-rf', path.join(projectPath, 'gradle', 'wrapper'));
                 shell.mkdir('-p', path.join(projectPath, 'gradle'));


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message