build,meson: Make feature options boolean
Different options are set as `feature`, also every possible plugin, but this may cause confusion. All options set as `feature` but plugins have been made `boolean` to avoid further confusions. `help2man` is also installed in the CI image because is required to build different libraries.
This commit is contained in:
Iñigo Martínez
committed by
Aleksander Morgado
Aleksander Morgado
parent
7a7bc2e444
commit
ec2e5403f1
+17
-17
@@ -12,14 +12,14 @@ stages:
|
||||
variables:
|
||||
FDO_UPSTREAM_REPO: mobile-broadband/ModemManager
|
||||
FDO_DISTRIBUTION_VERSION: '20.04'
|
||||
FDO_DISTRIBUTION_TAG: '2021-10-03.1'
|
||||
FDO_DISTRIBUTION_TAG: '2021-11-05.1'
|
||||
FDO_DISTRIBUTION_PACKAGES: ca-certificates git gcc autoconf automake libtool
|
||||
libgettextpo-dev libgirepository1.0-dev libglib2.0-dev
|
||||
libgudev-1.0-dev python3-dbus python3-gi autopoint
|
||||
xsltproc dbus gettext gtk-doc-tools libglib2.0-doc
|
||||
gobject-introspection python-is-python3 libsystemd-dev
|
||||
libpolkit-gobject-1-dev valac meson ninja-build
|
||||
libdbus-1-dev bash-completion udev policykit-1
|
||||
libdbus-1-dev bash-completion udev policykit-1 help2man
|
||||
|
||||
build container:
|
||||
extends:
|
||||
@@ -46,7 +46,7 @@ build-no-qmi:
|
||||
script:
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
|
||||
- pushd libmbim
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled -Dbash_completion=false
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
@@ -69,13 +69,13 @@ build-qmi-qrtr-no-mbim:
|
||||
script:
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
|
||||
- pushd libqrtr-glib
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
|
||||
- pushd libqmi
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled -Dbash_completion=false -Dmbim_qmux=disabled -Dqrtr=enabled -Dcollection=basic
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dmbim_qmux=false -Dcollection=basic
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
@@ -98,7 +98,7 @@ build-qmi-no-qrtr-no-mbim:
|
||||
script:
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
|
||||
- pushd libqmi
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled -Dbash_completion=false -Dmbim_qmux=disabled -Dqrtr=disabled -Dcollection=basic
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dmbim_qmux=false -Dqrtr=false -Dcollection=basic
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
@@ -138,7 +138,7 @@ build-qmi-newest-commands:
|
||||
script:
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
|
||||
- pushd libqmi
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled -Dbash_completion=false -Dmbim_qmux=disabled -Dqrtr=disabled -Dcollection=basic
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dmbim_qmux=false -Dqrtr=false -Dcollection=basic
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
@@ -158,19 +158,19 @@ build-single-plugins:
|
||||
script:
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
|
||||
- pushd libmbim
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled -Dbash_completion=false
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
|
||||
- pushd libqrtr-glib
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
|
||||
- pushd libqmi
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=disabled -Dbash_completion=false -Dmbim_qmux=enabled -Dqrtr=enabled -Dcollection=basic
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=false -Dbash_completion=false -Dcollection=basic
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
@@ -195,19 +195,19 @@ build-default:
|
||||
script:
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
|
||||
- pushd libmbim
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled -Dbash_completion=false
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dbash_completion=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
|
||||
- pushd libqrtr-glib
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
|
||||
- pushd libqmi
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled -Dbash_completion=false -Dmbim_qmux=enabled -Dqrtr=enabled -Dcollection=basic
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dbash_completion=false -Dcollection=basic
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
@@ -249,23 +249,23 @@ build-meson-release:
|
||||
script:
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
|
||||
- pushd libmbim
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled -Dbash_completion=false
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dbash_completion=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git
|
||||
- pushd libqrtr-glib
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- git clone --depth 1 https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
|
||||
- pushd libqmi
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dintrospection=enabled -Dbash_completion=false -Dmbim_qmux=enabled -Dqrtr=enabled -Dcollection=basic
|
||||
- meson setup build --prefix=/usr -Dgtk_doc=false -Dbash_completion=false -Dcollection=basic
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- popd
|
||||
- meson setup build --buildtype=release --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dintrospection=enabled -Dqmi=enabled -Dmbim=enabled -Dqrtr=enabled -Dpolkit=strict -Dsystemd_suspend_resume=true -Dsystemdsystemunitdir=/lib/systemd/system
|
||||
- meson setup build --buildtype=release --prefix=/usr -Dwerror=true -Dgtk_doc=false -Dpolkit=strict -Dsystemdsystemunitdir=/lib/systemd/system
|
||||
- ninja -C build
|
||||
- ninja -C build install
|
||||
- ninja -C build uninstall
|
||||
|
||||
Reference in New Issue
Block a user