You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/09/15 18:16:36 UTC
[1/4] android commit: Update JS snapshot to version 3.7.0-dev (via
coho)
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x be01ce03d -> 4c1efe7ad
Update JS snapshot to version 3.7.0-dev (via coho)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f2214418
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f2214418
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f2214418
Branch: refs/heads/4.0.x
Commit: f2214418774572829fbbc4484bff03bd34ccc5a7
Parents: f2e8c00
Author: Marcel Kinard <cm...@gmail.com>
Authored: Fri Sep 12 16:01:27 2014 -0400
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Fri Sep 12 16:34:06 2014 -0400
----------------------------------------------------------------------
framework/assets/www/cordova.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f2214418/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index 3838e63..c9e6935 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 3.7.0-dev-8f41e8d
+// 3.7.0-dev-1258511
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-8f41e8d';
+var CORDOVA_JS_BUILD_LABEL = '3.7.0-dev-1258511';
// file: src/scripts/require.js
/*jshint -W079 */
[2/4] android commit: Fix invalid syntax (missing + in multiline
string)
Posted by ia...@apache.org.
Fix invalid syntax (missing + in multiline string)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f9b89e98
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f9b89e98
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f9b89e98
Branch: refs/heads/4.0.x
Commit: f9b89e98c28393625dc00296ab95a55d953b6ff7
Parents: f221441
Author: Michal Mocny <mm...@gmail.com>
Authored: Fri Sep 12 17:00:29 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 15 10:34:43 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/emulator.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f9b89e98/bin/templates/cordova/lib/emulator.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/emulator.js b/bin/templates/cordova/lib/emulator.js
index 4c3d451..0b9747d 100644
--- a/bin/templates/cordova/lib/emulator.js
+++ b/bin/templates/cordova/lib/emulator.js
@@ -166,7 +166,7 @@ module.exports.start = function(emulator_ID) {
var androidCmd = check_reqs.getAbsoluteAndroidCmd();
return Q.reject('ERROR : No emulator images (avds) found.\n' +
'1. Download desired System Image by running: ' + androidCmd + ' sdk\n' +
- '2. Create an AVD by running: ' + androidCmd + ' avd\n'
+ '2. Create an AVD by running: ' + androidCmd + ' avd\n' +
'HINT: For a faster emulator, use an Intel System Image and install the HAXM device driver\n');
}
});
[4/4] android commit: Merge branch 'master' into 4.0.x
Posted by ia...@apache.org.
Merge branch 'master' into 4.0.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/4c1efe7a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/4c1efe7a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/4c1efe7a
Branch: refs/heads/4.0.x
Commit: 4c1efe7ad4e72e5446f7cd5c2ca038bc58f3f4a7
Parents: be01ce0 4be92f2
Author: Ian Clelland <ic...@chromium.org>
Authored: Mon Sep 15 12:16:03 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Mon Sep 15 12:16:03 2014 -0400
----------------------------------------------------------------------
bin/templates/project/cordova.gradle | 29 +++++++++++++----------------
framework/assets/www/cordova.js | 4 ++--
2 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
[3/4] android commit: CB-7512: Fix logic for detecting SDK directory
Posted by ia...@apache.org.
CB-7512: Fix logic for detecting SDK directory
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/4be92f28
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/4be92f28
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/4be92f28
Branch: refs/heads/4.0.x
Commit: 4be92f285a7c9a793815456860e33dad3eb76d03
Parents: f9b89e9
Author: Ian Clelland <ic...@chromium.org>
Authored: Mon Sep 15 12:15:32 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Mon Sep 15 12:15:32 2014 -0400
----------------------------------------------------------------------
bin/templates/project/cordova.gradle | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/4be92f28/bin/templates/project/cordova.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index f552a47..6c7d0ab 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -84,9 +84,13 @@ int compareVersions(String a, String b) {
String getAndroidSdkDir() {
def rootDir = project.rootDir
+ def androidSdkDir = null
+ String envVar = System.getenv("ANDROID_HOME")
def localProperties = new File(rootDir, 'local.properties')
- def androidSdkDir = ""
- if (localProperties.exists()) {
+ String systemProperty = System.getProperty("android.home")
+ if (envVar != null) {
+ androidSdkDir = envVar
+ } else if (localProperties.exists()) {
Properties properties = new Properties()
localProperties.withInputStream { instr ->
properties.load(instr)
@@ -98,23 +102,16 @@ String getAndroidSdkDir() {
sdkDirProp = properties.getProperty('android.dir')
if (sdkDirProp != null) {
androidSdkDir = (new File(rootDir, sdkDirProp)).getAbsolutePath()
- } else {
- throw new RuntimeException(
- "No sdk.dir property defined in local.properties file.")
- }
- }
- } else {
- String envVar = System.getenv("ANDROID_HOME")
- if (envVar != null) {
- androidSdkDir = envVar
- } else {
- String property = System.getProperty("android.home")
- if (property != null) {
- androidSdkDir = property
}
}
}
- println androidSdkDir
+ if (androidSdkDir == null && systemProperty != null) {
+ androidSdkDir = systemProperty
+ }
+ if (androidSdkDir == null) {
+ throw new RuntimeException(
+ "Unable to determine Android SDK directory.")
+ }
androidSdkDir
}