macdeploy: rename macOS output to bitcoin-macos-app.zip

We were naming this "Bitcoin-Core.zip", just to immediately rename it.
Similar to what we do with Windows, i.e `bitcoin-win64-setup.exe`.
This commit is contained in:
fanquake committed 2025-09-03 13:00:38 +01:00
1 parent 05353d9cf0
commit 8e434a8499
2 files changed
+9 -9

No files matched your search

+8 -8
View File
@@ -96,19 +96,19 @@ function(add_macos_deploy_target)
VERBATIM VERBATIM
) )
string(REPLACE " " "-" osx_volname ${CLIENT_NAME}) set(macos_zip "bitcoin-macos-app")
if(CMAKE_HOST_APPLE) if(CMAKE_HOST_APPLE)
add_custom_command( add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/${osx_volname}.zip OUTPUT ${PROJECT_BINARY_DIR}/${macos_zip}.zip
COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/contrib/macdeploy/macdeployqtplus ${macos_app} -translations-dir=${QT_TRANSLATIONS_DIR} -zip=${osx_volname} COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/contrib/macdeploy/macdeployqtplus ${macos_app} -translations-dir=${QT_TRANSLATIONS_DIR} -zip=${macos_zip}
DEPENDS ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt DEPENDS ${PROJECT_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt
VERBATIM VERBATIM
) )
add_custom_target(deploydir add_custom_target(deploydir
DEPENDS ${PROJECT_BINARY_DIR}/${osx_volname}.zip DEPENDS ${PROJECT_BINARY_DIR}/${macos_zip}.zip
) )
add_custom_target(deploy add_custom_target(deploy
DEPENDS ${PROJECT_BINARY_DIR}/${osx_volname}.zip DEPENDS ${PROJECT_BINARY_DIR}/${macos_zip}.zip
) )
else() else()
add_custom_command( add_custom_command(
@@ -128,13 +128,13 @@ function(add_macos_deploy_target)
) )
else() else()
add_custom_command( add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip OUTPUT ${PROJECT_BINARY_DIR}/dist/${macos_zip}.zip
WORKING_DIRECTORY dist WORKING_DIRECTORY dist
COMMAND ${PROJECT_SOURCE_DIR}/cmake/script/macos_zip.sh ${ZIP_EXECUTABLE} ${osx_volname}.zip COMMAND ${PROJECT_SOURCE_DIR}/cmake/script/macos_zip.sh ${ZIP_EXECUTABLE} ${macos_zip}.zip
VERBATIM VERBATIM
) )
add_custom_target(deploy add_custom_target(deploy
DEPENDS ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip DEPENDS ${PROJECT_BINARY_DIR}/dist/${macos_zip}.zip
) )
endif() endif()
endif() endif()
+1 -1
View File
@@ -369,7 +369,7 @@ mkdir -p "$DISTSRC"
;; ;;
*darwin*) *darwin*)
cmake --build build --target deploy ${V:+--verbose} cmake --build build --target deploy ${V:+--verbose}
mv build/dist/Bitcoin-Core.zip "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip" mv build/dist/bitcoin-macos-app.zip "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip"
mkdir -p "unsigned-app-${HOST}" mkdir -p "unsigned-app-${HOST}"
cp --target-directory="unsigned-app-${HOST}" \ cp --target-directory="unsigned-app-${HOST}" \
contrib/macdeploy/detached-sig-create.sh contrib/macdeploy/detached-sig-create.sh