build-wine: update

David Reband · David Reband · commit 15fee8ca85e2 · 2022-11-17T14:43:53.000+01:00
diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye@sha256:82bab30ed448b8e2509aabe21f40f0607d905b7fd0dec72802627a20274eba55
+FROM debian:bullseye@sha256:bfe6615d017d1eebe19f349669de58cda36c668ef916e618be78071513c690e5
 
 # need ca-certificates before using snapshot packages
 RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
@@ -24,7 +24,6 @@ RUN dpkg --add-architecture i386 && \
         make \
         mingw-w64 \
         mingw-w64-tools \
-        win-iconv-mingw-w64-dev \
         autotools-dev \
         autoconf \
         autopoint \
@@ -70,4 +69,4 @@ RUN chown --recursive ${USER} ${WORK_DIR}
 RUN chown ${USER} /opt
 USER ${USER}
 
-RUN mkdir --parents "/opt/wine64/drive_c/electrum"
+RUN mkdir --parents "/opt/wine64/drive_c/electrum-doi"
diff --git a/contrib/build-wine/README.md b/contrib/build-wine/README.md
@@ -20,26 +20,11 @@ similar system.
     $ ./build.sh
     ```
     If you want reproducibility, try instead e.g.:
-    ```
-    $ FRESH_CLONE=contrib/build-wine/fresh_clone && \
-        sudo rm -rf $FRESH_CLONE && \
-        mkdir -p $FRESH_CLONE && \
-        cd $FRESH_CLONE  && \
-        git clone https://github.com/Doichain/electrum-doi.git && \
-        cd electrum
-    ```
 
-    And then build from this directory:
     ```
-    $ git checkout $REV
-    $ sudo docker run -it \
-        --name electrum-wine-builder-cont \
-        -v $PWD:/opt/wine64/drive_c/electrum-doi \
-        --rm \
-        --workdir /opt/wine64/drive_c/electrum-doi/contrib/build-wine \
-        electrum-wine-builder-img \
-        ./build.sh
+    $ ELECBUILD_COMMIT=HEAD ELECBUILD_NOCACHE=1 ./build.sh
     ```
+
 4. The generated binaries are in `./contrib/build-wine/dist`.
 
 
diff --git a/contrib/build-wine/apt.preferences b/contrib/build-wine/apt.preferences
@@ -2,6 +2,4 @@ Package: *
 Pin: release n=bullseye
 Pin-Priority: 1001
 
-Package: win-iconv-mingw-w64-dev
-Pin: release a=unstable
-Pin-Priority: 1001
+
diff --git a/contrib/build-wine/apt.sources.list b/contrib/build-wine/apt.sources.list
@@ -1,3 +1,2 @@
 deb https://snapshot.debian.org/archive/debian/20220811T031049Z/ bullseye main non-free contrib
 deb-src https://snapshot.debian.org/archive/debian/20220811T031049Z/ bullseye main non-free contrib
-deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220811T031049Z/ sid main non-free contrib
diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh
@@ -6,36 +6,10 @@
 
 set -e
 
-here="$(dirname "$(readlink -e "$0")")"
-test -n "$here" -a -d "$here" || exit
-
-if [ -z "$WIN_ARCH" ] ; then
-    export WIN_ARCH="win32"  # default
-fi
-if [ "$WIN_ARCH" = "win32" ] ; then
-    export GCC_TRIPLET_HOST="i686-w64-mingw32"
-elif [ "$WIN_ARCH" = "win64" ] ; then
-    export GCC_TRIPLET_HOST="x86_64-w64-mingw32"
-else
-    echo "unexpected WIN_ARCH: $WIN_ARCH"
-    exit 1
-fi
-
-export BUILD_TYPE="wine"
-export GCC_TRIPLET_BUILD="x86_64-pc-linux-gnu"
-export GCC_STRIP_BINARIES="1"
-
-export CONTRIB="$here/.."
-export PROJECT_ROOT="$CONTRIB/.."
-export CACHEDIR="$here/.cache/$WIN_ARCH"
-export PIP_CACHE_DIR="$CACHEDIR/wine_pip_cache"
-export WINE_PIP_CACHE_DIR="c:/electrum-doi/contrib/build-wine/.cache/$WIN_ARCH/wine_pip_cache"
-export DLL_TARGET_DIR="$CACHEDIR/dlls"
-
-export WINEPREFIX="/opt/wine64"
-export WINEDEBUG=-all
-export WINE_PYHOME="c:/python3"
-export WINE_PYTHON="wine $WINE_PYHOME/python.exe -OO -B"
+PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../.."
+PROJECT_ROOT_OR_FRESHCLONE_ROOT="$PROJECT_ROOT"
+CONTRIB="$PROJECT_ROOT/contrib"
+CONTRIB_WINE="$CONTRIB/build-wine"
 
 . "$CONTRIB"/build_tools_util.sh
 
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
@@ -2,12 +2,10 @@
 
 from PyInstaller.utils.hooks import collect_data_files, collect_submodules, collect_dynamic_libs
 
-import sys
-for i, x in enumerate(sys.argv):
-    if x == '--name':
-        cmdline_name = sys.argv[i+1]
-        break
-else:
+import sys, os
+
+cmdline_name = os.environ.get("ELECTRUM_CMDLINE_NAME")
+if not cmdline_name:
     raise Exception('no name')
 
 home = 'C:\\electrum-doi\\'
@@ -22,6 +20,8 @@ hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
 hiddenimports += collect_submodules('ckcc')
 hiddenimports += collect_submodules('bitbox02')
+hiddenimports += ['electrum.plugins.jade.jade']
+hiddenimports += ['electrum.plugins.jade.jadepy.jade']
 hiddenimports += ['PyQt5.QtPrintSupport']  # needed by Revealer
 
 
@@ -38,6 +38,7 @@ datas = [
     (home+'electrum/*.json', 'electrum'),
     (home+'electrum/lnwire/*.csv', 'electrum/lnwire'),
     (home+'electrum/wordlist/english.txt', 'electrum/wordlist'),
+    (home+'electrum/wordlist/slip39.txt', 'electrum/wordlist'),
     (home+'electrum/locale', 'electrum/locale'),
     (home+'electrum/plugins', 'electrum/plugins'),
     (home+'electrum/gui/icons', 'electrum/gui/icons'),
@@ -52,6 +53,7 @@ datas += collect_data_files('bitbox02')
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
 a = Analysis([home+'run_electrum',
               home+'electrum/gui/qt/main_window.py',
+              home+'electrum/gui/qt/qrreader/qtmultimedia/camera_dialog.py',
               home+'electrum/gui/text.py',
               home+'electrum/util.py',
               home+'electrum/wallet.py',
@@ -60,13 +62,13 @@ a = Analysis([home+'run_electrum',
               home+'electrum/dnssec.py',
               home+'electrum/commands.py',
               home+'electrum/plugins/cosigner_pool/qt.py',
-              home+'electrum/plugins/email_requests/qt.py',
               home+'electrum/plugins/trezor/qt.py',
               home+'electrum/plugins/safe_t/client.py',
               home+'electrum/plugins/safe_t/qt.py',
               home+'electrum/plugins/keepkey/qt.py',
               home+'electrum/plugins/ledger/qt.py',
               home+'electrum/plugins/coldcard/qt.py',
+              home+'electrum/plugins/jade/qt.py',
               #home+'packages/requests/utils.py'
               ],
              binaries=binaries,
@@ -100,6 +102,14 @@ for x in a.datas.copy():
             a.datas.remove(x)
             print('----> Removed x =', x)
 
+# not reproducible (see #7739):
+print("Removing *.dist-info/ from datas:")
+for x in a.datas.copy():
+    if ".dist-info\\" in x[0].lower():
+        a.datas.remove(x)
+        print('----> Removed x =', x)
+
+
 # hotfix for #3171 (pre-Win10 binaries)
 a.binaries = [x for x in a.binaries if not x[1].lower().startswith(r'c:\windows')]
 
@@ -114,7 +124,7 @@ exe_standalone = EXE(
     a.scripts,
     a.binaries,
     a.datas,
-    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name + ".exe"),
+    name=os.path.join('build\\pyi.win32\\electrum', cmdline_name + ".exe"),
     debug=False,
     strip=None,
     upx=False,
@@ -127,7 +137,7 @@ exe_portable = EXE(
     a.scripts,
     a.binaries,
     a.datas + [('is_portable', 'README.md', 'DATA')],
-    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name + "-portable.exe"),
+    name=os.path.join('build\\pyi.win32\\electrum', cmdline_name + "-portable.exe"),
     debug=False,
     strip=None,
     upx=False,
@@ -141,7 +151,7 @@ exe_inside_setup_noconsole = EXE(
     pyz,
     a.scripts,
     exclude_binaries=True,
-    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name),
+    name=os.path.join('build\\pyi.win32\\electrum', cmdline_name),
     debug=False,
     strip=None,
     upx=False,
@@ -152,7 +162,7 @@ exe_inside_setup_console = EXE(
     pyz,
     a.scripts,
     exclude_binaries=True,
-    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name+"-debug"),
+    name=os.path.join('build\\pyi.win32\\electrum', cmdline_name+"-debug"),
     debug=False,
     strip=None,
     upx=False,
diff --git a/contrib/build-wine/electrum.nsi b/contrib/build-wine/electrum.nsi
@@ -0,0 +1,177 @@
+;--------------------------------
+;Include Modern UI
+  !include "TextFunc.nsh" ;Needed for the $GetSize function. I know, doesn't sound logical, it isn't.
+  !include "MUI2.nsh"
+
+;--------------------------------
+;Variables
+
+  !define PRODUCT_NAME "Electrum"
+  !define PRODUCT_WEB_SITE "https://github.com/spesmilo/electrum"
+  !define PRODUCT_PUBLISHER "Electrum Technologies GmbH"
+  !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+
+;--------------------------------
+;General
+
+  ;Name and file
+  Name "${PRODUCT_NAME}"
+  OutFile "dist/electrum-setup.exe"
+
+  ;Default installation folder
+  InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+
+  ;Get installation folder from registry if available
+  InstallDirRegKey HKCU "Software\${PRODUCT_NAME}" ""
+
+  ;Request application privileges for Windows Vista
+  RequestExecutionLevel admin
+
+  ;Specifies whether or not the installer will perform a CRC on itself before allowing an install
+  CRCCheck on
+
+  ;Sets whether or not the details of the install are shown. Can be 'hide' (the default) to hide the details by default, allowing the user to view them, or 'show' to show them by default, or 'nevershow', to prevent the user from ever seeing them.
+  ShowInstDetails show
+
+  ;Sets whether or not the details of the uninstall  are shown. Can be 'hide' (the default) to hide the details by default, allowing the user to view them, or 'show' to show them by default, or 'nevershow', to prevent the user from ever seeing them.
+  ShowUninstDetails show
+
+  ;Sets the colors to use for the install info screen (the default is 00FF00 000000. Use the form RRGGBB (in hexadecimal, as in HTML, only minus the leading '#', since # can be used for comments). Note that if "/windows" is specified as the only parameter, the default windows colors will be used.
+  InstallColors /windows
+
+  ;This command sets the compression algorithm used to compress files/data in the installer. (http://nsis.sourceforge.net/Reference/SetCompressor)
+  SetCompressor /SOLID lzma
+
+  ;Sets the dictionary size in megabytes (MB) used by the LZMA compressor (default is 8 MB).
+  SetCompressorDictSize 64
+
+  ;Sets the text that is shown (by default it is 'Nullsoft Install System vX.XX') in the bottom of the install window. Setting this to an empty string ("") uses the default; to set the string to blank, use " " (a space).
+  BrandingText "${PRODUCT_NAME} Installer v${PRODUCT_VERSION}"
+
+  ;Sets what the titlebars of the installer will display. By default, it is 'Name Setup', where Name is specified with the Name command. You can, however, override it with 'MyApp Installer' or whatever. If you specify an empty string (""), the default will be used (you can however specify " " to achieve a blank string)
+  Caption "${PRODUCT_NAME}"
+
+  ;Adds the Product Version on top of the Version Tab in the Properties of the file.
+  VIProductVersion 1.0.0.0
+
+  ;VIAddVersionKey - Adds a field in the Version Tab of the File Properties. This can either be a field provided by the system or a user defined field.
+  VIAddVersionKey ProductName "${PRODUCT_NAME} Installer"
+  VIAddVersionKey Comments "The installer for ${PRODUCT_NAME}"
+  VIAddVersionKey CompanyName "${PRODUCT_NAME}"
+  VIAddVersionKey LegalCopyright "2013-2018 ${PRODUCT_PUBLISHER}"
+  VIAddVersionKey FileDescription "${PRODUCT_NAME} Installer"
+  VIAddVersionKey FileVersion ${PRODUCT_VERSION}
+  VIAddVersionKey ProductVersion ${PRODUCT_VERSION}
+  VIAddVersionKey InternalName "${PRODUCT_NAME} Installer"
+  VIAddVersionKey LegalTrademarks "${PRODUCT_NAME} is a trademark of ${PRODUCT_PUBLISHER}"
+  VIAddVersionKey OriginalFilename "${PRODUCT_NAME}.exe"
+
+;--------------------------------
+;Interface Settings
+
+  !define MUI_ABORTWARNING
+  !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
+
+  !define MUI_ICON "..\..\electrum\gui\icons\electrum.ico"
+
+;--------------------------------
+;Pages
+
+  !insertmacro MUI_PAGE_DIRECTORY
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+  !insertmacro MUI_LANGUAGE "English"
+
+;--------------------------------
+;Installer Sections
+
+;Check if we have Administrator rights
+Function .onInit
+	UserInfo::GetAccountType
+	pop $0
+	${If} $0 != "admin" ;Require admin rights on NT4+
+		MessageBox mb_iconstop "Administrator rights required!"
+		SetErrorLevel 740 ;ERROR_ELEVATION_REQUIRED
+		Quit
+	${EndIf}
+FunctionEnd
+
+Section
+  SetOutPath $INSTDIR
+
+  ;Uninstall previous version files
+  RMDir /r "$INSTDIR\*.*"
+  Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*"
+
+  ;Files to pack into the installer
+  File /r "dist\electrum\*.*"
+  File "..\..\electrum\gui\icons\electrum.ico"
+
+  ;Store installation folder
+  WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR
+
+  ;Create uninstaller
+  DetailPrint "Creating uninstaller..."
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+  ;Create desktop shortcut
+  DetailPrint "Creating desktop shortcut..."
+  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" ""
+
+  ;Create start-menu items
+  DetailPrint "Creating start-menu items..."
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" 0
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" 0
+
+
+  ;Links bitcoin: and lightning: URIs to Electrum
+  WriteRegStr HKCU "Software\Classes\bitcoin" "" "URL:bitcoin Protocol"
+  WriteRegStr HKCU "Software\Classes\bitcoin" "URL Protocol" ""
+  WriteRegStr HKCU "Software\Classes\bitcoin" "DefaultIcon" "$\"$INSTDIR\electrum.ico, 0$\""
+  WriteRegStr HKCU "Software\Classes\bitcoin\shell\open\command" "" "$\"$INSTDIR\electrum-${PRODUCT_VERSION}.exe$\" $\"%1$\""
+  WriteRegStr HKCU "Software\Classes\lightning" "" "URL:lightning Protocol"
+  WriteRegStr HKCU "Software\Classes\lightning" "URL Protocol" ""
+  WriteRegStr HKCU "Software\Classes\lightning" "DefaultIcon" "$\"$INSTDIR\electrum.ico, 0$\""
+  WriteRegStr HKCU "Software\Classes\lightning\shell\open\command" "" "$\"$INSTDIR\electrum-${PRODUCT_VERSION}.exe$\" $\"%1$\""
+
+  ;Adds an uninstaller possibility to Windows Uninstall or change a program section
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrum.ico"
+
+  ;Fixes Windows broken size estimates
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD HKCU "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0"
+SectionEnd
+
+;--------------------------------
+;Descriptions
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+  RMDir /r "$INSTDIR\*.*"
+
+  RMDir "$INSTDIR"
+
+  Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
+  Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*"
+  RMDir  "$SMPROGRAMS\${PRODUCT_NAME}"
+
+  DeleteRegKey HKCU "Software\Classes\bitcoin"
+  DeleteRegKey HKCU "Software\${PRODUCT_NAME}"
+  DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
+SectionEnd
diff --git a/contrib/build-wine/make_win.sh b/contrib/build-wine/make_win.sh
diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`deb https://snapshot.debian.org/archive/debian/20220811T031049Z/ bullseye main non-free contrib`
`2`	`2`	`deb-src https://snapshot.debian.org/archive/debian/20220811T031049Z/ bullseye main non-free contrib`
`3`		`-deb [check-valid-until=no] https://snapshot.debian.org/archive/debian/20220811T031049Z/ sid main non-free contrib`