cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject android commit: [CB-3307] Fixing bin/create script due to cordova-$VERSION.js -> cordova.js change.
Date Mon, 13 May 2013 14:33:19 GMT
Updated Branches:
  refs/heads/master a001d8cfb -> 8bfd45c09


[CB-3307] Fixing bin/create script due to cordova-$VERSION.js -> cordova.js change.


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

Branch: refs/heads/master
Commit: 8bfd45c095c49ff6e5674892b07f3f1e83ff7312
Parents: a001d8c
Author: Michal Mocny <mmocny@gmail.com>
Authored: Mon May 13 10:19:29 2013 -0400
Committer: Michal Mocny <mmocny@gmail.com>
Committed: Mon May 13 10:30:02 2013 -0400

----------------------------------------------------------------------
 bin/create |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8bfd45c0/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index b7e96b4..39aff6b 100755
--- a/bin/create
+++ b/bin/create
@@ -47,20 +47,6 @@ then
     exit 1
 fi
 
-# cleanup after exit and/or on error
-function on_exit {
-    # [ -f "$BUILD_PATH"/framework/libs/commons-codec-1.6.jar ] && rm "$BUILD_PATH"/framework/libs/commons-codec-1.6.jar
-    # [ -d "$BUILD_PATH"/framework/libs ] && rmdir "$BUILD_PATH"/framework/libs
-    if [ -f "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js ]
-    then
-        rm "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js
-    fi
-    if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ]
-    then
-        rm "$BUILD_PATH"/framework/cordova-$VERSION.jar
-    fi
-}
-
 function createAppInfoJar {
     pushd "$BUILD_PATH"/bin/templates/cordova/ApplicationInfo > /dev/null
     javac ApplicationInfo.java
@@ -91,7 +77,6 @@ function replace {
 # we do not want the script to silently fail
 trap 'previous_command=$this_command; this_command=$BASH_COMMAND' DEBUG
 trap on_error ERR
-trap on_exit EXIT
 
 ANDROID_BIN="${ANDROID_BIN:=$( which android )}"
 PACKAGE_AS_PATH=$(echo $PACKAGE | sed 's/\./\//g')
@@ -141,11 +126,11 @@ cp -r "$BUILD_PATH"/bin/templates/project/res "$PROJECT_PATH"
 if [ -d "$BUILD_PATH"/framework ]
 then
     cp -r "$BUILD_PATH"/framework/res/xml "$PROJECT_PATH"/res
-    cp "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+    cp "$BUILD_PATH"/framework/assets/www/cordova.js "$PROJECT_PATH"/assets/www/cordova.js
     cp "$BUILD_PATH"/framework/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
 else
     cp -r "$BUILD_PATH"/xml "$PROJECT_PATH"/res/xml
-    cp "$BUILD_PATH"/cordova-$VERSION.js "$PROJECT_PATH"/assets/www/cordova-$VERSION.js
+    cp "$BUILD_PATH"/cordova.js "$PROJECT_PATH"/assets/www/cordova.js
     cp "$BUILD_PATH"/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
 fi
 


Mime
View raw message