gplugin/builders

Update the mingw images for the latest msys2-cross stuff

2019-08-29, Gary Kramlich
7ded22ab43b5
Parents 5309725e9965
Children d801af425448
Update the mingw images for the latest msys2-cross stuff
8 files changed, 11 insertions(+), 90 deletions(-)
  • +1 -1
    Dockerfile.mingw-w64-i686
  • +1 -1
    Dockerfile.mingw-w64-x86_64
  • +9 -30
    mingw/build.sh
  • +0 -23
    mingw/dependencies.in
  • +0 -5
    mingw/exe_wrapper
  • +0 -6
    mingw/mingw-w64-i686-pkg-config
  • +0 -19
    mingw/mingw-w64-i686.txt
  • +0 -5
    mingw/whine
    • --- a/Dockerfile.mingw-w64-i686 Mon Aug 26 21:38:14 2019 -0500
    +++ b/Dockerfile.mingw-w64-i686 Thu Aug 29 17:09:49 2019 -0500
    @@ -32,7 +32,7 @@
    CMD ["/build.sh"]
    -ENV MINGW_DISTRO=mingw-w64-i686 PREFIX=/mingw32 CROSS_FILE=mingw-w64-i686
    +ENV MINGW_DISTRO=mingw-w64-i686 PREFIX=/mingw32
    COPY mingw/build.sh /
    --- a/Dockerfile.mingw-w64-x86_64 Mon Aug 26 21:38:14 2019 -0500
    +++ b/Dockerfile.mingw-w64-x86_64 Thu Aug 29 17:09:49 2019 -0500
    @@ -31,7 +31,7 @@
    CMD ["/build.sh"]
    -ENV MINGW_DISTRO=mingw-w64-x86_64 PREFIX=/mingw32 CROSS_FILE=mingw-w64-x86_64
    +ENV MINGW_DISTRO=mingw-w64-x86_64 PREFIX=/mingw32
    COPY mingw/build.sh /
    --- a/mingw/build.sh Mon Aug 26 21:38:14 2019 -0500
    +++ b/mingw/build.sh Thu Aug 29 17:09:49 2019 -0500
    @@ -1,5 +1,5 @@
    -#!/bin/sh
    -# Copyright (C) 2015-2016 Gary Kramlich <grim@reaperworld.com>
    +#!/bin/sh -ex
    +# Copyright (C) 2015-2019 Gary Kramlich <grim@reaperworld.com>
    #
    # This program is free software; you can redistribute it and/or modify
    # it under the terms of the GNU General Public License as published by
    @@ -15,36 +15,15 @@
    # along with this program; if not, write to the Free Software Foundation,
    # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    -set -ex
    -
    -
    -BUILD_DIR="/src/build-${PREFIX}"
    -
    -trap "EC=$?; rm -rf /staging; chown -R ${UID}:${GID} /artifacts ${BUILD_DIR}; exit ${EC}" INT QUIT TERM EXIT
    +cd "${CONVEY_WORKSPACE}"
    -mkdir -p ${BUILD_DIR}
    -cd ${BUILD_DIR}
    +mkdir -p "${MINGW_DISTRO}"
    -HG_ID=$(hg id -i)
    -BUILD_NUMBER="${BUILD_NUMBER:-0}"
    -BUILD_VERSION="${BUILD_NUMBER}~${HG_ID}"
    +PKGBUILD_DIR=${PKGBUILD_DIR:-mingw}
    -cmake .. \
    - -DCMAKE_INSTALL_PREFIX=/staging/${PREFIX}/ \
    - -DCMAKE_TOOLCHAIN_FILE=/toolchain.cmake \
    - -DCMAKE_VERBOSE_MAKEFILE=on \
    - -DBUILD_PYTHON=off \
    - -DBUILD_LUA=off \
    - -DBUILD_GIR=off \
    - -DTESTING_ENABLED=off \
    - -DBUILD_GTK3=on \
    - -DBUILD_HELP2MAN=off \
    - -DNLS=off
    -make -j$(nproc)
    -make install
    +cp "${CONVEY_WORKSPACE}/packaging/${PKGBUILD_DIR}/PKGBUILD" .
    -. ./gplugin-version.sh
    +MINGW_PACKAGE_PREFIX="${MINGW_DISTRO}" xvfb-run makepkg-cross ${MAKEPKG_ARGS}
    -cd /staging
    -mv ${PREFIX}/lib/*.dll ${PREFIX}/bin
    -tar -cJf /artifacts/gplugin-${GPLUGIN_VERSION}.${BUILD_VERSION}-mingw-w64-${ARCH}.tar.xz ${PREFIX}
    +mv *.tar.xz "${CONVEY_WORKSPACE}/${MINGW_DISTRO}"
    +
    --- a/mingw/dependencies.in Mon Aug 26 21:38:14 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,23 +0,0 @@
    -mingw-w64-${ARCH}-glib2-2.48.0-3-any.pkg.tar.xz
    -mingw-w64-${ARCH}-gobject-introspection-1.50.0-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-pcre-8.38-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-libffi-3.2.1-4-any.pkg.tar.xz
    -mingw-w64-${ARCH}-gettext-0.19.7-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-lua51-5.1.5-4-any.pkg.tar.xz
    -mingw-w64-${ARCH}-pygobject-devel-3.18.0-2-any.pkg.tar.xz
    -mingw-w64-${ARCH}-python3-3.4.3-6-any.pkg.tar.xz
    -mingw-w64-${ARCH}-gtk3-3.20.9-2-any.pkg.tar.xz
    -mingw-w64-${ARCH}-cairo-1.15.2-4-any.pkg.tar.xz
    -mingw-w64-${ARCH}-pango-1.40.3-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-atk-2.22.0-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-gdk-pixbuf2-2.36.0-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-shared-mime-info-1.4-2-any.pkg.tar.xz
    -mingw-w64-${ARCH}-pixman-0.34.0-3-any.pkg.tar.xz
    -mingw-w64-${ARCH}-fontconfig-2.12.0-2-any.pkg.tar.xz
    -mingw-w64-${ARCH}-freetype-2.7-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-zlib-1.2.8-9-any.pkg.tar.xz
    -mingw-w64-${ARCH}-bzip2-1.0.6-5-any.pkg.tar.xz
    -mingw-w64-${ARCH}-libpng-1.6.21-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-harfbuzz-1.1.3-1-any.pkg.tar.xz
    -mingw-w64-${ARCH}-expat-2.1.0-6-any.pkg.tar.xz
    -mingw-w64-${ARCH}-libepoxy-1.3.1-1-any.pkg.tar.xz
    --- a/mingw/exe_wrapper Mon Aug 26 21:38:14 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,5 +0,0 @@
    -#!/bin/sh
    -
    -xvfb-run /usr/local/bin/whine $@
    -exit $?
    -
    --- a/mingw/mingw-w64-i686-pkg-config Mon Aug 26 21:38:14 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,6 +0,0 @@
    -#!/bin/sh
    -
    -PKG_CONFIG_SYSROOT_DIR=/windows PKG_CONFIG_PATH=/windows/mingw32/lib/pkgconfig/ pkg-config $@
    -
    -exit $?
    -
    --- a/mingw/mingw-w64-i686.txt Mon Aug 26 21:38:14 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,19 +0,0 @@
    -[binaries]
    -c = '/usr/bin/i686-w64-mingw32-gcc'
    -cpp = '/usr/bin/i686-w64-mingw32-g++'
    -ar = '/usr/bin/i686-w64-mingw32-ar'
    -strip = '/usr/bin/i686-w64-mingw32-strip'
    -pkgconfig = '/usr/local/bin/mingw-w64-i686-pkg-config'
    -windres = '/usr/bin/i686-w64-mingw32-windres'
    -exe_wrapper = 'exe_wrapper'
    -
    -[properties]
    -c_args = ['-I/windows/mingw-w64-i686/include/']
    -c_link_args = ['-static-libgcc']
    -
    -[host_machine]
    -system = 'windows'
    -cpu_family = 'x86'
    -cpu = 'i686'
    -endian = 'little'
    -
    --- a/mingw/whine Mon Aug 26 21:38:14 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,5 +0,0 @@
    -#!/bin/sh
    -
    -WINEPATH=/windows/mingw32/bin wine $@
    -exit $?
    -