Philipp Hörist pushed to branch master at gajim / gajim
Commits:
24e77126 by Philipp Hörist at 2018-09-29T19:55:29Z
Fix Windows build
- - - - -
3 changed files:
- appveyor.yml
- win/_base.sh
- win/build.sh
Changes:
=====================================
appveyor.yml
=====================================
@@ -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"
=====================================
win/_base.sh
=====================================
@@ -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 {
=====================================
win/build.sh
=====================================
@@ -17,6 +17,7 @@ function main {
install_deps
install_gajim
cleanup_install
+ download_ssl_libs
move_ssl_libs
build_installer
}
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/24e771266b804f266b82e011578b4d026e7ce6d2
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/24e771266b804f266b82e011578b4d026e7ce6d2
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
