build: Stop building libglib-testing as a subproject
Just add it as a dependency instead. It’s a lot less painful (git submodules are still a pain to use; and `git evtag` doesn’t work well with them); and libglib-testing has just done a 0.1.0 release which we can depend on. Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
parent
d374ea676f
commit
d85126da9d
|
@ -6,6 +6,7 @@ before_script:
|
||||||
libglib2.0-dev libgirepository1.0-dev libpam0g-dev
|
libglib2.0-dev libgirepository1.0-dev libpam0g-dev
|
||||||
gettext policykit-1 libpolkit-gobject-1-dev git
|
gettext policykit-1 libpolkit-gobject-1-dev git
|
||||||
lcov libgtk-3-dev libaccountsservice-dev libflatpak-dev
|
lcov libgtk-3-dev libaccountsservice-dev libflatpak-dev
|
||||||
|
libglib-testing-0-dev
|
||||||
- export LANG=C.UTF-8
|
- export LANG=C.UTF-8
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
|
@ -21,7 +22,6 @@ debian:
|
||||||
except:
|
except:
|
||||||
- tags
|
- tags
|
||||||
script:
|
script:
|
||||||
- git submodule update --init
|
|
||||||
- meson --buildtype debug --werror -Db_coverage=true -Ddocumentation=true _build .
|
- meson --buildtype debug --werror -Db_coverage=true -Ddocumentation=true _build .
|
||||||
- meson test -C _build
|
- meson test -C _build
|
||||||
# FIXME: lcov doesn't support gcc9 yet:
|
# FIXME: lcov doesn't support gcc9 yet:
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
[submodule "subprojects/libglib-testing"]
|
|
||||||
path = subprojects/libglib-testing
|
|
||||||
url = https://gitlab.gnome.org/pwithnall/libglib-testing.git
|
|
|
@ -3,8 +3,8 @@ deps = [
|
||||||
dependency('gio-unix-2.0', version: '>= 2.44'),
|
dependency('gio-unix-2.0', version: '>= 2.44'),
|
||||||
dependency('glib-2.0', version: '>= 2.60.0'),
|
dependency('glib-2.0', version: '>= 2.60.0'),
|
||||||
dependency('gobject-2.0', version: '>= 2.44'),
|
dependency('gobject-2.0', version: '>= 2.44'),
|
||||||
|
dependency('glib-testing-0'),
|
||||||
libmalcontent_dep,
|
libmalcontent_dep,
|
||||||
libglib_testing_dep,
|
|
||||||
]
|
]
|
||||||
|
|
||||||
envs = test_env + [
|
envs = test_env + [
|
||||||
|
|
|
@ -41,11 +41,6 @@ polkit_gobject = dependency('polkit-gobject-1')
|
||||||
polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir',
|
polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir',
|
||||||
define_variable: ['prefix', prefix])
|
define_variable: ['prefix', prefix])
|
||||||
|
|
||||||
libglib_testing_dep = dependency(
|
|
||||||
'glib-testing-0',
|
|
||||||
fallback: ['libglib-testing', 'libglib_testing_dep'],
|
|
||||||
)
|
|
||||||
|
|
||||||
config_h = configuration_data()
|
config_h = configuration_data()
|
||||||
config_h.set_quoted('GETTEXT_PACKAGE', 'malcontent')
|
config_h.set_quoted('GETTEXT_PACKAGE', 'malcontent')
|
||||||
config_h.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('localedir')))
|
config_h.set_quoted('PACKAGE_LOCALE_DIR', join_paths(get_option('prefix'), get_option('localedir')))
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 412c706b51ca04a9ca873bfa495e32c47f586c84
|
|
Loading…
Reference in New Issue