gplugin/builders

Update the opensuse image to use the meson build script

19 months ago, Gary Kramlich
d4a916a7fcec
Parents e15ee5a247ef
Children 945b2f8f33b8
Update the opensuse image to use the meson build script
2 files changed, 14 insertions(+), 47 deletions(-)
  • +14 -13
    Dockerfile.opensuse-tumbleweed-amd64
  • +0 -34
    rpm/build.sh
    • --- a/Dockerfile.opensuse-tumbleweed-amd64 Sat Sep 17 08:43:30 2022 -0500
    +++ b/Dockerfile.opensuse-tumbleweed-amd64 Sat Sep 17 08:58:23 2022 -0500
    @@ -1,23 +1,24 @@
    FROM opensuse/tumbleweed:latest
    RUN set -ex && \
    - zypper --gpg-auto-import-keys refresh && \
    - zypper install -y \
    - ca-certificates-mozilla \
    - meson ninja gcc mercurial git pkgconfig \
    - rpm-build \
    - help2man libxslt-tools gettext-tools \
    - glib2-devel gobject-introspection-devel \
    - gtk3-devel gtk4-devel \
    - python3-devel python3-gobject python3-gobject-devel \
    + zypper --gpg-auto-import-keys refresh && \
    + zypper install -y \
    + ca-certificates-mozilla \
    + meson ninja gcc mercurial git pkgconfig \
    + rpm-build \
    + help2man libxslt-tools gettext-tools \
    + glib2-devel gobject-introspection-devel \
    + gtk4-devel \
    + libadwaita-devel \
    + python3-devel python3-gobject python3-gobject-devel \
    python3-Jinja2 python3-Markdown python3-MarkupSafe python3-Pygments \
    python3-toml python3-typogrify \
    - lua54-devel lua53-devel lua51-devel lua-lgi \
    - vala \
    + lua51-devel lua-lgi \
    + vala \
    libgjs-devel \
    perl-ExtUtils-Config perl-Glib perl-Glib-Object-Introspection \
    && \
    - zypper clean -y
    + zypper clean
    CMD ["/build.sh"]
    @@ -25,5 +26,5 @@
    VERSION=tumbleweed \
    ARCH=amd64
    -COPY rpm/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/rpm/build.sh Sat Sep 17 08:43:30 2022 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,34 +0,0 @@
    -#!/bin/sh -ex
    -# Copyright (C) 2015-2016 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}
    -
    -ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${TARGET}
    -mkdir -p ${ARTIFACTS_DIR}
    -
    -BUILD_NUMBER="${BUILD_NUMBER:-0}"
    -BUILD_VERSION="${BUILD_NUMBER}~$(hg id -i)"
    -
    -# we need to generate the spec file so we need to run a meson
    -meson /tmp/${TARGET}
    -
    -# now that we have our rpm spec file we can do an rpmbuild
    -rpmbuild -bb \
    - -D "_rpmdir ${ARTIFACTS_DIR}" \
    - -D "_builddir ${CONVEY_WORKSPACE}" \
    - -D "build_number ${BUILD_VERSION}" \
    - /tmp/${TARGET}/packaging/gplugin.spec