cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [2/3] android commit: Do not test for non-existent build folder
Date Thu, 03 Nov 2016 19:49:52 GMT
Do not test for non-existent build folder

This closes #348


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

Branch: refs/heads/6.1.x
Commit: 94e9bd5e263d677de0791107a62761a859a33fbd
Parents: 011b57d
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Thu Nov 3 10:57:41 2016 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Thu Nov 3 12:49:30 2016 -0700

----------------------------------------------------------------------
 bin/templates/cordova/lib/AndroidStudio.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/94e9bd5e/bin/templates/cordova/lib/AndroidStudio.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/AndroidStudio.js b/bin/templates/cordova/lib/AndroidStudio.js
index 3b1e3d4..335b334 100644
--- a/bin/templates/cordova/lib/AndroidStudio.js
+++ b/bin/templates/cordova/lib/AndroidStudio.js
@@ -12,7 +12,7 @@ var CordovaError = require('cordova-common').CordovaError;
 
 module.exports.isAndroidStudioProject = function isAndroidStudioProject(root) {
     var eclipseFiles = ['AndroidManifest.xml', 'libs', 'res', 'project.properties', 'platform_www'];
-    var androidStudioFiles = ['app', 'gradle', 'build', 'app/src/main/res'];
+    var androidStudioFiles = ['app', 'gradle', 'app/src/main/res'];
 
     // assume it is an AS project and not an Eclipse project
     var isEclipse = false;
@@ -33,6 +33,7 @@ module.exports.isAndroidStudioProject = function isAndroidStudioProject(root)
{
     if(!isEclipse) {
         androidStudioFiles.forEach(function(file){
             if(!fs.existsSync(path.join(root, file))) {
+                console.log('missing file :: ' + file);
                 isAS = false;
             }
         });


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


Mime
View raw message