From 35426b08ecf7952926c3f6f1df4bf08d4a4a74ac Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Fri, 26 Nov 2021 06:40:33 +0100 Subject: [PATCH] ci/mingw-build.sh: factor out installation to new mingw-install.sh script --- ci/mingw-build.sh | 21 +-------------------- ci/mingw-install.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 ci/mingw-install.sh diff --git a/ci/mingw-build.sh b/ci/mingw-build.sh index a6514025a..f53f40bd0 100644 --- a/ci/mingw-build.sh +++ b/ci/mingw-build.sh @@ -2,26 +2,7 @@ set -eux -pacman -S --noconfirm --needed \ - autoconf \ - automake-wrapper \ - bison \ - ${MINGW_PACKAGE_PREFIX}-cairo \ - ${MINGW_PACKAGE_PREFIX}-cmake \ - ${MINGW_PACKAGE_PREFIX}-diffutils \ - ${MINGW_PACKAGE_PREFIX}-expat \ - flex \ - ${MINGW_PACKAGE_PREFIX}-gcc \ - ${MINGW_PACKAGE_PREFIX}-libgd \ - make \ - ${MINGW_PACKAGE_PREFIX}-libtool \ - ${MINGW_PACKAGE_PREFIX}-pango \ - ${MINGW_PACKAGE_PREFIX}-pkgconf \ - ${MINGW_PACKAGE_PREFIX}-python \ - ${MINGW_PACKAGE_PREFIX}-ninja \ - ${MINGW_PACKAGE_PREFIX}-nsis \ - ${MINGW_PACKAGE_PREFIX}-tcl \ - ${MINGW_PACKAGE_PREFIX}-zlib \ +ci/mingw-install.sh export PATH=$PATH:/c/Git/cmd diff --git a/ci/mingw-install.sh b/ci/mingw-install.sh new file mode 100644 index 000000000..c321c7bea --- /dev/null +++ b/ci/mingw-install.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +set -eux + +pacman -S --noconfirm --needed \ + autoconf \ + automake-wrapper \ + bison \ + ${MINGW_PACKAGE_PREFIX}-cairo \ + ${MINGW_PACKAGE_PREFIX}-cmake \ + ${MINGW_PACKAGE_PREFIX}-diffutils \ + ${MINGW_PACKAGE_PREFIX}-expat \ + flex \ + ${MINGW_PACKAGE_PREFIX}-gcc \ + ${MINGW_PACKAGE_PREFIX}-libgd \ + make \ + ${MINGW_PACKAGE_PREFIX}-libtool \ + ${MINGW_PACKAGE_PREFIX}-pango \ + ${MINGW_PACKAGE_PREFIX}-pkgconf \ + ${MINGW_PACKAGE_PREFIX}-python \ + ${MINGW_PACKAGE_PREFIX}-ninja \ + ${MINGW_PACKAGE_PREFIX}-nsis \ + ${MINGW_PACKAGE_PREFIX}-tcl \ + ${MINGW_PACKAGE_PREFIX}-zlib \ -- 2.40.0