diff options
| author | Memphiz <memphis@machzwo.de> | 2015-12-30 02:00:58 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-01-10 13:41:50 +0100 |
| commit | 6f32dde6a70b7c821634a1d6da0061ede2b78607 (patch) | |
| tree | 54634b001cc837e9cdf43a17a8d0f2cf2333e8b6 /tools/buildsteps | |
| parent | 7275e4b723b25bb4049163f2ad8b0337c29c5aa9 (diff) | |
[ios/jenkins] - add arm64 support
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/defaultenv | 7 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/configure-depends | 1 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/make-xbmc | 2 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/package | 7 |
4 files changed, 15 insertions, 2 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index e124516d7f..0787a25825 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -3,6 +3,7 @@ SDK_VERSION=${SDK_VERSION:-"Default"} NDK_VERSION=${NDK_VERSION:-"Default"} Configuration=${Configuration:-"Default"} XBMC_DEPENDS_ROOT=${XBMC_DEPENDS_ROOT:-"Default"} +DARWIN_ARM_CPU=${DARWIN_ARM_CPU:-"Default"} PATH_CHANGE_REV_FILENAME=".last_success_revision" FAILED_BUILD_FILENAME=".last_failed_revision" #TARBALLS ENV-VAR is only used by android scripts atm @@ -19,6 +20,7 @@ case $XBMC_PLATFORM_DIR in DEFAULT_SDK_VERSION=8.1 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" + DEFAULT_DARWIN_ARM_CPU="armv7" ;; osx64) @@ -61,6 +63,11 @@ then XBMC_DEPENDS_ROOT=$DEFAULT_XBMC_DEPENDS_ROOT fi +if [ "$DARWIN_ARM_CPU" == "Default" ] +then + DARWIN_ARM_CPU=$DEFAULT_DARWIN_ARM_CPU +fi + if [ "$Configuration" == "Default" ] then Configuration=$DEFAULT_CONFIGURATION diff --git a/tools/buildsteps/ios/configure-depends b/tools/buildsteps/ios/configure-depends index d09f0cb269..c80f53fda8 100755 --- a/tools/buildsteps/ios/configure-depends +++ b/tools/buildsteps/ios/configure-depends @@ -8,5 +8,6 @@ then --with-tarballs=/Users/Shared/xbmc-depends/tarballs \ --host=arm-apple-darwin \ --with-sdk=$SDK_VERSION \ + --with-cpu=$DARWIN_ARM_CPU \ --prefix=$XBMC_DEPENDS_ROOT fi diff --git a/tools/buildsteps/ios/make-xbmc b/tools/buildsteps/ios/make-xbmc index 6f1e7dc242..d90712f83c 100755 --- a/tools/buildsteps/ios/make-xbmc +++ b/tools/buildsteps/ios/make-xbmc @@ -4,6 +4,6 @@ XBMC_PLATFORM_DIR=ios cd $WORKSPACE;make -j$BUILDTHREADS xcode_depends cd $WORKSPACE;xcodebuild -project Kodi.xcodeproj -target Kodi-iOS -configuration $Configuration build \ - ONLY_ACTIVE_ARCH=YES ARCHS=armv7 VALID_ARCHS=armv7 \ + ONLY_ACTIVE_ARCH=YES ARCHS=$DARWIN_ARM_CPU VALID_ARCHS=$DARWIN_ARM_CPU \ SDKROOT=iphoneos$SDK_VERSION XBMC_DEPENDS_ROOT=$XBMC_DEPENDS_ROOT CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO diff --git a/tools/buildsteps/ios/package b/tools/buildsteps/ios/package index 310e68118c..ad156e9edc 100755 --- a/tools/buildsteps/ios/package +++ b/tools/buildsteps/ios/package @@ -9,5 +9,10 @@ cd $WORKSPACE/tools/darwin/packaging/ios/;sh mkdeb-ios.sh $Configuration #rename for upload #e.x. kodi-20130314-8c2fb31-Frodo-ios.deb -UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-ios.deb" +if [ "$DARWIN_ARM_CPU" == "arm64" ] +then + UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-ios64.deb" +else + UPLOAD_FILENAME="kodi-$(getBuildRevDateStr)-ios.deb" +fi mv *.deb $UPLOAD_FILENAME |