CB-3480: update now uses cordova.js not cordova-<ver>.js

This commit is contained in:
David Kemp 2013-05-23 11:55:05 -04:00 committed by Joe Bowser
parent aa81966e0b
commit f64cd2ee8a

View File

@ -45,9 +45,9 @@ 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-$VERSION.js ] if [ -f "$BUILD_PATH"/framework/assets/www/cordova.js ]
then then
rm "$BUILD_PATH"/framework/assets/www/cordova-$VERSION.js rm "$BUILD_PATH"/framework/assets/www/cordova.js
fi fi
if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ] if [ -f "$BUILD_PATH"/framework/cordova-$VERSION.jar ]
then then
@ -122,10 +122,10 @@ fi
# copy cordova.js, cordova.jar and res/xml # copy cordova.js, cordova.jar and res/xml
if [ -d "$BUILD_PATH"/framework ] if [ -d "$BUILD_PATH"/framework ]
then then
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 cp "$BUILD_PATH"/framework/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
else else
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 cp "$BUILD_PATH"/cordova-$VERSION.jar "$PROJECT_PATH"/libs/cordova-$VERSION.jar
fi fi