fix build-wine

Author: David Reband

contrib/build-wine/Dockerfile

@@ -13,7 +13,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN dpkg --add-architecture i386 && \
     apt-get update -q && \
-    apt-get install -qy \
+    apt-get install -qy --allow-downgrades \
         wget \
         gnupg2 \
         dirmngr \
@@ -46,7 +46,7 @@ RUN wget -nc https://dl.winehq.org/wine-builds/Release.key && \
         rm winehq.key && \
     apt-add-repository https://dl.winehq.org/wine-builds/debian/ && \
     apt-get update -q && \
-    apt-get install -qy \
+    apt-get install -qy --allow-downgrades \
         wine-stable-amd64:amd64=7.0.0.0~bullseye-1 \
         wine-stable-i386:i386=7.0.0.0~bullseye-1 \
         wine-stable:amd64=7.0.0.0~bullseye-1 \

contrib/build-wine/build-electrum-git.sh

@@ -18,15 +18,13 @@ info "Last commit: $VERSION"
 # Load electrum-locale for this release
 git submodule update --init
 
-LOCALE="$WINEPREFIX/drive_c/electrum/electrum/locale/"
+LOCALE="$WINEPREFIX/drive_c/electrum-doi/electrum/locale/"
 # we want the binary to have only compiled (.mo) locale files; not source (.po) files
-rm -rf "$WINEPREFIX/drive_c/electrum-doi/electrum/locale/"
-for i in ./locale/*; do
-    dir="$WINEPREFIX/drive_c/electrum-doi/electrum/$i/LC_MESSAGES"
-    mkdir -p $dir
-    msgfmt --output-file="$dir/electrum.mo" "$i/electrum.po" || true
-done
-popd
+
+rm -rf "$LOCALE"
+"$CONTRIB/build_locale.sh" "$CONTRIB/deterministic-build/electrum-locale/locale/" "$LOCALE"
+
+
 
 find -exec touch -h -d '2000-11-11T11:11:11+00:00' {} +
 popd
@@ -70,7 +68,7 @@ popd
 
 info "building NSIS installer"
 # $VERSION could be passed to the electrum.nsi script, but this would require some rewriting in the script itself.
-wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum-doi.nsi
+makensis -DPRODUCT_VERSION=$VERSION electrum.nsi
 
 cd dist
 mv electrum-setup.exe $NAME_ROOT-$VERSION-setup.exe

contrib/build-wine/build.sh

@@ -32,7 +32,7 @@ docker build \
 # maybe do fresh clone
 if [ ! -z "$ELECBUILD_COMMIT" ] ; then
     info "ELECBUILD_COMMIT=$ELECBUILD_COMMIT. doing fresh clone and git checkout."
-    FRESH_CLONE="$CONTRIB_WINE/fresh_clone/electrum" && \
+    FRESH_CLONE="$CONTRIB_WINE/fresh_clone/electrum-doi" && \
         rm -rf "$FRESH_CLONE" && \
         umask 0022 && \
         git clone "$PROJECT_ROOT" "$FRESH_CLONE" && \
@@ -46,9 +46,9 @@ fi
 info "building binary..."
 docker run -it \
     --name electrum-wine-builder-cont \
-    -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/wine64/drive_c/electrum \
+    -v "$PROJECT_ROOT_OR_FRESHCLONE_ROOT":/opt/wine64/drive_c/electrum-doi \
     --rm \
-    --workdir /opt/wine64/drive_c/electrum/contrib/build-wine \
+    --workdir /opt/wine64/drive_c/electrum-doi/contrib/build-wine \
     electrum-wine-builder-img \
     ./make_win.sh
 

contrib/build-wine/deterministic.spec

@@ -124,7 +124,7 @@ exe_standalone = EXE(
     a.scripts,
     a.binaries,
     a.datas,
-    name=os.path.join('build\\pyi.win32\\electrum', cmdline_name + ".exe"),
+    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name + ".exe"),
     debug=False,
     strip=None,
     upx=False,
@@ -137,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', cmdline_name + "-portable.exe"),
+    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name + "-portable.exe"),
     debug=False,
     strip=None,
     upx=False,
@@ -151,7 +151,7 @@ exe_inside_setup_noconsole = EXE(
     pyz,
     a.scripts,
     exclude_binaries=True,
-    name=os.path.join('build\\pyi.win32\\electrum', cmdline_name),
+    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name),
     debug=False,
     strip=None,
     upx=False,
@@ -162,7 +162,7 @@ exe_inside_setup_console = EXE(
     pyz,
     a.scripts,
     exclude_binaries=True,
-    name=os.path.join('build\\pyi.win32\\electrum', cmdline_name+"-debug"),
+    name=os.path.join('build\\pyi.win32\\electrum-doi', cmdline_name+"-debug"),
     debug=False,
     strip=None,
     upx=False,
@@ -180,4 +180,4 @@ coll = COLLECT(
     debug=False,
     icon=home+'electrum/gui/icons/electrum.ico',
     console=False,
-    name=os.path.join('dist', 'electrum'))
+    name=os.path.join('dist', 'electrum-doi'))

contrib/build-wine/make_win.sh

@@ -25,7 +25,7 @@ export CONTRIB="$here/.."
 export PROJECT_ROOT="$CONTRIB/.."
 export CACHEDIR="$here/.cache/$WIN_ARCH/build"
 export PIP_CACHE_DIR="$here/.cache/$WIN_ARCH/wine_pip_cache"
-export WINE_PIP_CACHE_DIR="c:/electrum/contrib/build-wine/.cache/$WIN_ARCH/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"
@@ -77,11 +77,11 @@ else
     "$CONTRIB"/make_zbar.sh || fail "Could not build zbar"
 fi
 
-if [ -f "$DLL_TARGET_DIR/libusb-1.0.dll" ]; then
-    info "libusb already built, skipping"
-else
-    "$CONTRIB"/make_libusb.sh || fail "Could not build libusb"
-fi
+#if [ -f "$DLL_TARGET_DIR/libusb-1.0.dll" ]; then
+#    info "libusb already built, skipping"
+#else
+#    "$CONTRIB"/make_libusb.sh || fail "Could not build libusb"
+#fi
 
 "$here/prepare-wine.sh" || fail "prepare-wine failed"
 

contrib/build-wine/prepare-wine.sh

@@ -55,7 +55,7 @@ $WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-binary :
 # copy already built DLLs
 cp "$DLL_TARGET_DIR/libsecp256k1-0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libsecp to its destination"
 cp "$DLL_TARGET_DIR/libzbar-0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libzbar to its destination"
-cp "$DLL_TARGET_DIR/libusb-1.0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libusb to its destination"
+#cp "$DLL_TARGET_DIR/libusb-1.0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libusb to its destination"
 
 
 info "Building PyInstaller."