cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject android commit: Update to check for Google Glass APIs
Date Mon, 14 Jul 2014 14:30:29 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 0a3714e5e -> 62101e85f


Update to check for Google Glass APIs

This prevents the 'cordova build android' process from blowing up on this step if you assign
the GDK as the target and want to rebuild via the CLI.

close #100


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

Branch: refs/heads/master
Commit: 62101e85ffeed6620ae940f76cf51149aec54cf2
Parents: 0a3714e
Author: Matt Ray <themattray@gmail.com>
Authored: Thu May 8 15:37:09 2014 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Mon Jul 14 10:30:23 2014 -0400

----------------------------------------------------------------------
 bin/lib/check_reqs.js | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/62101e85/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 91875f5..a4ad3ad 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -36,6 +36,10 @@ module.exports.get_target = function() {
         // this is called on the project itself, and can support Google APIs AND Vanilla
Android
         var target = shell.grep(/target=android-[\d+]/, path.join(ROOT, 'project.properties'))
||
           shell.grep(/target=Google Inc.:Google APIs:[\d+]/, path.join(ROOT, 'project.properties'));
+        if(target == "" || !target) {
+          // Try Google Glass APIs
+          target = shell.grep(/target=Google Inc.:Glass Development Kit Preview:[\d+]/, path.join(ROOT,
'project.properties'));
+        }
         return target.split('=')[1].replace('\n', '').replace('\r', '');
     }
 }


Mime
View raw message