cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject [04/50] git commit: Update to check for Google Glass APIs
Date Thu, 28 Aug 2014 19:03:18 GMT
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-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/811724d4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/811724d4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/811724d4

Branch: refs/heads/master
Commit: 811724d41f0ba63a32715514367a5dff76ed97bd
Parents: 7da4322
Author: Matt Ray <themattray@gmail.com>
Authored: Thu May 8 15:37:09 2014 -0400
Committer: Archana Naik <naika@lab126.com>
Committed: Wed Jul 30 18:06:33 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/811724d4/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 327e7e6..e8df92a 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -37,6 +37,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