Fix Windows build

This commit is contained in:
Philipp Hörist 2018-05-19 08:06:18 +02:00
parent 9154658dbc
commit 4d9197ef1c
2 changed files with 13 additions and 15 deletions

View File

@ -18,7 +18,7 @@ clone_depth: 1
# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
build_script: build_script:
- C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --ask=127 - C:\msys64\usr\bin\pacman -Syu --needed --noconfirm --ask=20
- ps: | - ps: |
$env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString()
$env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root" $env:BUILDROOT="C:\msys64\home\appveyor\gajim\win\_build_root"

View File

@ -80,28 +80,26 @@ function install_deps {
mingw-w64-"${ARCH}"-goocanvas \ mingw-w64-"${ARCH}"-goocanvas \
mingw-w64-"${ARCH}"-gspell \ mingw-w64-"${ARCH}"-gspell \
mingw-w64-"${ARCH}"-hunspell \ mingw-w64-"${ARCH}"-hunspell \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \
build_pip install setuptools_scm mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \
mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six
PIP_REQUIREMENTS="\ PIP_REQUIREMENTS="\
certifi
git+https://dev.gajim.org/gajim/python-nbxmpp.git git+https://dev.gajim.org/gajim/python-nbxmpp.git
git+https://github.com/dlitz/pycrypto.git git+https://github.com/dlitz/pycrypto.git
git+https://dev.gajim.org/lovetox/pybonjour-python3.git git+https://dev.gajim.org/lovetox/pybonjour-python3.git
cryptography
pyopenssl
python-gnupg
docutils
qrcode
keyring keyring
pillow==4.3.0 python-gnupg
six python-axolotl
qrcode
" "
build_pip install --no-binary ":all:" \ build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
--force-reinstall $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "])
build_pip install python-axolotl
# remove the large png icons, they should be used rarely and svg works fine # remove the large png icons, they should be used rarely and svg works fine
rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512" rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512"