mirror of
https://github.com/apache/cordova-android.git
synced 2025-02-01 02:12:58 +08:00
Fixes to the update command so it doesn't delete anything other than build artifacts
This commit is contained in:
parent
68bc57ae85
commit
fbf7f1c3f9
23
bin/update
23
bin/update
@ -45,10 +45,6 @@ fi
|
|||||||
|
|
||||||
# cleanup after exit and/or on error
|
# cleanup after exit and/or on error
|
||||||
function on_exit {
|
function on_exit {
|
||||||
if [ -f "$BUILD_PATH"/framework/assets/www/cordova.js ]
|
|
||||||
then
|
|
||||||
rm "$BUILD_PATH"/framework/assets/www/cordova.js
|
|
||||||
fi
|
|
||||||
if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ]
|
if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ]
|
||||||
then
|
then
|
||||||
rm "$BUILD_PATH"/framework/cordova-$VERSION.jar
|
rm "$BUILD_PATH"/framework/cordova-$VERSION.jar
|
||||||
@ -103,16 +99,6 @@ 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.7.jar ]; then
|
|
||||||
# Use curl to get the jar (TODO: Support Apache Mirrors)
|
|
||||||
curl -OL http://archive.apache.org/dist/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.7/commons-codec-1.7.jar "$BUILD_PATH"/framework/libs
|
|
||||||
# cleanup yo
|
|
||||||
rm commons-codec-1.7-bin.zip && rm -rf commons-codec-1.7
|
|
||||||
fi
|
|
||||||
|
|
||||||
# compile cordova.js and cordova.jar
|
# compile cordova.js and cordova.jar
|
||||||
(cd "$BUILD_PATH"/framework && ant jar &> /dev/null )
|
(cd "$BUILD_PATH"/framework && ant jar &> /dev/null )
|
||||||
fi
|
fi
|
||||||
@ -128,14 +114,17 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# creating cordova folder and copying run/build/log/launch scripts
|
# creating cordova folder and copying run/build/log/launch scripts
|
||||||
mkdir "$PROJECT_PATH"/cordova
|
if [ ! -e "$PROJECT_PATH/cordova" ]
|
||||||
mkdir "$PROJECT_PATH"/cordova/lib
|
then
|
||||||
|
mkdir "$PROJECT_PATH"/cordova
|
||||||
|
mkdir "$PROJECT_PATH"/cordova/lib
|
||||||
|
fi
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/appinfo.jar "$PROJECT_PATH"/cordova/appinfo.jar
|
cp "$BUILD_PATH"/bin/templates/cordova/appinfo.jar "$PROJECT_PATH"/cordova/appinfo.jar
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/build "$PROJECT_PATH"/cordova/build
|
cp "$BUILD_PATH"/bin/templates/cordova/build "$PROJECT_PATH"/cordova/build
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/clean "$PROJECT_PATH"/cordova/clean
|
cp "$BUILD_PATH"/bin/templates/cordova/clean "$PROJECT_PATH"/cordova/clean
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/log "$PROJECT_PATH"/cordova/log
|
cp "$BUILD_PATH"/bin/templates/cordova/log "$PROJECT_PATH"/cordova/log
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/run "$PROJECT_PATH"/cordova/run
|
cp "$BUILD_PATH"/bin/templates/cordova/run "$PROJECT_PATH"/cordova/run
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/lib/cordova "$PROJECT_PATH"/cordova/lib/cordova
|
cp "$BUILD_PATH"/bin/templates/cordova/lib/cordova.js "$PROJECT_PATH"/cordova/lib/cordova.js
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/lib/install-device "$PROJECT_PATH"/cordova/lib/install-device
|
cp "$BUILD_PATH"/bin/templates/cordova/lib/install-device "$PROJECT_PATH"/cordova/lib/install-device
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/lib/install-emulator "$PROJECT_PATH"/cordova/lib/install-emulator
|
cp "$BUILD_PATH"/bin/templates/cordova/lib/install-emulator "$PROJECT_PATH"/cordova/lib/install-emulator
|
||||||
cp "$BUILD_PATH"/bin/templates/cordova/lib/list-devices "$PROJECT_PATH"/cordova/lib/list-devices
|
cp "$BUILD_PATH"/bin/templates/cordova/lib/list-devices "$PROJECT_PATH"/cordova/lib/list-devices
|
||||||
|
Loading…
Reference in New Issue
Block a user