From 73e6c3aceb13b155c1f7af983acb8e7ed51e97c2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 13:30:01 +0200 Subject: debian/rules: Adjust to CMake based build. (Fixes DEB builds after CMake switch). --- debian/rules | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 3082a13..ae8b287 100755 --- a/debian/rules +++ b/debian/rules @@ -6,10 +6,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -COMMON_CONFIGURE_FLAGS = --disable-silent-rules +COMMON_CONFIGURE_FLAGS = -CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +CONFIGURE_FLAGS_gtk2 = -DFLAVOUR_GTK2=ON -DFLAVOUR_GTK3=OFF +CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DFLAVOUR_GTK2=OFF LDFLAGS += -Wl,-z,defs -Wl,--as-needed @@ -17,10 +17,7 @@ export G_MESSAGES_DEBUG = all export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 %: - dh $@ --with autoreconf - -override_dh_autoreconf: - NOCONFIGURE=1 dh_autoreconf ./autogen.sh + dh $@ override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) -- cgit v1.2.3 From 0371084641a17e014e274f3ba7745e6ff8964173 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 15:31:06 +0200 Subject: debian/rules: Explicitly enable tests at build time. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ae8b287..aa08911 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -COMMON_CONFIGURE_FLAGS = +COMMON_CONFIGURE_FLAGS = -DENABLE_TESTS=ON CONFIGURE_FLAGS_gtk2 = -DFLAVOUR_GTK2=ON -DFLAVOUR_GTK3=OFF CONFIGURE_FLAGS_gtk3 = -DFLAVOUR_GTK3=ON -DFLAVOUR_GTK2=OFF -- cgit v1.2.3 From 262df761724be86fad5026452aa9636de4f8a53a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 12 May 2021 15:30:48 +0200 Subject: debian/rules: Run GTK2/GTK3 unit tests sequentially. --- debian/rules | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index aa08911..300730b 100755 --- a/debian/rules +++ b/debian/rules @@ -29,10 +29,9 @@ override_dh_auto_build: $(FLAVORS:%=dobuild-%) dobuild-%: dh_auto_build --builddirectory=builddir/$* -override_dh_auto_test: $(FLAVORS:%=dotest-%) - -dotest-%: - dh_auto_test --no-parallel --builddirectory=builddir/$* +override_dh_auto_test: + xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk2 + xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk3 override_dh_auto_install: $(FLAVORS:%=doinstall-%) -- cgit v1.2.3