diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-09-15 13:46:39 +0100 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2023-09-15 13:47:50 +0100 |
| commit | a128111c29ba0c31763ccbcd316268bfa9c029cd (patch) | |
| tree | a278bc2ad5f11b9a5f947e6cf8241534f3a7f8d8 /contrib/guix | |
| parent | c38561d6b1de954b712a92cb8a198ed42d73caea (diff) | |
| download | bitcoin-a128111c29ba0c31763ccbcd316268bfa9c029cd.tar.xz | |
build: produce a .zip for macOS distribution
Instead of a .dmg.
Co-authored-by: fanquake <fanquake@gmail.com>
Diffstat (limited to 'contrib/guix')
| -rwxr-xr-x | contrib/guix/libexec/build.sh | 2 | ||||
| -rwxr-xr-x | contrib/guix/libexec/codesign.sh | 7 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 7ca2722098..c49553bec3 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -315,7 +315,7 @@ mkdir -p "$DISTSRC" | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" \ || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" && exit 1 ) ) - make deploy ${V:+V=1} OSX_DMG="${OUTDIR}/${DISTNAME}-${HOST}-unsigned.dmg" + make deploy ${V:+V=1} OSX_ZIP="${OUTDIR}/${DISTNAME}-${HOST}-unsigned.zip" ;; esac ( diff --git a/contrib/guix/libexec/codesign.sh b/contrib/guix/libexec/codesign.sh index 6ffa0f07b2..0b5f77d01e 100755 --- a/contrib/guix/libexec/codesign.sh +++ b/contrib/guix/libexec/codesign.sh @@ -85,11 +85,8 @@ mkdir -p "$DISTSRC" # Apply detached codesignatures to dist/ (in-place) signapple apply dist/Bitcoin-Qt.app codesignatures/osx/dist - # Make a DMG from dist/ - xorrisofs -D -l -V "$(< osx_volname)" -no-pad -r -dir-mode 0755 \ - -o "${OUTDIR}/${DISTNAME}-${HOST}.dmg" \ - dist \ - -- -volume_date all_file_dates ="$SOURCE_DATE_EPOCH" + # Make a .zip from dist/ + zip "${OUTDIR}/${DISTNAME}-${HOST}.zip" dist/* ;; *) exit 1 diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 0101826399..0c273dbb03 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -606,5 +606,5 @@ inspecting signatures in Mach-O binaries.") ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list clang-toolchain-15 binutils cmake-minimal xorriso python-signapple)) + (list clang-toolchain-15 binutils cmake-minimal xorriso python-signapple zip)) (else '()))))) |