summaryrefslogtreecommitdiff
path: root/build-aux/appveyor-install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'build-aux/appveyor-install.sh')
-rwxr-xr-xbuild-aux/appveyor-install.sh26
1 files changed, 4 insertions, 22 deletions
diff --git a/build-aux/appveyor-install.sh b/build-aux/appveyor-install.sh
index 2d96d6b..459c955 100755
--- a/build-aux/appveyor-install.sh
+++ b/build-aux/appveyor-install.sh
@@ -4,37 +4,19 @@
# Get mingw type, if any, from MSYSTEM
case $MSYSTEM in
MINGW32)
- MINGW_BITS=i686
+ MINGW_ARCH=i686
PREFIX=/mingw32
;;
MINGW64)
- MINGW_BITS=x86_64
+ MINGW_ARCH=x86_64
PREFIX=/mingw64
;;
- MSYS)
- PREFIX=/usr
- ;;
esac
# GLib
-if test -n "$MINGW_BITS"; then
- pacman --noconfirm -S mingw-w64-$MINGW_BITS-glib2
-fi
-pacman --noconfirm -S glib2-devel
-
-# Hunspell dictionary (only need one flavour)
-wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-hunspell-en-2016.11.20-2-any.pkg.tar.xz
-pacman --noconfirm -U mingw-w64-x86_64-hunspell-en-2016.11.20-2-any.pkg.tar.xz
-
-# Hunspell
-wget https://github.com/hunspell/hunspell/archive/v1.6.0.tar.gz
-tar zxvf v1.6.0.tar.gz || true # Error in unpacking (symlink README before file README.md)
-cd hunspell-1.6.0
-ln -s README.md README && autoreconf -vfi
-./configure --prefix=$PREFIX && make && make install
-cd ..
+pacman --noconfirm -S mingw-w64-$MINGW_ARCH-glib2 glib2-devel mingw-w64-$MINGW_ARCH-hunspell mingw-w64-$MINGW_ARCH-hunspell-en
-# UnitTest++
+# UnitTest++ is not packaged in mingw
wget https://github.com/unittest-cpp/unittest-cpp/releases/download/v1.6.1/unittest-cpp-1.6.1.tar.gz
tar zxvf unittest-cpp-1.6.1.tar.gz
cd unittest-cpp-1.6.1