diff options
author | Memphiz <memphis@machzwo.de> | 2017-06-25 18:05:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-25 18:05:13 +0200 |
commit | 0eb72674553e850c1d2b7ad3bbf1b21a8bea80ef (patch) | |
tree | f331da233da32eb95e4206bc0106709e900eb850 /tools | |
parent | d72a32ace1434f4094561197c78071984f2d60e5 (diff) | |
parent | 036990091f732a950f908b85dea6de1a47db1ffc (diff) |
Merge pull request #12298 from Memphiz/ios64
[ios/ios64] - bump xcode and sdk to fix ios64 compilation
Diffstat (limited to 'tools')
-rw-r--r-- | tools/buildsteps/defaultenv | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 9af16e5969..39e66ae3c0 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -4,6 +4,7 @@ NDK_VERSION=${NDK_VERSION:-"Default"} Configuration=${Configuration:-"Default"} XBMC_DEPENDS_ROOT=${XBMC_DEPENDS_ROOT:-"Default"} DARWIN_ARM_CPU=${DARWIN_ARM_CPU:-"Default"} +XCODE_APP=${XCODE_APP:-"Default"} PATH_CHANGE_REV_FILENAME=".last_success_revision" FAILED_BUILD_FILENAME=".last_failed_revision" #TARBALLS ENV-VAR is only used by android scripts atm @@ -17,16 +18,18 @@ DEPLOYED_BINARY_ADDONS="-e /addons" #$XBMC_PLATFORM_DIR matches the platform subdirs! case $XBMC_PLATFORM_DIR in ios) - DEFAULT_SDK_VERSION=8.1 + DEFAULT_SDK_VERSION=9.2 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" DEFAULT_DARWIN_ARM_CPU="armv7" + DEFAULT_XCODE_APP="Xcode.app" ;; osx64) DEFAULT_SDK_VERSION=10.10 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" + DEFAULT_XCODE_APP="Xcode6.1.1.app" ;; android) @@ -68,6 +71,14 @@ then DARWIN_ARM_CPU=$DEFAULT_DARWIN_ARM_CPU fi +if [ "$XCODE_APP" == "Default" ] +then + XCODE_APP=$DEFAULT_XCODE_APP +fi + +# make osx environment aware of the selected xcode app +DEVELOPER_DIR=/Applications/$XCODE_APP/Contents/Developer + if [ "$Configuration" == "Default" ] then Configuration=$DEFAULT_CONFIGURATION @@ -88,7 +99,7 @@ function getBuildHash () checkPath="$1" local hashStr hashStr="$(git rev-list HEAD --max-count=1 -- $checkPath)" - hashStr="$hashStr $SDK_PATH $NDK_PATH $NDK_VERSION $SDK_VERSION $TOOLCHAIN $XBMC_DEPENDS_ROOT" + hashStr="$hashStr $SDK_PATH $NDK_PATH $NDK_VERSION $SDK_VERSION $TOOLCHAIN $XBMC_DEPENDS_ROOT $XCODE_APP" echo $hashStr } |