diff options
| author | Memphiz <memphis@machzwo.de> | 2017-06-11 12:29:23 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2017-06-14 00:29:34 +0200 |
| commit | f581a1088dd5ea3c6822481177ebe9618b2118c3 (patch) | |
| tree | 1346c9f5c0227ce497efb36bb8d46ffb5ca78c57 /tools | |
| parent | 0957a8419b13b90a13d919ee05986cc6526abe8e (diff) | |
[jenkins] - allow to override the used xcode app
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/defaultenv | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 9af16e5969..96f7775fcd 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 @@ -21,12 +22,14 @@ case $XBMC_PLATFORM_DIR in DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" DEFAULT_DARWIN_ARM_CPU="armv7" + DEFAULT_XCODE_APP="Xcode6.1.1.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 |