gplugin/builders

Replace the debian build script with the basic meson one

19 months ago, Gary Kramlich
e15ee5a247ef
Parents 18ca88aed92a
Children d4a916a7fcec
Replace the debian build script with the basic meson one
6 files changed, 8 insertions(+), 65 deletions(-)
  • +2 -2
    Dockerfile.debian-bookworm-amd64
  • +2 -2
    Dockerfile.debian-bookworm-arm64
  • +2 -2
    Dockerfile.debian-bookworm-armhf
  • +0 -26
    Dockerfile.debian-bullseye-amd64
  • +2 -2
    Dockerfile.ubuntu-jammy-amd64
  • +0 -31
    debian/build.sh
    • --- a/Dockerfile.debian-bookworm-amd64 Sat Sep 17 08:41:13 2022 -0500
    +++ b/Dockerfile.debian-bookworm-amd64 Sat Sep 17 08:43:30 2022 -0500
    @@ -6,7 +6,7 @@
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man xsltproc mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-3-dev libgtk-4-dev \
    + libgtk-4-dev libadwaita-1-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    @@ -22,5 +22,5 @@
    ENV TARGET=debian-bookworm-amd64
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bookworm-arm64 Sat Sep 17 08:41:13 2022 -0500
    +++ b/Dockerfile.debian-bookworm-arm64 Sat Sep 17 08:43:30 2022 -0500
    @@ -6,7 +6,7 @@
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man xsltproc mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-3-dev libgtk-4-dev \
    + libgtk-4-dev libadwaita-1-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    @@ -22,5 +22,5 @@
    ENV TARGET=debian-bookworm-arm64
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bookworm-armhf Sat Sep 17 08:41:13 2022 -0500
    +++ b/Dockerfile.debian-bookworm-armhf Sat Sep 17 08:43:30 2022 -0500
    @@ -6,7 +6,7 @@
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man xsltproc mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-3-dev libgtk-4-dev \
    + libgtk-4-dev libadwaita-1-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    @@ -22,5 +22,5 @@
    ENV TARGET=debian-bookworm-armhf
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bullseye-amd64 Sat Sep 17 08:41:13 2022 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,26 +0,0 @@
    -FROM debian:bullseye
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial git \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-3-dev \
    - python3-dev python-gi-dev python3-gi \
    - python3-jinja2 python3-pygments python3-toml python3-typogrify \
    - liblua5.4-dev lua-lgi luarocks \
    - libtcc-dev \
    - valac \
    - libgjs-dev \
    - libperl-dev libglib-perl libglib-object-introspection-perl \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -CMD ["/build.sh"]
    -
    -ENV TARGET=debian-bullseye-amd64
    -
    -COPY debian/build.sh /build.sh
    -
    --- a/Dockerfile.ubuntu-jammy-amd64 Sat Sep 17 08:41:13 2022 -0500
    +++ b/Dockerfile.ubuntu-jammy-amd64 Sat Sep 17 08:43:30 2022 -0500
    @@ -16,7 +16,7 @@
    ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    build-essential meson gettext help2man xsltproc mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-3-dev libgtk-4-dev \
    + libgtk-4-dev libadwaita-1-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-pygments python3-toml python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    @@ -32,5 +32,5 @@
    ENV TARGET=ubuntu-hirsute-amd64
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/debian/build.sh Sat Sep 17 08:41:13 2022 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,31 +0,0 @@
    -#!/bin/sh -ex
    -# Copyright (C) 2015-2018 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
    -# the Free Software Foundation; either version 3 of the License, or
    -# (at your option) any later version.
    -#
    -# This program is distributed in the hope that it will be useful,
    -# but WITHOUT ANY WARRANTY; without even the implied warranty of
    -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    -# GNU General Public License for more details.
    -#
    -# You should have received a copy of the GNU General Public License
    -# along with this program; if not, write to the Free Software Foundation,
    -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    -
    -cd "${CONVEY_WORKSPACE}"
    -
    -export ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${TARGET}
    -mkdir -p "${ARTIFACTS_DIR}"
    -
    -cp -a "${CONVEY_WORKSPACE}"/packaging/debian debian
    -
    -HG_ID=$(hg id -i)
    -BUILD_NUMBER="${BUILD_NUMBER:-0}"
    -BUILD_VERSION="${BUILD_NUMBER}~${HG_ID}"
    -VERSION=$(dpkg-parsechangelog --show-field Version)
    -dch -D "UNRELEASED" -v "${VERSION}.${BUILD_VERSION}" "build for ${HG_ID}"
    -debuild --preserve-envvar=ARTIFACTS_DIR -us -uc --buildinfo-option=-u"${ARTIFACTS_DIR}" --changes-option=-u"${ARTIFACTS_DIR}"
    -