diff options
| author | Andrey Filipenkov <decapitator@ukr.net> | 2023-11-01 14:11:08 +0300 |
|---|---|---|
| committer | Andrey Filipenkov <decapitator@ukr.net> | 2023-11-14 12:47:28 +0300 |
| commit | 59565459672425bc2aa7ceb6d5f032cd4e58f789 (patch) | |
| tree | 2cf9223e3a08b419458d39b51bd262fd636b76f9 | |
| parent | ee2726641fdfc411acfdb7508c05942e463f4de4 (diff) | |
use new variables in scripts
(cherry picked from commit 21467dc9824763e805d96b3a628867627c9e8214)
| -rw-r--r-- | cmake/scripts/osx/Install.cmake | 5 | ||||
| -rwxr-xr-x | tools/buildsteps/osx-arm64/configure-xbmc | 2 | ||||
| -rwxr-xr-x | tools/buildsteps/osx64/configure-xbmc | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/cmake/scripts/osx/Install.cmake b/cmake/scripts/osx/Install.cmake index 65bac0705c..b4c4cc8048 100644 --- a/cmake/scripts/osx/Install.cmake +++ b/cmake/scripts/osx/Install.cmake @@ -62,9 +62,8 @@ add_custom_target(dmg COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/tools/darwin/Support/Codesign.command ${CMAKE_BINARY_DIR}/tools/darwin/packaging/osx/Codesign.command COMMAND "CODESIGNING_FOLDER_PATH=${PACKAGE_OUTPUT_DIR}/${APP_NAME}.app" - "DEV_ACCOUNT=${DEV_ACCOUNT}" - "DEV_ACCOUNT_PASSWORD=${DEV_ACCOUNT_PASSWORD}" - "DEV_TEAM=${DEV_TEAM}" + "NOTARYTOOL_KEYCHAIN_PROFILE=${NOTARYTOOL_KEYCHAIN_PROFILE}" + "NOTARYTOOL_KEYCHAIN_PATH=${NOTARYTOOL_KEYCHAIN_PATH}" "EXPANDED_CODE_SIGN_IDENTITY_NAME=${CODE_SIGN_IDENTITY}" "PLATFORM_NAME=${PLATFORM}" "XCODE_BUILDTYPE=${CMAKE_CFG_INTDIR}" diff --git a/tools/buildsteps/osx-arm64/configure-xbmc b/tools/buildsteps/osx-arm64/configure-xbmc index 2fed17071c..c8adee05d2 100755 --- a/tools/buildsteps/osx-arm64/configure-xbmc +++ b/tools/buildsteps/osx-arm64/configure-xbmc @@ -2,4 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx-arm64 . $WORKSPACE/tools/buildsteps/defaultenv -make -C $WORKSPACE/tools/depends/target/cmakebuildsys APP_WINDOW_SYSTEM=native CMAKE_EXTRA_ARGUMENTS="-D CODE_SIGN_IDENTITY='$CODE_SIGN_IDENTITY' -D DEV_ACCOUNT='$DEV_ACCOUNT' -D DEV_ACCOUNT_PASSWORD='$DEV_ACCOUNT_PASSWORD' -D DEV_TEAM='$DEV_TEAM'" +make -C $WORKSPACE/tools/depends/target/cmakebuildsys APP_WINDOW_SYSTEM=native CMAKE_EXTRA_ARGUMENTS="-D CODE_SIGN_IDENTITY='$CODE_SIGN_IDENTITY' -D NOTARYTOOL_KEYCHAIN_PROFILE='$NOTARYTOOL_KEYCHAIN_PROFILE' -D NOTARYTOOL_KEYCHAIN_PATH='$NOTARYTOOL_KEYCHAIN_PATH'" diff --git a/tools/buildsteps/osx64/configure-xbmc b/tools/buildsteps/osx64/configure-xbmc index 98736c5384..2643cc9e3f 100755 --- a/tools/buildsteps/osx64/configure-xbmc +++ b/tools/buildsteps/osx64/configure-xbmc @@ -2,4 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx64 . $WORKSPACE/tools/buildsteps/defaultenv -make -C $WORKSPACE/tools/depends/target/cmakebuildsys CMAKE_EXTRA_ARGUMENTS="-D CODE_SIGN_IDENTITY='$CODE_SIGN_IDENTITY' -D DEV_ACCOUNT='$DEV_ACCOUNT' -D DEV_ACCOUNT_PASSWORD='$DEV_ACCOUNT_PASSWORD' -D DEV_TEAM='$DEV_TEAM'" +make -C $WORKSPACE/tools/depends/target/cmakebuildsys CMAKE_EXTRA_ARGUMENTS="-D CODE_SIGN_IDENTITY='$CODE_SIGN_IDENTITY' -D NOTARYTOOL_KEYCHAIN_PROFILE='$NOTARYTOOL_KEYCHAIN_PROFILE' -D NOTARYTOOL_KEYCHAIN_PATH='$NOTARYTOOL_KEYCHAIN_PATH'" |