AaronFiore/electrum
1
0
Fork 0
Code Activity

use debian makensis instead of windows makensis executable through wine (#8057)

Browse Source
This commit is contained in:
accumulator
2022-11-04 21:31:01 +01:00
committed by GitHub
parent 4a63ca2e1f
commit d51ee07a81
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/build-wine/Dockerfile
View File

@@ -30,6 +30,7 @@ RUN dpkg --add-architecture i386 && \
libtool \ libtool \
gettext \ gettext \
sudo \ sudo \
nsis \
&& \ && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
apt-get autoremove -y && \ apt-get autoremove -y && \

2
contrib/build-wine/build-electrum-git.sh
View File

@@ -65,7 +65,7 @@ popd
info "building NSIS installer" info "building NSIS installer"
# $VERSION could be passed to the electrum.nsi script, but this would require some rewriting in the script itself. # $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.nsi makensis -DPRODUCT_VERSION=$VERSION electrum.nsi
cd dist cd dist
mv electrum-setup.exe $NAME_ROOT-$VERSION-setup.exe mv electrum-setup.exe $NAME_ROOT-$VERSION-setup.exe

4
contrib/build-wine/electrum.nsi
View File

@@ -72,7 +72,7 @@
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?" !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
!define MUI_ICON "c:\electrum\electrum\gui\icons\electrum.ico" !define MUI_ICON "..\..\electrum\gui\icons\electrum.ico"
;-------------------------------- ;--------------------------------
;Pages ;Pages
@@ -111,7 +111,7 @@ Section
;Files to pack into the installer ;Files to pack into the installer
File /r "dist\electrum\*.*" File /r "dist\electrum\*.*"
File "c:\electrum\electrum\gui\icons\electrum.ico" File "..\..\electrum\gui\icons\electrum.ico"
;Store installation folder ;Store installation folder
WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR

10
contrib/build-wine/prepare-wine.sh
View File

@@ -1,10 +1,5 @@
#!/bin/bash #!/bin/bash
# Please update these carefully, some versions won't work under Wine
NSIS_FILENAME=nsis-3.08-setup.exe
NSIS_URL=https://downloads.sourceforge.net/project/nsis/NSIS%203/3.08/$NSIS_FILENAME
NSIS_SHA256=bbc76be36ecb2fc00d493c91befdaf71654226ad8a4fc4dc338458916bf224d0
PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git" PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git"
PYINSTALLER_COMMIT="0fe956a2c6157e1b276819de1a050c242de70a29" PYINSTALLER_COMMIT="0fe956a2c6157e1b276819de1a050c242de70a29"
# ^ latest commit from "v4" branch, somewhat after "4.10" tag # ^ latest commit from "v4" branch, somewhat after "4.10" tag
@@ -56,11 +51,6 @@ $WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-warn-scr
$WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-binary :all: --no-warn-script-location \ $WINE_PYTHON -m pip install --no-build-isolation --no-dependencies --no-binary :all: --no-warn-script-location \
--cache-dir "$WINE_PIP_CACHE_DIR" -r "$CONTRIB"/deterministic-build/requirements-build-wine.txt --cache-dir "$WINE_PIP_CACHE_DIR" -r "$CONTRIB"/deterministic-build/requirements-build-wine.txt
info "Installing NSIS."
download_if_not_exist "$CACHEDIR/$NSIS_FILENAME" "$NSIS_URL"
verify_hash "$CACHEDIR/$NSIS_FILENAME" "$NSIS_SHA256"
wine "$CACHEDIR/$NSIS_FILENAME" /S
# copy already built DLLs # 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/libsecp256k1-0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libsecp to its destination"