public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android

Browse Source
This commit is contained in:
Joe Bowser 2013-06-14 15:29:51 -07:00
commit b679672c0e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/create
View File

@ -144,7 +144,6 @@ 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/run "$PROJECT_PATH"/cordova/run
cp "$BUILD_PATH"/bin/templates/cordova/version "$PROJECT_PATH"/cordova/version
cp "$BUILD_PATH"/bin/templates/cordova/lib/cordova "$PROJECT_PATH"/cordova/lib/cordova
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/list-devices "$PROJECT_PATH"/cordova/lib/list-devices

18
bin/templates/cordova/run
View File

@ -76,11 +76,11 @@ function wait_for_emulator {
if [[ "$#" -eq 2 ]] ; then
$DIR/build $2
if [[ $1 == "--device" ]] ; then
$DIR/lib/install_device
$DIR/lib/install-device
elif [[ $1 == "--emulator" ]] ; then
$DIR/lib/install_emulator
$DIR/lib/install-emulator
elif [[ $1 =~ "--target=" ]]; then
$DIR/lib/install_device $1
$DIR/lib/install-device $1
else
echo "Error : '$1' is not recognized as an install option"
fi
@ -89,13 +89,13 @@ elif [[ "$#" -eq 1 ]] ; then
$DIR/build $1
elif [[ $1 == "--device" ]] ; then
$DIR/build
$DIR/lib/install_device
$DIR/lib/install-device
elif [[ $1 == "--emulator" ]] ; then
$DIR/build
$DIR/lib/install_emulator
$DIR/lib/install-emulator
elif [[ $1 =~ "--target=" ]]; then
$DIR/build
$DIR/lib/install_device $1
$DIR/lib/install-device $1
else
echo "Error : '$1' is not recognized as an install option"
fi
@ -104,17 +104,17 @@ else
#$DIR/build
devices=$("$DIR/lib/list-devices")
if [ $? = 0 ]; then
$DIR/lib/install_device
$DIR/lib/install-device
else
emulators=$("$DIR/lib/list-started-emulators")
if [ $? = 0 ] ; then
$DIR/lib/install_emulator
$DIR/lib/install-emulator
else
images=$("$DIR/lib/list-emulator-images")
if [ $? = 0 ] ; then
$DIR/lib/start-emulator
wait_for_emulator
$DIR/lib/install_emulator
$DIR/lib/install-emulator
else
echo "No Android devices attached, nor emulator images available to start. How are we supposed to do this, then?"
exit 2