diff options
| author |  borenet <borenet@chromium.org> | 2016-04-04 12:39:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-04 12:39:32 -0700 |
| commit | d0c57a539601b7604a9e5e03370186e75e882c4b (patch) | |
| tree | e3c493f251076f318f329948b2ed09910d4392df /platform_tools/ios | |
| parent | 3c4521a196d7ead2a984826070be377d524c2c51 (diff) | |
Fixes for iOS Swarming bot
BUG=skia:5155
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1855223002
Review URL: https://codereview.chromium.org/1855223002
Diffstat (limited to 'platform_tools/ios')
| -rwxr-xr-x | platform_tools/ios/bin/ios_install | 2 | ||||
| -rwxr-xr-x | platform_tools/ios/bin/ios_ninja | 6 | ||||
| -rwxr-xr-x | platform_tools/ios/bin/ios_setup.sh | 22 |
3 files changed, 20 insertions, 10 deletions
diff --git a/platform_tools/ios/bin/ios_install b/platform_tools/ios/bin/ios_install index 0e0142908b..9b8391a59e 100755 --- a/platform_tools/ios/bin/ios_install +++ b/platform_tools/ios/bin/ios_install @@ -15,5 +15,5 @@ set -e -x SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $SCRIPT_DIR/ios_setup.sh -ios_umount || true +ios_umount || true ios_install_app diff --git a/platform_tools/ios/bin/ios_ninja b/platform_tools/ios/bin/ios_ninja index ff0a61dc01..a0f721aec2 100755 --- a/platform_tools/ios/bin/ios_ninja +++ b/platform_tools/ios/bin/ios_ninja @@ -14,8 +14,8 @@ set -x -e SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $SCRIPT_DIR/ios_setup.sh -OLD_DIR=`pwd` -cd ${SKIA_SRC_DIR} +pushd ${SKIA_SRC_DIR} "${SKIA_SRC_DIR}/gyp_skia" xcodebuild -project "$SKIA_OUT/gyp/iOSShell.xcodeproj" -configuration "$BUILDTYPE" -cd $OLD_DIR +popd +ios_package_app diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh index dbfed7c26f..49a2228192 100755 --- a/platform_tools/ios/bin/ios_setup.sh +++ b/platform_tools/ios/bin/ios_setup.sh @@ -41,19 +41,29 @@ if [[ -z "$SKIA_OUT" ]]; then SKIA_OUT="$SKIA_SRC_DIR/out" fi +# Name of the iOS app. +IOS_APP=iOSShell.ipa + +# Location of the compiled iOS app. +IOS_APP_PATH=${SKIA_OUT}/${BUILDTYPE}/${IOS_APP} + + ios_uninstall_app() { ideviceinstaller -U "$IOS_BUNDLE_ID" } -ios_install_app() { +ios_package_app() { rm -rf $IOS_PCKG_DIR mkdir -p $IOS_PCKG_DIR/Payload # this directory must be named 'Payload' cp -rf "${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos/iOSShell.app" "${IOS_PCKG_DIR}/Payload/" - local RET_DIR=`pwd` - cd $IOS_PCKG_DIR - zip -r iOSShell.ipa Payload - ideviceinstaller -i ./iOSShell.ipa - cd $RET_DIR + pushd $IOS_PCKG_DIR + zip -r ${IOS_APP} Payload + cp ${IOS_APP} ${IOS_APP_PATH} + popd +} + +ios_install_app() { + ideviceinstaller -i ${IOS_APP_PATH} } ios_rm() { |