Page MenuHomePhabricator
Differential D19530

[electrum] build 64-bit windows binaries by default
ClosedPublic
Actions

Authored by PiRK on Thu, Feb 5, 13:56.

Details

Reviewers
bytesofman
Group Reviewers
Restricted Project
Commits
rABC5ff438e2cdad: [electrum] build 64-bit windows binaries by default
Summary

This adds support for 64-bit Windows releases, and makes it the default.

Required for qt6, and will help prevent MemoryError with large wallets.
32-bit Windows usage is now well under 1% of all running Windows computers.

The switch from wine makensis.exe (with a downloaded 32 bit makensis.exe) to the linux nsis package is a backport of electrum#8057

Test Plan
contrib/build-wine/build.sh
wine dist/ElectrumABC-5.4.4.exe
contrib/make_clean

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

PiRK created this revision.Thu, Feb 5, 13:56
Herald added a reviewer: Restricted Project. · View Herald TranscriptThu, Feb 5, 13:56
teamcity edited the summary of this revision. (Show Details)Thu, Feb 5, 13:56
Harbormaster completed remote builds in B36081: Diff 58206.Thu, Feb 5, 14:05
PiRK added inline comments.Thu, Feb 5, 14:27
electrum/contrib/build-wine/deterministic.spec
44 ↗(On Diff #58206)

tried replacing win32 with win64 here, and it didn't work. Keeping win32 also does not work, it doesn't find the file in the python package. So this is a fixme, I need a windows machine to test it.

electrum/contrib/build-wine/docker/Dockerfile
19 ↗(On Diff #58206)

https://launchpad.net/ubuntu/jammy/amd64/gnupg2

This is a dummy transitional package that provides symlinks from gpg2
to gpg.

And it seems like it was removed from the repo.

PiRK updated this revision to Diff 58207.Thu, Feb 5, 16:42
PiRK edited the summary of this revision. (Show Details)
PiRK edited the test plan for this revision. (Show Details)

fix the platform_tag for Satochip's pyscard shard lib

PiRK published this revision for review.Thu, Feb 5, 16:43
PiRK updated this revision to Diff 58208.Thu, Feb 5, 16:48

actually make it work for both win32 and win64, by simply using a wildcard for the platform tag. This way the switch from 64 to 32 bits will require only setting an ENV var WIN_ARCH=win64.

Harbormaster completed remote builds in B36082: Diff 58207.Thu, Feb 5, 16:52
Harbormaster completed remote builds in B36083: Diff 58208.Thu, Feb 5, 16:57
PiRK updated this revision to Diff 58209.Thu, Feb 5, 17:01
PiRK retitled this revision from [electrum] build 64-bit windows binaries to [electrum] build 64-bit windows binaries by default.
PiRK edited the summary of this revision. (Show Details)
PiRK edited the test plan for this revision. (Show Details)

properly support both win32 and win64 with a single ENV var (WIN_ARCH, defaults to win64)

Harbormaster completed remote builds in B36084: Diff 58209.Thu, Feb 5, 17:08
PiRK edited the test plan for this revision. (Show Details)Thu, Feb 5, 17:19
bytesofman accepted this revision.Thu, Feb 5, 17:34
bytesofman added a subscriber: bytesofman.
bytesofman added inline comments.
electrum/contrib/build-wine/electrum-abc.nsi
90 ↗(On Diff #58209)

seems like a weird change here? does this still work / is the relative path preferred?

is this related to the win64 change?

i see it's (kind of) in the backport but they were using "c:\" style lines (obi-wan-long-time.jpg)

This revision is now accepted and ready to land.Thu, Feb 5, 17:34
PiRK added inline comments.Thu, Feb 5, 18:41
electrum/contrib/build-wine/electrum-abc.nsi
90 ↗(On Diff #58209)

Yes, i tried not changing it and it broke. Probably a difference in how makensis work on Windows vs the Linux command (previously we were running the windows executable via Wine, with some Wine path weirdness)

PiRK added a comment.Thu, Feb 5, 18:48

I'm going to edit the summary and test plan because for some reason I'm not able to make it work anymore for win32 (so i'll remove the claim that we support both)

electrum/contrib/build-wine/electrum-abc.nsi
90 ↗(On Diff #58209)

This is when we diverged from Electrum

https://github.com/Electron-Cash/Electron-Cash/commit/4c5e16a9967737b48ceafdfae918edb0f2a29879#diff-e6813f4a3c7b9e0572efd478d02fdfb56a37091d2a9de317c3bb2a44fffb636e

https://github.com/spesmilo/electrum/commit/73fee2fefaec23ef0b529479f8b69b8fb1dcaaae

PiRK edited the test plan for this revision. (Show Details)Thu, Feb 5, 18:49
bytesofman added inline comments.Thu, Feb 5, 18:51
electrum/contrib/build-wine/electrum-abc.nsi
90 ↗(On Diff #58209)

👍

Closed by commit rABC5ff438e2cdad: [electrum] build 64-bit windows binaries by default (authored by PiRK). · Explain WhyFri, Feb 6, 07:43
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC5ff438e2cdad: [electrum] build 64-bit windows binaries by default.

Revision Contents
Changeset List

PathSize
electrum/
contrib/
build-wine/
13 lines
3 lines
2 lines
docker/
6 lines
2 lines

Diff 58210

View Options

electrum/contrib/build-wine/_build.sh

Loading...
View Options

electrum/contrib/build-wine/build.sh

Loading...
View Options

electrum/contrib/build-wine/deterministic.spec

Loading...
View Options

electrum/contrib/build-wine/docker/Dockerfile

Loading...
View Options

electrum/contrib/build-wine/electrum-abc.nsi

Loading...