diff options
| author | fuzzard <fuzzard@kodi.tv> | 2023-02-06 10:20:32 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2023-02-06 10:20:32 +1000 |
| commit | 6554146f8b6163f1881f102abaf501dd051e2420 (patch) | |
| tree | 2f83f13b52fd660fcf9121db2d253a16261f4494 /tools/buildsteps | |
| parent | df97a9b0b616b8ade2d2e6caf006ac49be3848af (diff) | |
[buildsteps] run deb target during make-xbmc for xcodebuild projects
With the new Build system in xcode, it now has a changed behaviour with a new setting
"Based on dependency analysis". For us, essentially our dependency
targets (eg fmt, spdlog, etc) are added as Run scripts by the cmake xcode generator.
This means that any dep added as a run script will always be exectuted.
Currently with master buildsteps make-xbmc builds the build target, and then the package step
building the deb target, dependencies are built twice regardless of state. We will have to
look into the cmake generation side of things but the easiest solution for now is to just
generate the deb target as part of the make-xbmc buildstep, and then just handle upload
of artifact in the package buildstep.
Shaves off ~3 minutes of build time on jenkins.
Diffstat (limited to 'tools/buildsteps')
| -rwxr-xr-x | tools/buildsteps/ios/make-xbmc | 3 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/package | 2 | ||||
| -rwxr-xr-x | tools/buildsteps/tvos/make-xbmc | 3 | ||||
| -rwxr-xr-x | tools/buildsteps/tvos/package | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/tools/buildsteps/ios/make-xbmc b/tools/buildsteps/ios/make-xbmc index 9d19d7a1fe..5d7c604fa1 100755 --- a/tools/buildsteps/ios/make-xbmc +++ b/tools/buildsteps/ios/make-xbmc @@ -2,7 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=ios . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE/build;xcodebuild -configuration $Configuration build -jobs $BUILDTHREADS \ +cd $WORKSPACE/build;xcodebuild -configuration $Configuration -jobs $BUILDTHREADS \ -parallelizeTargets \ + -target deb \ SDKROOT=iphoneos$SDK_VERSION XBMC_DEPENDS_ROOT=$XBMC_DEPENDS_ROOT \ CODE_SIGNING_ALLOWED="NO" diff --git a/tools/buildsteps/ios/package b/tools/buildsteps/ios/package index 336f0603b2..b264094011 100755 --- a/tools/buildsteps/ios/package +++ b/tools/buildsteps/ios/package @@ -2,8 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=ios . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE/build;xcodebuild -target deb -jobs $BUILDTHREADS \ - CODE_SIGNING_ALLOWED="NO" cd $WORKSPACE/build/tools/darwin/packaging/darwin_embedded/ #rename for upload diff --git a/tools/buildsteps/tvos/make-xbmc b/tools/buildsteps/tvos/make-xbmc index 268936bd89..439711c3ed 100755 --- a/tools/buildsteps/tvos/make-xbmc +++ b/tools/buildsteps/tvos/make-xbmc @@ -2,7 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=tvos . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE/build;xcodebuild -configuration $Configuration build -jobs $BUILDTHREADS \ +cd $WORKSPACE/build;xcodebuild -configuration $Configuration -jobs $BUILDTHREADS \ -parallelizeTargets \ + -target deb \ SDKROOT=appletvos$SDK_VERSION XBMC_DEPENDS_ROOT=$XBMC_DEPENDS_ROOT \ CODE_SIGNING_ALLOWED="NO" diff --git a/tools/buildsteps/tvos/package b/tools/buildsteps/tvos/package index 8a088a8f27..2318af22db 100755 --- a/tools/buildsteps/tvos/package +++ b/tools/buildsteps/tvos/package @@ -2,8 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=tvos . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE/build;xcodebuild -target deb \ - CODE_SIGNING_ALLOWED="NO" cd $WORKSPACE/build/tools/darwin/packaging/darwin_embedded/ #rename for upload |