diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-27 16:25:30 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-27 16:51:47 +0000 |
| commit | 51b431cae8c6b8184efa1d48ec714032ca9956f8 (patch) | |
| tree | b056e8913b0f8d2506a5f75396961e2472b34dd3 /buildtools | |
| parent | Comment out a crash creating signal and remove some comments (diff) | |
| download | inkscape-51b431cae8c6b8184efa1d48ec714032ca9956f8.tar.gz inkscape-51b431cae8c6b8184efa1d48ec714032ca9956f8.zip | |
CI/AppVeyor: Make pacman default to overwriting existing files
Usually this should not be required but it avoids undefined behavior
when casing of a filename changes between versions (as Windows does
not have case-sensitive filenames)
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/appveyor.sh | 6 | ||||
| -rw-r--r-- | buildtools/msys2installdeps.sh | 15 |
2 files changed, 13 insertions, 8 deletions
diff --git a/buildtools/appveyor.sh b/buildtools/appveyor.sh index 649de66ba..2d4c15948 100644 --- a/buildtools/appveyor.sh +++ b/buildtools/appveyor.sh @@ -13,8 +13,8 @@ error() { echo -e "\e[1;31m\nError: ${1}\n\e[0m"; exit 1; } sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf # update MSYS2-packages and MINGW-packages (but only for current architecture) -pacman -Quq | grep -v mingw-w64- | xargs pacman -S --needed --noconfirm --noprogressbar -pacman -Quq | grep ${MINGW_PACKAGE_PREFIX} | xargs pacman -S --needed --noconfirm --noprogressbar +pacman -Quq | grep -v mingw-w64- | xargs pacman -S $PACMAN_OPTIONS +pacman -Quq | grep ${MINGW_PACKAGE_PREFIX} | xargs pacman -S $PACMAN_OPTIONS # do everything in /build cd "$(cygpath ${APPVEYOR_BUILD_FOLDER})" @@ -36,7 +36,7 @@ wget -nv https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_ # install dependencies message "--- Installing dependencies" source ../buildtools/msys2installdeps.sh -pacman -S $MINGW_PACKAGE_PREFIX-{ccache,gtest,ntldd-git} --needed --noconfirm --noprogressbar +pacman -S $MINGW_PACKAGE_PREFIX-{ccache,gtest,ntldd-git} $PACMAN_OPTIONS export CCACHE_DIR=$(cygpath -a ccache/master) ccache --max-size=200M diff --git a/buildtools/msys2installdeps.sh b/buildtools/msys2installdeps.sh index f4c8346b1..476d946f1 100644 --- a/buildtools/msys2installdeps.sh +++ b/buildtools/msys2installdeps.sh @@ -23,11 +23,16 @@ case "$MSYSTEM" in ;; esac +# set default options for invoking pacman (in CI this variable is already set globally) +if [ -z $CI ]; then + PACMAN_OPTIONS="--needed --noconfirm" +fi + # sync package databases pacman -Sy # install basic development system, compiler toolchain and build tools -eval pacman -S --needed --noconfirm \ +eval pacman -S $PACMAN_OPTIONS \ git \ intltool \ base-devel \ @@ -36,7 +41,7 @@ $ARCH-cmake \ $ARCH-ninja # install Inkscape dependencies (required) -eval pacman -S --needed --noconfirm \ +eval pacman -S $PACMAN_OPTIONS \ $ARCH-gc \ $ARCH-gsl \ $ARCH-popt \ @@ -48,7 +53,7 @@ $ARCH-gdl \ $ARCH-libsoup # install Inkscape dependencies (optional) -eval pacman -S --needed --noconfirm \ +eval pacman -S $PACMAN_OPTIONS \ $ARCH-poppler \ $ARCH-potrace \ $ARCH-libcdr \ @@ -69,13 +74,13 @@ $ARCH-libyaml # --ignore=mingw-w64-*-imagemagick for arch in $(eval echo $ARCH); do wget -nv https://gitlab.com/Ede123/bintray/raw/master/${arch}-imagemagick-6.9.9.23-1-any.pkg.tar.xz \ - && pacman -U --needed --noconfirm ${arch}-imagemagick-6.9.9.23-1-any.pkg.tar.xz \ + && pacman -U $PACMAN_OPTIONS ${arch}-imagemagick-6.9.9.23-1-any.pkg.tar.xz \ && rm ${arch}-imagemagick-6.9.9.23-1-any.pkg.tar.xz done # install Python and modules used by Inkscape -eval pacman -S --needed --noconfirm \ +eval pacman -S $PACMAN_OPTIONS \ $ARCH-python2 \ $ARCH-python2-pip \ $ARCH-python2-lxml \ |