Updating commons-codec

This commit is contained in:
Joe Bowser 2012-09-17 09:44:47 -07:00
parent dbfa2d7994
commit 9ba5bae34d
2 changed files with 12 additions and 12 deletions

View File

@ -94,14 +94,14 @@ then
# update the cordova-android framework for the desired target # update the cordova-android framework for the desired target
$ANDROID_BIN update project --target $TARGET --path "$BUILD_PATH"/framework &> /dev/null $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) # 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 curl -OL http://apache.osuosl.org/commons/codec/binaries/commons-codec-1.7-bin.zip &> /dev/null
unzip commons-codec-1.6-bin.zip &> /dev/null unzip commons-codec-1.7-bin.zip &> /dev/null
mkdir -p "$BUILD_PATH"/framework/libs 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 # 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 fi
# compile cordova.js and cordova.jar # compile cordova.js and cordova.jar

View File

@ -68,11 +68,11 @@ function cleanup() {
} }
function downloadCommonsCodec() { 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 // 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 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.FileExists(savePath)) {
if(!fso.FolderExists(ROOT + '\\framework\\libs')) { if(!fso.FolderExists(ROOT + '\\framework\\libs')) {
fso.CreateFolder(libsPath); fso.CreateFolder(libsPath);
@ -94,16 +94,16 @@ function downloadCommonsCodec() {
} }
} }
var app = WScript.CreateObject('Shell.Application'); 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'); var target = app.NameSpace(ROOT + '\\framework\\libs');
target.CopyHere(source, 256); target.CopyHere(source, 256);
// Move the jar into libs // 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 // Clean up
fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.6-bin.zip'); fso.DeleteFile(ROOT + '\\framework\\libs\\commons-codec-1.7-bin.zip');
fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.6', true); fso.DeleteFolder(ROOT + '\\framework\\libs\\commons-codec-1.7', true);
} }
} }