github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 00:32:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use pushd/popd instead of subshell

Browse Source 
Improves the error message that happens when ant is not installed.
This commit is contained in:
Dave E 2013-02-24 02:56:05 +00:00 committed by Andrew Grieve
parent 0f70e04e6e
commit ee38b2ef03
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/create
View File

@ -59,10 +59,10 @@ function on_exit {
} }
function createAppInfoJar { function createAppInfoJar {
(cd "$BUILD_PATH"/bin/templates/cordova/ApplicationInfo && pushd "$BUILD_PATH"/bin/templates/cordova/ApplicationInfo > /dev/null
javac ApplicationInfo.java && javac ApplicationInfo.java
jar -cfe ../appinfo.jar ApplicationInfo ApplicationInfo.class jar -cfe ../appinfo.jar ApplicationInfo ApplicationInfo.class
) popd > /dev/null
} }
function on_error { function on_error {
@ -108,7 +108,7 @@ fi
# if this a distribution release no need to build a jar # if this a distribution release no need to build a jar
if [ ! -e "$BUILD_PATH"/cordova-$VERSION.jar ] && [ -d "$BUILD_PATH"/framework ] if [ ! -e "$BUILD_PATH"/cordova-$VERSION.jar ] && [ -d "$BUILD_PATH"/framework ]
then 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 if [ ! -e "$BUILD_PATH"/framework/libs/commons-codec-1.7.jar ]; then
@ -121,8 +121,10 @@ then
rm commons-codec-1.7-bin.zip && rm -rf commons-codec-1.7 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
(cd "$BUILD_PATH"/framework && ant jar &> /dev/null ) pushd "$BUILD_PATH"/framework > /dev/null
ant jar > /dev/null
popd > /dev/null
fi fi
# create new android project # create new android project