macdeploy: avoid use of Bitcoin Core in Linux cross build #33158

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:linux_cross_use_distname_host changing 3 files +18 −18
  1. fanquake commented at 4:26 pm on August 8, 2025: member
    Output bitcoin-macos-app.zip, similar to what we do for Windows: bitcoin-win64-setup.exe.
  2. DrahtBot commented at 4:26 pm on August 8, 2025: contributor

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Code Coverage & Benchmarks

    For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33158.

    Reviews

    See the guideline for information on the review process.

    Type Reviewers
    ACK hodlinator
    Concept ACK jonatack

    If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

    Conflicts

    No conflicts as of last run.

  3. jonatack commented at 4:42 pm on August 8, 2025: member
    Concept ACK
  4. hodlinator commented at 11:00 pm on August 9, 2025: contributor
    Concept ACK
  5. fanquake force-pushed on Aug 11, 2025
  6. achow101 commented at 6:13 pm on August 12, 2025: member

    ~0

    I find it weird that we would produce files named differently for the same target when the hosts are different. Is there a reason that the zip should include the software name in its name anyways?

  7. hodlinator commented at 9:24 am on August 22, 2025: contributor

    Agreed that different names depending on originating platform might be a bit confusing.

    Would be slightly more straightforward to switch to bitcoin-macos-app.zip as output for all, or allow -zip without a value in contrib/macdeploy/macdeployqtplus and just produce something like “macdeploy-output.zip”.

  8. fanquake force-pushed on Sep 1, 2025
  9. fanquake commented at 3:40 pm on September 1, 2025: member

    I find it weird that we would produce files named differently for the same target when the hosts are different Agreed that different names depending on originating platform might be a bit confusing.

    I don’t mind much, but I don’t think the different names are that weird, given the two outputs are different. One is a release-like zip, with an immediately usable binary, the other is a zip containing a binary that wont run, which is immediately renamed, and fed into the codesigning process.

    In any case, have changed this to just use bitcoin-macos-app.zip everywhere.

  10. in contrib/macdeploy/macdeployqtplus:496 in 921c6ba251 outdated
    492@@ -499,7 +493,14 @@ if platform.system() == "Darwin":
    493 # ------------------------------------------------
    494 
    495 if config.zip is not None:
    496-    shutil.make_archive('{}'.format(appname), format='zip', root_dir='dist', base_dir='Bitcoin-Qt.app')
    497+
    


    hodlinator commented at 11:43 am on September 3, 2025:
    nit: Please remove empty newline at the beginning of the block if you retouch.

    fanquake commented at 12:00 pm on September 3, 2025:
    Dropped.
  11. hodlinator approved
  12. hodlinator commented at 11:50 am on September 3, 2025: contributor

    ACK 921c6ba251494b4970025166a3e25cf20789da66

    Good to rename osx_volname to macos_zip since it’s more modern naming of the OS.

    Guix output:

    0[100%] Generating dist/bitcoin-macos-app.zip
    1  adding: Bitcoin-Qt.app/ (stored 0%)
    2  ...
    3[100%] Built target deploy
    

    Hashes:

    0f15abfa32b63a5b007d52fb31ac148980570b77cc3be12674debdca65d092706  guix-build-921c6ba25149/output/arm64-apple-darwin/SHA256SUMS.part
    1b94a1863fff232cdd81f2ad4b729eae9242f80d6493afea6c7c02e871658629f  guix-build-921c6ba25149/output/arm64-apple-darwin/bitcoin-921c6ba25149-arm64-apple-darwin-codesigning.tar.gz
    27e4d4cce4247fc4d06b703702c426799a30c64462e49d942e136f873d2a55c1c  guix-build-921c6ba25149/output/arm64-apple-darwin/bitcoin-921c6ba25149-arm64-apple-darwin-unsigned.tar.gz
    3a643864cc2fc81c982d6204bea72cb102469f5c1899f1c7c27702406306f55af  guix-build-921c6ba25149/output/arm64-apple-darwin/bitcoin-921c6ba25149-arm64-apple-darwin-unsigned.zip
    40a20f846fb3d2b40da0e3a7095366924d4ddcda7da4b230a565b3dfc10b9d29d  guix-build-921c6ba25149/output/dist-archive/bitcoin-921c6ba25149.tar.gz
    5b967e702da3d49301d78b24d3f09b07cecaf62d8ac41cf3020a10831041ce325  guix-build-921c6ba25149/output/x86_64-apple-darwin/SHA256SUMS.part
    64dfc8705a3594c21390694b0699035706214c2196af2bf182f3803476244ac23  guix-build-921c6ba25149/output/x86_64-apple-darwin/bitcoin-921c6ba25149-x86_64-apple-darwin-codesigning.tar.gz
    75d33e596e741d515d6502840818d0905d46a10c1ad109f244a9bd62f77c423da  guix-build-921c6ba25149/output/x86_64-apple-darwin/bitcoin-921c6ba25149-x86_64-apple-darwin-unsigned.tar.gz
    8310c8c6dbf58157c1995006e25cc73a2a919cbc558425b23fb36611f9be0ad18  guix-build-921c6ba25149/output/x86_64-apple-darwin/bitcoin-921c6ba25149-x86_64-apple-darwin-unsigned.zip
    
  13. DrahtBot requested review from jonatack on Sep 3, 2025
  14. macdeploy: combine appname & -zip arguments
    appname is only used by -zip.
    05353d9cf0
  15. 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`.
    8e434a8499
  16. fanquake force-pushed on Sep 3, 2025
  17. hodlinator approved
  18. hodlinator commented at 12:03 pm on September 3, 2025: contributor
    re-ACK 8e434a84999c473a7295772a346cbce27888d28e

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2025-09-10 09:13 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me