Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
24e77126
by Philipp Hörist at 2018-09-29T19:55:29Z
3 changed files:
Changes:
| ... | ... | @@ -18,8 +18,7 @@ clone_depth: 1 |
| 18 | 18 |
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
|
| 19 | 19 |
|
| 20 | 20 |
build_script:
|
| 21 |
- - C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20
|
|
| 22 |
- - C:\msys64\usr\bin\pacman -Su --needed --noconfirm
|
|
| 21 |
+ - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\*
|
|
| 23 | 22 |
- ps: |
|
| 24 | 23 |
$env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
|
| 25 | 24 |
$env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"
|
| ... | ... | @@ -168,7 +168,6 @@ function cleanup_install { |
| 168 | 168 |
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip mingw-w64-"${ARCH}"-ncurses || true
|
| 169 | 169 |
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tk || true
|
| 170 | 170 |
build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tcl || true
|
| 171 |
- build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gsl || true
|
|
| 172 | 171 |
|
| 173 | 172 |
#delete translations we don't support
|
| 174 | 173 |
for d in "${MINGW_ROOT}"/share/locale/*/LC_MESSAGES; do
|
| ... | ... | @@ -298,12 +297,17 @@ function cleanup_install { |
| 298 | 297 |
|
| 299 | 298 |
}
|
| 300 | 299 |
|
| 300 |
+function download_ssl_libs {
|
|
| 301 |
+ # Python needs these ssl libs but msys does not provide them
|
|
| 302 |
+ curl -o "${BUILD_ROOT}"/ssl.zip https://gajim.org/downloads/snap/win/build/ssl.zip
|
|
| 303 |
+ 7z x -o"${MINGW_ROOT}"/bin "${BUILD_ROOT}"/ssl.zip
|
|
| 304 |
+}
|
|
| 305 |
+ |
|
| 301 | 306 |
function move_ssl_libs {
|
| 302 | 307 |
# Pythons ssl module searches in that path for these dlls, if they are not there
|
| 303 | 308 |
# C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there
|
| 304 | 309 |
cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/libeay32.dll
|
| 305 | 310 |
cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/ssleay32.dll
|
| 306 |
- |
|
| 307 | 311 |
}
|
| 308 | 312 |
|
| 309 | 313 |
function build_installer {
|
| ... | ... | @@ -17,6 +17,7 @@ function main { |
| 17 | 17 |
install_deps
|
| 18 | 18 |
install_gajim
|
| 19 | 19 |
cleanup_install
|
| 20 |
+ download_ssl_libs
|
|
| 20 | 21 |
move_ssl_libs
|
| 21 | 22 |
build_installer
|
| 22 | 23 |
}
|