diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-10-07 19:49:51 +0200 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-10-07 19:49:51 +0200 |
| commit | 5e5edb2c09ffb876fcb52632e5137827548f85a1 (patch) | |
| tree | 2f7eeb3f66b075ccb03514e9f2db27c4781990fe /tools/buildsteps/android | |
| parent | 635880fcc3378a1f9e226eadb655f5cbc4d7b7e1 (diff) | |
[cmake/jenkins] Build with CMake
Removes the possibility to build with legacy build systems on jenkins.
Diffstat (limited to 'tools/buildsteps/android')
| -rw-r--r-- | tools/buildsteps/android/configure-xbmc | 6 | ||||
| -rw-r--r-- | tools/buildsteps/android/make-binary-addons | 8 | ||||
| -rw-r--r-- | tools/buildsteps/android/make-xbmc | 6 | ||||
| -rw-r--r-- | tools/buildsteps/android/package | 6 |
4 files changed, 5 insertions, 21 deletions
diff --git a/tools/buildsteps/android/configure-xbmc b/tools/buildsteps/android/configure-xbmc index 50c015b244..81c0d3c9b8 100644 --- a/tools/buildsteps/android/configure-xbmc +++ b/tools/buildsteps/android/configure-xbmc @@ -2,8 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -if [ "$CMAKE_BUILD" = true ]; then - make -C $WORKSPACE/tools/depends/target/cmakebuildsys -else - make -C $WORKSPACE/tools/depends/target/xbmc -fi +make -C $WORKSPACE/tools/depends/target/cmakebuildsys diff --git a/tools/buildsteps/android/make-binary-addons b/tools/buildsteps/android/make-binary-addons index 1c07b4cf0b..123f55da68 100644 --- a/tools/buildsteps/android/make-binary-addons +++ b/tools/buildsteps/android/make-binary-addons @@ -16,12 +16,8 @@ then echo "building $addon" git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon - if [ "$CMAKE_BUILD" = true ]; then - # Must match prefix in android/PathSetup.cmake - INSTALL_PREFIX="../../../../../build/install" - else - INSTALL_PREFIX="\$(PREFIX)" - fi + # Must match prefix in android/PathSetup.cmake + INSTALL_PREFIX="../../../../../build/install" cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1 INSTALL_PREFIX="$INSTALL_PREFIX" || ALL_BINARY_ADDONS_BUILT="0" done fi diff --git a/tools/buildsteps/android/make-xbmc b/tools/buildsteps/android/make-xbmc index 3cff0870fb..11d8d703f2 100644 --- a/tools/buildsteps/android/make-xbmc +++ b/tools/buildsteps/android/make-xbmc @@ -2,8 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=android . $WORKSPACE/tools/buildsteps/defaultenv -if [ "$CMAKE_BUILD" = true ]; then - cd $WORKSPACE/build;make -j$BUILDTHREADS || make -else - cd $WORKSPACE;make -j$BUILDTHREADS || make -fi +cd $WORKSPACE/build;make -j$BUILDTHREADS || make diff --git a/tools/buildsteps/android/package b/tools/buildsteps/android/package index 833a2d9487..bb535a40ff 100644 --- a/tools/buildsteps/android/package +++ b/tools/buildsteps/android/package @@ -8,11 +8,7 @@ else TARGET=apk-unsigned fi -if [ "$CMAKE_BUILD" = true ]; then - cd $WORKSPACE/build;make -j$BUILDTHREADS $TARGET -else - cd $WORKSPACE;make -j$BUILDTHREADS $TARGET -fi +cd $WORKSPACE/build;make -j$BUILDTHREADS $TARGET $RUN_SIGNSTEP cd $WORKSPACE |