Bitmessage/PyBitmessage-2024-08-21
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Dry run both windows executables - downgrade PyInstaller to 3.5 for win64

Browse Source
This commit is contained in:
Lee Miller 2022-07-27 23:55:42 +03:00
parent 8652fef620
commit 6310fc8919
Signed by untrusted user: lee.miller
GPG Key ID: 4F97A5EA88F4AB63
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
buildscripts/winbuild.sh
View File

@ -100,7 +100,9 @@ function install_pyinstaller()
echo "Installing PyInstaller" echo "Installing PyInstaller"
if [ "${MACHINE_TYPE}" == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
# 3.6 is the last version to support python 2.7 # 3.6 is the last version to support python 2.7
wine python -m pip install -I pyinstaller==3.6 # but the resulting executable cannot run in wine
# see https://github.com/pyinstaller/pyinstaller/issues/4628
wine python -m pip install -I pyinstaller==3.5
else else
# 3.2.1 is the last version to work on XP # 3.2.1 is the last version to work on XP
# see https://github.com/pyinstaller/pyinstaller/issues/2931 # see https://github.com/pyinstaller/pyinstaller/issues/2931
@ -170,10 +172,13 @@ function build_exe(){
function dryrun_exe(){ function dryrun_exe(){
cd "${BASE_DIR}" || exit 1 cd "${BASE_DIR}" || exit 1
if [ ! "${MACHINE_TYPE}" == 'x86_64' ]; then
local VERSION=$(python setup.py --version) local VERSION=$(python setup.py --version)
wine packages/pyinstaller/dist/Bitmessage_x86_$VERSION.exe -t if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
EXE=Bitmessage_x64_$VERSION.exe
else
EXE=Bitmessage_x86_$VERSION.exe
fi fi
wine packages/pyinstaller/dist/$EXE -t
} }
# prepare on ubuntu # prepare on ubuntu