diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-03-01 22:14:04 +0100 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-03-06 22:00:41 +0100 |
| commit | ff6892bd85949e509432e715e396ad1e07e08325 (patch) | |
| tree | 7b62ef638c0d6040350e552379df72a4c5e5288a /tools/buildsteps/osx64 | |
| parent | d8bbef50f20395ca6000c2671a80582b3bc6eec3 (diff) | |
[jenkins] Optionally build with CMake
- Add CMAKE_BUILD variable that defines if CMake should be used
to build the main application.
- Use variable to build with CMake (GNU Makefile Generator) on
supported platforms: android, ios, osx, linux, rbpi.
Diffstat (limited to 'tools/buildsteps/osx64')
| -rwxr-xr-x | tools/buildsteps/osx64/configure-xbmc | 6 | ||||
| -rwxr-xr-x | tools/buildsteps/osx64/make-xbmc | 10 | ||||
| -rwxr-xr-x | tools/buildsteps/osx64/run-tests | 10 |
3 files changed, 20 insertions, 6 deletions
diff --git a/tools/buildsteps/osx64/configure-xbmc b/tools/buildsteps/osx64/configure-xbmc index 92e13e24e6..f3edbfffa6 100755 --- a/tools/buildsteps/osx64/configure-xbmc +++ b/tools/buildsteps/osx64/configure-xbmc @@ -2,4 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx64 . $WORKSPACE/tools/buildsteps/defaultenv -make -C $WORKSPACE/tools/depends/target/xbmc +if [ "$CMAKE_BUILD" = true ]; then + make -C $WORKSPACE/tools/depends/target/cmakebuildsys +else + make -C $WORKSPACE/tools/depends/target/xbmc +fi diff --git a/tools/buildsteps/osx64/make-xbmc b/tools/buildsteps/osx64/make-xbmc index 61022f233e..c3cc31a438 100755 --- a/tools/buildsteps/osx64/make-xbmc +++ b/tools/buildsteps/osx64/make-xbmc @@ -2,7 +2,11 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx64 . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE;make -j$BUILDTHREADS xcode_depends +if [ "$CMAKE_BUILD" = true ]; then + cd $WORKSPACE/build;make -j$BUILDTHREADS || make +else + cd $WORKSPACE;make -j$BUILDTHREADS xcode_depends -cd $WORKSPACE;xcodebuild -sdk macosx$SDK_VERSION -project Kodi.xcodeproj -target Kodi.app ONLY_ACTIVE_ARCH=YES \ - ARCHS=x86_64 VALID_ARCHS=x86_64 XBMC_DEPENDS_ROOT=$XBMC_DEPENDS_ROOT -configuration $Configuration build + cd $WORKSPACE;xcodebuild -sdk macosx$SDK_VERSION -project Kodi.xcodeproj -target Kodi.app ONLY_ACTIVE_ARCH=YES \ + ARCHS=x86_64 VALID_ARCHS=x86_64 XBMC_DEPENDS_ROOT=$XBMC_DEPENDS_ROOT -configuration $Configuration build +fi diff --git a/tools/buildsteps/osx64/run-tests b/tools/buildsteps/osx64/run-tests index 5d0712fb9f..5aa20e70d6 100755 --- a/tools/buildsteps/osx64/run-tests +++ b/tools/buildsteps/osx64/run-tests @@ -2,8 +2,14 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx64 . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE;make -j$BUILDTHREADS testsuite -cd $WORKSPACE;./kodi-test --gtest_output=xml:gtestresults.xml +if [ "$CMAKE_BUILD" = true ]; then + cd $WORKSPACE/build;make -j$BUILDTHREADS kodi-test + cd $WORKSPACE;build/kodi-test --gtest_output=xml:gtestresults.xml +else + cd $WORKSPACE;make -j$BUILDTHREADS testsuite + cd $WORKSPACE;./kodi-test --gtest_output=xml:gtestresults.xml +fi + awk '{ if ($1 == "<testcase" && match($0, "notrun")) print substr($0,0,length($0)-2) "><skipped/></testcase>"; else print $0;}' gtestresults.xml > gtestresults-skipped.xml rm gtestresults.xml mv gtestresults-skipped.xml gtestresults.xml |