You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2012/09/17 22:27:00 UTC
[2/2] android commit: Updating commons-codec
Updating commons-codec
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/9ba5bae3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/9ba5bae3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/9ba5bae3
Branch: refs/heads/master
Commit: 9ba5bae34d26fe9e99ceb6e016ff3c547aebd251
Parents: dbfa2d7
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Sep 17 09:44:47 2012 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Sep 17 09:44:47 2012 -0700
----------------------------------------------------------------------
bin/create | 10 +++++-----
bin/create.js | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9ba5bae3/bin/create
----------------------------------------------------------------------
diff --git a/bin/create b/bin/create
index b8ab39e..de06cc7 100755
--- a/bin/create
+++ b/bin/create
@@ -94,14 +94,14 @@ then
# update the cordova-android framework for the desired target
$ANDROID_BIN update project --target $TARGET --path "$BUILD_PATH"/framework &> /dev/null
- if [ ! -e "$BUILD_PATH"/framework/libs/commons-codec-1.6.jar ]; then
+ if [ ! -e "$BUILD_PATH"/framework/libs/commons-codec-1.7.jar ]; then
# Use curl to get the jar (TODO: Support Apache Mirrors)
- curl -OL http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip &> /dev/null
- unzip commons-codec-1.6-bin.zip &> /dev/null
+ curl -OL http://apache.osuosl.org/commons/codec/binaries/commons-codec-1.7-bin.zip &> /dev/null
+ unzip commons-codec-1.7-bin.zip &> /dev/null
mkdir -p "$BUILD_PATH"/framework/libs
- cp commons-codec-1.6/commons-codec-1.6.jar "$BUILD_PATH"/framework/libs
+ cp commons-codec-1.7/commons-codec-1.7.jar "$BUILD_PATH"/framework/libs
# cleanup yo
- rm commons-codec-1.6-bin.zip && rm -rf commons-codec-1.6
+ rm commons-codec-1.7-bin.zip && rm -rf commons-codec-1.7
fi
# compile cordova.js and cordova.jar
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/9ba5bae3/bin/create.js
----------------------------------------------------------------------
diff --git a/bin/create.js b/bin/create.js
index e0886f6..d08585d 100644
--- a/bin/create.js
+++ b/bin/create.js
@@ -68,11 +68,11 @@ function cleanup() {
}
function downloadCommonsCodec() {
- if (!fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.6.jar')) {
+ if (!fso.FileExists(ROOT + '\\framework\\libs\\commons-codec-1.7.jar')) {
// We need the .jar
- var url = 'http://mirror.symnds.com/software/Apache//commons/codec/binaries/commons-codec-1.6-bin.zip';
+ var url = 'http://apache.osuosl.org/commons/codec/binaries/commons-codec-1.7-bin.zip';
var libsPath = ROOT + '\\framework\\libs';
- var savePath = libsPath + '\\commons-codec-1.6-bin.zip';
+ var savePath = libsPath + '\\commons-codec-1.7-bin.zip';
if (!fso.FileExists(savePath)) {
if(!fso.FolderExists(ROOT + '\\framework\\libs')) {
fso.CreateFolder(libsPath);
@@ -94,16 +94,16 @@ function downloadCommonsCodec() {
}
}
var app = WScript.CreateObject('Shell.Application');
- var source = app.NameSpace(savePath).Items();
+ var ource = app.NameSpace(savePath).Items();
var target = app.NameSpace(ROOT + '\\framework\\libs');
target.CopyHere(source, 256);
// Move the jar into libs
- fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.6\\commons-codec-1.6.jar', ROOT + '\\framework\\libs\\commons-codec-1.6.jar');
+ fso.MoveFile(ROOT + '\\framework\\libs\\commons-codec-1.6\\commons-codec-1.7.jar', ROOT + '\\framework\\libs\\commons-codec-1.7.jar');
// Clean up
- fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.6-bin.zip');
- fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.6', true);
+ fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.7-bin.zip');
+ fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.7', true);
}
}