mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-05 10:42:13 +02:00
Merge #20422: build: mac deployment unification
b685f60a08build: mac_alias 2.1.1 (fanquake)5d2cbdf772macdeploy: use Python 3.6 (fanquake)a42aa94c54macdeploy: remove runHDIUtil in favor of directly calling subprocess.run (fanquake)adaa26202bmacdeploy: remove existing Bitcoin-Core.dmg if present (fanquake)ccb0325b1bmacdeploy: move qt_conf to where it's used (fanquake)6390a04862macdeploy: consolidate .DS_Store generation (fanquake)32347cd56amacdeploy: assume plistlib is available (fanquake)0ab4018c12macdeploy: have a single level of logging output (fanquake)827d382aa7macdeploy: remove add-resources argument (fanquake)464b34d4c3macdeploy: remove codesigning argument (fanquake)4d70d3d7febuild: automatically determine macOS translations (fanquake) Pull request description: This consolidates our macOS build code so that `.DS_Store` generation is the same when running `make deploy` for macOS when building on Linux and macOS, rather than maintaining two version of code that essentially do the same thing (just slightly differently). It also removes unused code and any AppleScript usage, automates finding translation files and generally simplifies `macdeployqtplus`. It also gets rid of the annoying "popping up" behaviour during DMG generation, names the created image `Bitcoin-Core.dmg` rather than `Bitcoin-Qt.dmg`. ACKs for top commit: dergoegge: ACKb685f60a08- Less and cleaner code looks good. I tested this with `make deploy` and everything still works + the popup during DMG generation is gone. Tree-SHA512: dcd38344e2dfcfa7ffbccf6226a71425c4d16b421a4881d5ee37b8e7ef393b3e8077262444c39b11912269d8cf688aba897e6518cba8361eb24a03fdd03b8caf
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
package=native_mac_alias
|
||||
$(package)_version=2.0.7
|
||||
$(package)_version=2.1.1
|
||||
$(package)_download_path=https://github.com/al45tair/mac_alias/archive/
|
||||
$(package)_file_name=v$($(package)_version).tar.gz
|
||||
$(package)_sha256_hash=6f606d3b6bccd2112aeabf1a063f5b5ece87005a5d7e97c8faca23b916e88838
|
||||
$(package)_sha256_hash=c0ffceee14f7d04a6eb323fb7b8217dc3f373b346198d2ca42300a8362db7efa
|
||||
$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages
|
||||
|
||||
define $(package)_build_cmds
|
||||
|
||||
@@ -14,7 +14,6 @@ $(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch d
|
||||
$(package)_patches+= freetype_back_compat.patch drop_lrelease_dependency.patch fix_powerpc_libpng.patch
|
||||
$(package)_patches+= fix_mingw_cross_compile.patch fix_qpainter_non_determinism.patch
|
||||
|
||||
# Update OSX_QT_TRANSLATIONS when this is updated
|
||||
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
|
||||
$(package)_qttranslations_sha256_hash=fb5a47799754af73d3bf501fe513342cfe2fc37f64e80df5533f6110e804220c
|
||||
|
||||
|
||||
Reference in New Issue
Block a user