Fix Windows build
This commit is contained in:
parent
e292b78a5d
commit
944a1a9318
|
@ -18,8 +18,7 @@ clone_depth: 1
|
|||
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
||||
|
||||
build_script:
|
||||
- C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20
|
||||
- C:\msys64\usr\bin\pacman -Su --needed --noconfirm
|
||||
- C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\*
|
||||
- ps: |
|
||||
$env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
|
||||
$env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
|
||||
|
|
|
@ -168,7 +168,6 @@ function cleanup_install {
|
|||
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip mingw-w64-"${ARCH}"-ncurses || true
|
||||
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tk || true
|
||||
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tcl || true
|
||||
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gsl || true
|
||||
|
||||
#delete translations we don't support
|
||||
for d in "${MINGW_ROOT}"/share/locale/*/LC_MESSAGES; do
|
||||
|
@ -298,12 +297,17 @@ function cleanup_install {
|
|||
|
||||
}
|
||||
|
||||
function download_ssl_libs {
|
||||
# Python needs these ssl libs but msys does not provide them
|
||||
curl -o "${BUILD_ROOT}"/ssl.zip https://gajim.org/downloads/snap/win/build/ssl.zip
|
||||
7z x -o"${MINGW_ROOT}"/bin "${BUILD_ROOT}"/ssl.zip
|
||||
}
|
||||
|
||||
function move_ssl_libs {
|
||||
# Pythons ssl module searches in that path for these dlls, if they are not there
|
||||
# C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there
|
||||
cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/libeay32.dll
|
||||
cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/ssleay32.dll
|
||||
|
||||
}
|
||||
|
||||
function build_installer {
|
||||
|
|
|
@ -17,6 +17,7 @@ function main {
|
|||
install_deps
|
||||
install_gajim
|
||||
cleanup_install
|
||||
download_ssl_libs
|
||||
move_ssl_libs
|
||||
build_installer
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue