[folks/wip/nielsdg/drop-autotools: 1/2] WIP: Remove support for building with Autotools
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks/wip/nielsdg/drop-autotools: 1/2] WIP: Remove support for building with Autotools
- Date: Tue, 23 Apr 2019 05:49:47 +0000 (UTC)
commit 31a751ee3b274d9b2fc6552c020fed9c0e87fc9f
Author: Niels De Graef <nielsdegraef gmail com>
Date: Thu Apr 18 00:37:28 2019 +0200
WIP: Remove support for building with Autotools
Maintaining Autotools as a build system is very, very heavy on
maintenance. Let's drop this for the next big release so we can focus on
the bugs that truly matter.
Makefile.am | 100 ---
autogen.sh | 37 -
backends/Makefile.am | 46 --
backends/backend-library.mk | 200 -----
backends/backend.mk | 83 --
backends/bluez/Makefile.am | 43 --
backends/dummy/Makefile.am | 40 -
backends/dummy/lib/Makefile.am | 46 --
backends/dummy/lib/folks-dummy-uninstalled.pc.in | 12 -
backends/dummy/lib/folks-dummy.pc.in | 15 -
backends/eds/Makefile.am | 50 --
backends/eds/lib/Makefile.am | 54 --
backends/eds/lib/folks-eds-uninstalled.pc.in | 12 -
backends/eds/lib/folks-eds.pc.in | 15 -
backends/key-file/Makefile.am | 37 -
backends/libsocialweb/Makefile.am | 44 --
backends/libsocialweb/lib/Makefile.am | 46 --
.../lib/folks-libsocialweb-uninstalled.pc.in | 12 -
backends/libsocialweb/lib/folks-libsocialweb.pc.in | 15 -
backends/ofono/Makefile.am | 45 --
backends/telepathy/Makefile.am | 45 --
backends/telepathy/lib/Makefile.am | 261 -------
.../lib/folks-telepathy-uninstalled.pc.in | 12 -
backends/telepathy/lib/folks-telepathy.pc.in | 15 -
backends/tracker/Makefile.am | 44 --
backends/tracker/lib/Makefile.am | 47 --
.../tracker/lib/folks-tracker-uninstalled.pc.in | 12 -
backends/tracker/lib/folks-tracker.pc.in | 15 -
check.mk | 6 -
configure.ac | 856 ---------------------
docs/Makefile.am | 415 ----------
folks/Makefile.am | 244 ------
folks/folks-uninstalled.pc.in | 12 -
folks/folks.pc.in | 15 -
git.mk | 400 ----------
lcov.mk | 23 -
m4/.gitignore | 9 -
m4/as-compiler-flag.m4 | 33 -
m4/introspection.m4 | 94 ---
meson.build | 2 +-
po/Makevars | 78 --
tests/Makefile.am | 53 --
tests/bluez/Makefile.am | 47 --
tests/data/Makefile.am | 10 -
tests/dummy/Makefile.am | 50 --
tests/eds/Makefile.am | 198 -----
tests/folks/Makefile.am | 117 ---
tests/key-file/Makefile.am | 36 -
tests/lib/Makefile.am | 129 ----
tests/lib/bluez/Makefile.am | 51 --
tests/lib/dummy/Makefile.am | 60 --
tests/lib/eds/Makefile.am | 68 --
tests/lib/folks-test-uninstalled.pc.in | 12 -
tests/lib/key-file/Makefile.am | 52 --
tests/lib/libsocialweb/Makefile.am | 61 --
tests/lib/telepathy/Makefile.am | 74 --
tests/lib/telepathy/contactlist/Makefile.am | 129 ----
tests/lib/test-case.vala | 36 +-
tests/lib/tracker/Makefile.am | 68 --
tests/libsocialweb/Makefile.am | 50 --
tests/telepathy/Makefile.am | 90 ---
tests/test.mk | 104 ---
tests/tools/Makefile.am | 5 -
tests/tracker/Makefile.am | 336 --------
tools/Makefile.am | 52 --
tools/inspect/Makefile.am | 57 --
valgrind.mk | 22 -
67 files changed, 3 insertions(+), 5554 deletions(-)
---
diff --git a/meson.build b/meson.build
index 883893dd..79b09c06 100644
--- a/meson.build
+++ b/meson.build
@@ -185,7 +185,7 @@ add_project_arguments([
language: 'vala'
)
-# Configuration for pc.in files
+# Configuration for the pkgconfig files
common_pkgconf_variables = [
'exec_prefix=${prefix}',
'bindir=${prefix}' / get_option('bindir'),
diff --git a/tests/lib/test-case.vala b/tests/lib/test-case.vala
index 07d54b1d..c290daab 100644
--- a/tests/lib/test-case.vala
+++ b/tests/lib/test-case.vala
@@ -43,10 +43,8 @@ public abstract class Folks.TestCase : Object
{
Intl.setlocale (LocaleCategory.ALL, "");
- /* Enable all debug output from libfolks. This is OK, as automake-1.12’s
- * parallel test harness will only save the debug output from failed
- * tests. If the user’s already set those variables, though, don’t
- * overwrite them. */
+ /* Enable all debug output from libfolks. If the user’s already set
+ * those variables, though, don’t overwrite them. */
Environment.set_variable ("G_MESSAGES_DEBUG", "all", false);
/* Turn off use of gvfs. If using GTestDBus it's unavailable,
@@ -65,36 +63,6 @@ public abstract class Folks.TestCase : Object
this._transient_dir = this.create_transient_dir ();
this.private_bus_up ();
- if (Environment.get_variable ("FOLKS_TESTS_INSTALLED") == null)
- {
- // FIXME: this can be dropped when removing autotools
- string[] locations = {
- Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/key-file/.libs/key-file.so",
- Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/dummy/.libs/dummy.so",
- };
-
- if (Folks.BuildConf.HAVE_EDS)
- locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/eds/.libs/eds.so";
-
- if (Folks.BuildConf.HAVE_LIBSOCIALWEB)
- locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/libsocialweb/.libs/libsocialweb.so";
-
- if (Folks.BuildConf.HAVE_OFONO)
- locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/ofono/.libs/ofono.so";
-
- if (Folks.BuildConf.HAVE_TELEPATHY)
- locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/telepathy/.libs/telepathy.so";
-
- if (Folks.BuildConf.HAVE_TRACKER)
- locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/tracker/.libs/tracker.so";
-
- if (Folks.BuildConf.HAVE_BLUEZ)
- locations += Folks.BuildConf.ABS_TOP_BUILDDIR + "/backends/bluez/.libs/bluez.so";
-
- Environment.set_variable ("FOLKS_BACKEND_PATH",
- string.joinv (":", locations), false);
- }
-
/* By default, no backend is allowed. Subclasses must override. */
Environment.set_variable ("FOLKS_BACKENDS_ALLOWED", "", true);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]