cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

winebuid.sh code quality

Browse Source 
- code quality only changes
This commit is contained in:
Peter Šurda 2020-08-27 16:48:02 +02:00
parent 245c8d20e1
commit 2c5d15e649
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
buildscripts/winbuild.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# INIT # INIT
MACHINE_TYPE=`uname -m` MACHINE_TYPE=$(uname -m)
BASE_DIR=$(pwd) BASE_DIR=$(pwd)
PYTHON_VERSION=2.7.17 PYTHON_VERSION=2.7.17
PYQT_VERSION=4-4.11.4-gpl-Py2.7-Qt4.8.7 PYQT_VERSION=4-4.11.4-gpl-Py2.7-Qt4.8.7
@ -34,7 +34,7 @@ function download_sources_64 {
} }
function download_sources { function download_sources {
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
download_sources_64 download_sources_64
else else
download_sources_32 download_sources_32
@ -43,18 +43,18 @@ function download_sources {
function install_wine { function install_wine {
echo "Setting up wine" echo "Setting up wine"
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
export WINEPREFIX=${HOME}/.wine64 WINEARCH=win64 export WINEPREFIX=${HOME}/.wine64 WINEARCH=win64
else else
export WINEPREFIX=${HOME}/.wine32 WINEARCH=win32 export WINEPREFIX=${HOME}/.wine32 WINEARCH=win32
fi fi
rm -rf ${WINEPREFIX} rm -rf "${WINEPREFIX}"
rm -rf packages/pyinstaller/{build,dist} rm -rf packages/pyinstaller/{build,dist}
} }
function install_python(){ function install_python(){
cd ${SRCPATH} cd ${SRCPATH} || exit 1
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
echo "Installing Python ${PYTHON_VERSION} 64b" echo "Installing Python ${PYTHON_VERSION} 64b"
wine msiexec -i python-${PYTHON_VERSION}.amd64.msi /q /norestart wine msiexec -i python-${PYTHON_VERSION}.amd64.msi /q /norestart
echo "Installing vcredist for 64 bit" echo "Installing vcredist for 64 bit"
@ -63,7 +63,7 @@ function install_python(){
echo "Installing Python ${PYTHON_VERSION} 32b" echo "Installing Python ${PYTHON_VERSION} 32b"
wine msiexec -i python-${PYTHON_VERSION}.msi /q /norestart wine msiexec -i python-${PYTHON_VERSION}.msi /q /norestart
# MSVCR 2008 required for Windows XP # MSVCR 2008 required for Windows XP
cd ${SRCPATH} cd ${SRCPATH} || exit 1
echo "Installing vc_redist (2008) for 32 bit " echo "Installing vc_redist (2008) for 32 bit "
wine vcredist_x86.exe /Q wine vcredist_x86.exe /Q
fi fi
@ -75,7 +75,7 @@ function install_python(){
} }
function install_pyqt(){ function install_pyqt(){
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
echo "Installing PyQt-${PYQT_VERSION} 64b" echo "Installing PyQt-${PYQT_VERSION} 64b"
wine PyQt${PYQT_VERSION}-x64.exe /S /WX wine PyQt${PYQT_VERSION}-x64.exe /S /WX
else else
@ -85,7 +85,7 @@ function install_pyqt(){
} }
function install_openssl(){ function install_openssl(){
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
echo "Installing OpenSSL ${OPENSSL_VERSION} 64b" echo "Installing OpenSSL ${OPENSSL_VERSION} 64b"
wine Win64OpenSSL-${OPENSSL_VERSION}.exe /q /norestart /silent /verysilent /sp- /suppressmsgboxes wine Win64OpenSSL-${OPENSSL_VERSION}.exe /q /norestart /silent /verysilent /sp- /suppressmsgboxes
else else
@ -96,9 +96,9 @@ function install_openssl(){
function install_pyinstaller() function install_pyinstaller()
{ {
cd ${BASE_DIR} cd "${BASE_DIR}" || exit 1
echo "Installing PyInstaller" echo "Installing PyInstaller"
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
wine python -m pip install pyinstaller wine python -m pip install pyinstaller
else else
# 3.2.1 is the last version to work on XP # 3.2.1 is the last version to work on XP
@ -109,40 +109,60 @@ function install_pyinstaller()
function install_msgpack() function install_msgpack()
{ {
cd ${BASE_DIR} cd "${BASE_DIR}" || exit 1
echo "Installing msgpack" echo "Installing msgpack"
wine python -m pip install msgpack-python wine python -m pip install msgpack-python
} }
function install_pyopencl() function install_pyopencl()
{ {
cd ${SRCPATH} cd "${SRCPATH}" || exit 1
echo "Installing PyOpenCL" echo "Installing PyOpenCL"
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
wine python -m pip install pyopencl-2015.1-cp27-none-win_amd64.whl wine python -m pip install pyopencl-2015.1-cp27-none-win_amd64.whl
else else
wine python -m pip install pyopencl-2015.1-cp27-none-win32.whl wine python -m pip install pyopencl-2015.1-cp27-none-win32.whl
fi fi
sed -Ei 's/_DEFAULT_INCLUDE_OPTIONS = .*/_DEFAULT_INCLUDE_OPTIONS = [] /' $WINEPREFIX/drive_c/Python27/Lib/site-packages/pyopencl/__init__.py sed -Ei 's/_DEFAULT_INCLUDE_OPTIONS = .*/_DEFAULT_INCLUDE_OPTIONS = [] /' \
"$WINEPREFIX/drive_c/Python27/Lib/site-packages/pyopencl/__init__.py"
} }
function build_dll(){ function build_dll(){
cd ${BASE_DIR} cd "${BASE_DIR}" || exit 1
cd src/bitmsghash cd src/bitmsghash || exit 1
if [ ${MACHINE_TYPE} == 'x86_64' ]; then if [ "${MACHINE_TYPE}" == 'x86_64' ]; then
echo "Create dll" echo "Create dll"
x86_64-w64-mingw32-g++ -D_WIN32 -Wall -O3 -march=native -I$HOME/.wine64/drive_c/OpenSSL-Win64/include -I/usr/x86_64-w64-mingw32/include -L$HOME/.wine64/drive_c/OpenSSL-Win64/lib -c bitmsghash.cpp x86_64-w64-mingw32-g++ -D_WIN32 -Wall -O3 -march=native \
x86_64-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o -D_WIN32 -O3 -march=native -I$HOME/.wine64/drive_c/OpenSSL-Win64/include -L$HOME/.wine64/drive_c/OpenSSL-Win64 -L/usr/lib/x86_64-linux-gnu/wine -fPIC -shared -lcrypt32 -leay32 -lwsock32 -o bitmsghash64.dll -Wl,--out-implib,bitmsghash.a "-I$HOME/.wine64/drive_c/OpenSSL-Win64/include" \
-I/usr/x86_64-w64-mingw32/include \
"-L$HOME/.wine64/drive_c/OpenSSL-Win64/lib" \
-c bitmsghash.cpp
x86_64-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o \
-D_WIN32 -O3 -march=native \
"-I$HOME/.wine64/drive_c/OpenSSL-Win64/include" \
"-L$HOME/.wine64/drive_c/OpenSSL-Win64" \
-L/usr/lib/x86_64-linux-gnu/wine \
-fPIC -shared -lcrypt32 -leay32 -lwsock32 \
-o bitmsghash64.dll -Wl,--out-implib,bitmsghash.a
else else
echo "Create dll" echo "Create dll"
i686-w64-mingw32-g++ -D_WIN32 -Wall -m32 -O3 -march=native -I$HOME/.wine32/drive_c/OpenSSL-Win32/include -I/usr/i686-w64-mingw32/include -L$HOME/.wine32/drive_c/OpenSSL-Win32/lib -c bitmsghash.cpp i686-w64-mingw32-g++ -D_WIN32 -Wall -m32 -O3 -march=native \
i686-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o -D_WIN32 -O3 -march=native -I$HOME/.wine32/drive_c/OpenSSL-Win32/include -L$HOME/.wine32/drive_c/OpenSSL-Win32/lib/MinGW -fPIC -shared -lcrypt32 -leay32 -lwsock32 -o bitmsghash32.dll -Wl,--out-implib,bitmsghash.a "-I$HOME/.wine32/drive_c/OpenSSL-Win32/include" \
-I/usr/i686-w64-mingw32/include \
"-L$HOME/.wine32/drive_c/OpenSSL-Win32/lib" \
-c bitmsghash.cpp
i686-w64-mingw32-g++ -static-libgcc -shared bitmsghash.o \
-D_WIN32 -O3 -march=native \
"-I$HOME/.wine32/drive_c/OpenSSL-Win32/include" \
"-L$HOME/.wine32/drive_c/OpenSSL-Win32/lib/MinGW" \
-fPIC -shared -lcrypt32 -leay32 -lwsock32 \
-o bitmsghash32.dll -Wl,--out-implib,bitmsghash.a
fi fi
} }
function build_exe(){ function build_exe(){
cd ${BASE_DIR} cd "${BASE_DIR}" || exit 1
cd packages/pyinstaller cd packages/pyinstaller || exit 1
wine pyinstaller bitmessagemain.spec wine pyinstaller bitmessagemain.spec
} }