| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 ############################################################################### | 2 ############################################################################### |
| 3 # Copyright 2015 Google Inc. | 3 # Copyright 2015 Google Inc. |
| 4 # | 4 # |
| 5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
| 6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
| 7 ############################################################################### | 7 ############################################################################### |
| 8 # | 8 # |
| 9 # ios_setup.sh: Sets environment variables used by other iOS scripts. | 9 # ios_setup.sh: Sets environment variables used by other iOS scripts. |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 # BUILDTYPE is 'Debug' by default. | 34 # BUILDTYPE is 'Debug' by default. |
| 35 if [[ -z "$BUILDTYPE" ]]; then | 35 if [[ -z "$BUILDTYPE" ]]; then |
| 36 BUILDTYPE="Debug" | 36 BUILDTYPE="Debug" |
| 37 fi | 37 fi |
| 38 | 38 |
| 39 # Out dir is $SKIA_SRC_DIR/out by default. | 39 # Out dir is $SKIA_SRC_DIR/out by default. |
| 40 if [[ -z "$SKIA_OUT" ]]; then | 40 if [[ -z "$SKIA_OUT" ]]; then |
| 41 SKIA_OUT="$SKIA_SRC_DIR/out" | 41 SKIA_OUT="$SKIA_SRC_DIR/out" |
| 42 fi | 42 fi |
| 43 | 43 |
| 44 # Location of XCode build products. |
| 45 if [[ -z "$XCODEBUILD" ]]; then |
| 46 XCODEBUILD="${SKIA_SRC_DIR}/xcodebuild" |
| 47 fi |
| 48 |
| 44 # Name of the iOS app. | 49 # Name of the iOS app. |
| 45 IOS_APP=iOSShell.ipa | 50 IOS_APP=iOSShell.ipa |
| 46 | 51 |
| 47 # Location of the compiled iOS code. | 52 # Location of the compiled iOS code. |
| 48 IOS_OUT=${SKIA_SRC_DIR}/xcodebuild/${BUILDTYPE}-iphoneos | 53 IOS_OUT=${XCODEBUILD}/${BUILDTYPE}-iphoneos |
| 49 | 54 |
| 50 # Location of the compiled iOS app. | 55 # Location of the compiled iOS app. |
| 51 IOS_APP_PATH=${IOS_OUT}/${IOS_APP} | 56 IOS_APP_PATH=${IOS_OUT}/${IOS_APP} |
| 52 | 57 |
| 53 ios_uninstall_app() { | 58 ios_uninstall_app() { |
| 54 ideviceinstaller -U "$IOS_BUNDLE_ID" | 59 ideviceinstaller -U "$IOS_BUNDLE_ID" |
| 55 } | 60 } |
| 56 | 61 |
| 57 ios_package_app() { | 62 ios_package_app() { |
| 58 rm -rf $IOS_PCKG_DIR | 63 rm -rf $IOS_PCKG_DIR |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 # adb_push_if_needed $HOST_SRC $ANDROID_DST | 198 # adb_push_if_needed $HOST_SRC $ANDROID_DST |
| 194 # else | 199 # else |
| 195 # echo -n "$ANDROID_DST " | 200 # echo -n "$ANDROID_DST " |
| 196 # $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" | 201 # $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")" |
| 197 # $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST | 202 # $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST |
| 198 # fi | 203 # fi |
| 199 # fi | 204 # fi |
| 200 # } | 205 # } |
| 201 | 206 |
| 202 # setup_device "${DEVICE_ID}" | 207 # setup_device "${DEVICE_ID}" |
| OLD | NEW |