incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [1/2] android commit: merging conflict with create script
Date Sat, 29 Sep 2012 00:43:45 GMT
Updated Branches:
  refs/heads/master 64c6cbe30 -> d406e2ed2


merging conflict with create script


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

Branch: refs/heads/master
Commit: d406e2ed22dad853e4863b054130df3ebcf0ce73
Parents: 0bfc993 64c6cbe
Author: Anis Kadri <anis.kadri@gmail.com>
Authored: Fri Sep 28 17:43:26 2012 -0700
Committer: Anis Kadri <anis.kadri@gmail.com>
Committed: Fri Sep 28 17:43:26 2012 -0700

----------------------------------------------------------------------
 README.md                                          |    4 +-
 bin/create                                         |   14 +-
 bin/create.js                                      |   36 +-
 bin/tests/test_create_win.js                       |   11 +-
 framework/.classpath                               |    2 +-
 framework/assets/js/cordova.android.js             |  865 ++++++++++++---
 framework/build.xml                                |   40 +-
 framework/res/xml/config.xml                       |    1 +
 .../src/org/apache/cordova/AccelListener.java      |   13 +-
 framework/src/org/apache/cordova/AudioHandler.java |    8 +
 .../src/org/apache/cordova/BatteryListener.java    |    7 +
 .../src/org/apache/cordova/CallbackServer.java     |  380 -------
 .../src/org/apache/cordova/CompassListener.java    |    9 +
 .../org/apache/cordova/CordovaChromeClient.java    |   18 -
 .../src/org/apache/cordova/CordovaWebView.java     |   19 +-
 .../org/apache/cordova/CordovaWebViewClient.java   |   22 +-
 framework/src/org/apache/cordova/DroidGap.java     |    9 +
 framework/src/org/apache/cordova/ExposedJsApi.java |    2 +-
 .../src/org/apache/cordova/FileProgressResult.java |   63 ++
 framework/src/org/apache/cordova/FileTransfer.java |  192 +++-
 .../src/org/apache/cordova/FileUploadResult.java   |   12 +-
 framework/src/org/apache/cordova/FileUtils.java    |   16 +-
 framework/src/org/apache/cordova/GeoBroker.java    |   20 +-
 .../src/org/apache/cordova/Globalization.java      |  579 ++++++++++
 .../src/org/apache/cordova/GlobalizationError.java |  108 ++
 .../org/apache/cordova/NativeToJsMessageQueue.java |   20 +-
 .../src/org/apache/cordova/NetworkManager.java     |   19 +-
 framework/src/org/apache/cordova/Storage.java      |    7 +
 framework/src/org/apache/cordova/TempListener.java |    7 +
 .../org/apache/cordova/api/CordovaInterface.java   |    8 +-
 framework/src/org/apache/cordova/api/IPlugin.java  |    7 +
 .../src/org/apache/cordova/api/LegacyContext.java  |    8 +
 framework/src/org/apache/cordova/api/Plugin.java   |   12 +
 .../src/org/apache/cordova/api/PluginManager.java  |   32 +-
 34 files changed, 1849 insertions(+), 721 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/d406e2ed/bin/create
----------------------------------------------------------------------
diff --cc bin/create
index 8f53524,958a030..e38dd0c
--- a/bin/create
+++ b/bin/create
@@@ -92,8 -92,9 +92,8 @@@ PACKAGE_AS_PATH=$(echo $PACKAGE | sed '
  ACTIVITY_PATH="$PROJECT_PATH"/src/$PACKAGE_AS_PATH/$ACTIVITY.java
  MANIFEST_PATH="$PROJECT_PATH"/AndroidManifest.xml
  
--TARGET=$($ANDROID_BIN list targets | grep id: | tail -1 | cut -f 2 -d ' ' )
- API_LEVEL=$($ANDROID_BIN list target | grep "API level:" | tail -n 1 | cut -f 2 -d ':' |
tr -d ' ')
+ TARGET=$("$ANDROID_BIN" list targets | grep id: | tail -1 | cut -f 2 -d ' ' )
 -API_LEVEL=$("$ANDROID_BIN" list target | grep "API level:" | tail -n 1 | awk '{gsub("  
  API level:", "");print}' | cut -f 2 -d ' ')
++API_LEVEL=$("$ANDROID_BIN" list target | grep "API level:" | tail -n 1 | cut -f 2 -d ':'
| tr -d ' ')
  
  # if this a distribution release no need to build a jar
  if [ ! -e "$BUILD_PATH"/cordova-$VERSION.jar ] && [ -d "$BUILD_PATH"/framework ]


Mime
View raw message