From 6d664763831dcbf5445a86d1c35c5f05f44ad4fb Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 18 Dec 2008 08:54:33 +0100 Subject: [PATCH] move config, interfaces and pluginsystem to liblumieracommon --- src/backend/backend.c | 2 +- src/backend/mmap.c | 2 +- src/common/Makefile.am | 34 ++++++++++++++++--- src/common/appstate.cpp | 8 ++--- src/{lib => common}/config.c | 2 +- src/{lib => common}/config.h | 4 +-- src/{lib => common}/config_interface.c | 6 ++-- src/{lib => common}/config_interface.h | 2 +- src/{lib => common}/config_lookup.c | 4 +-- src/{lib => common}/config_lookup.h | 2 +- src/{lib => common}/config_typed.c | 2 +- src/{lib => common}/config_wordlist.c | 2 +- src/{lib => common}/configentry.c | 2 +- src/{lib => common}/configentry.h | 2 +- src/{lib => common}/configitem.c | 6 ++-- src/{lib => common}/configitem.h | 2 +- src/{lib => common}/configrules.cpp | 4 +-- src/{lib => common}/configrules.hpp | 0 src/common/instancehandle.hpp | 4 +-- src/{lib => common}/interface.c | 6 ++-- src/{lib => common}/interface.h | 0 src/{lib => common}/interfacedescriptor.h | 2 +- src/common/interfaceproxy.cpp | 2 +- src/{lib => common}/interfaceregistry.c | 4 +-- src/{lib => common}/interfaceregistry.h | 4 +-- src/{lib => common}/plugin.c | 6 ++-- src/{lib => common}/plugin.h | 2 +- src/{lib => common}/plugin_dynlib.c | 2 +- .../query/fake-configrules.cpp} | 2 +- .../query/fake-configrules.hpp} | 12 +++---- src/gui/gtk-lumiera.cpp | 2 +- src/gui/guifacade.hpp | 2 +- src/gui/guinotificationfacade.cpp | 2 +- src/gui/guistart.cpp | 4 +-- src/include/guinotificationfacade.h | 2 +- src/lib/Makefile.am | 26 +------------- src/lib/query.hpp | 2 +- src/proc/asset/struct.cpp | 2 +- src/proc/asset/structfactoryimpl.hpp | 2 +- src/proc/mobject/session/defsmanager.cpp | 2 +- tests/backend/test-filedescriptors.c | 2 +- tests/backend/test-filehandles.c | 2 +- tests/backend/test-filemmap.c | 2 +- .../mobject/session/defsmanagerimpltest.cpp | 2 +- .../proc/mobject/session/defsmanagertest.cpp | 2 +- tests/lumiera/hello_interface.h | 2 +- tests/lumiera/test-config.c | 4 +-- tests/lumiera/test-interfaces.c | 10 +++--- tests/plugin/example_plugin.c | 4 +-- 49 files changed, 104 insertions(+), 104 deletions(-) rename src/{lib => common}/config.c (99%) rename src/{lib => common}/config.h (99%) rename src/{lib => common}/config_interface.c (99%) rename src/{lib => common}/config_interface.h (99%) rename src/{lib => common}/config_lookup.c (99%) rename src/{lib => common}/config_lookup.h (99%) rename src/{lib => common}/config_typed.c (99%) rename src/{lib => common}/config_wordlist.c (99%) rename src/{lib => common}/configentry.c (98%) rename src/{lib => common}/configentry.h (98%) rename src/{lib => common}/configitem.c (99%) rename src/{lib => common}/configitem.h (99%) rename src/{lib => common}/configrules.cpp (95%) rename src/{lib => common}/configrules.hpp (100%) rename src/{lib => common}/interface.c (99%) rename src/{lib => common}/interface.h (100%) rename src/{lib => common}/interfacedescriptor.h (99%) rename src/{lib => common}/interfaceregistry.c (99%) rename src/{lib => common}/interfaceregistry.h (98%) rename src/{lib => common}/plugin.c (99%) rename src/{lib => common}/plugin.h (99%) rename src/{lib => common}/plugin_dynlib.c (98%) rename src/{lib/query/mockconfigrules.cpp => common/query/fake-configrules.cpp} (99%) rename src/{lib/query/mockconfigrules.hpp => common/query/fake-configrules.hpp} (96%) diff --git a/src/backend/backend.c b/src/backend/backend.c index aed53ac47..a06bdf853 100644 --- a/src/backend/backend.c +++ b/src/backend/backend.c @@ -22,7 +22,7 @@ #include "lib/safeclib.h" #include "backend/backend.h" -#include "lib/config.h" +#include "common/config.h" #include "backend/filehandlecache.h" #include "backend/filedescriptor.h" #include "backend/mmapcache.h" diff --git a/src/backend/mmap.c b/src/backend/mmap.c index 3df63fd7f..13ced207c 100644 --- a/src/backend/mmap.c +++ b/src/backend/mmap.c @@ -23,7 +23,7 @@ #include "backend/mmap.h" #include "backend/mmapcache.h" -#include "lib/config.h" +#include "common/config.h" #include #include diff --git a/src/common/Makefile.am b/src/common/Makefile.am index f30a5715d..6065ff998 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -23,6 +23,19 @@ liblumieracommon_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror liblumieracommon_la_LIBADD = liblumiera.la liblumieracommon_la_SOURCES = \ + $(liblumieracommon_la_srcdir)/config.c \ + $(liblumieracommon_la_srcdir)/config_typed.c \ + $(liblumieracommon_la_srcdir)/config_wordlist.c \ + $(liblumieracommon_la_srcdir)/configentry.c \ + $(liblumieracommon_la_srcdir)/configitem.c \ + $(liblumieracommon_la_srcdir)/config_lookup.c \ + $(liblumieracommon_la_srcdir)/config_interface.c\ + $(liblumieracommon_la_srcdir)/configrules.cpp \ + $(liblumieracommon_la_srcdir)/query/fake-configrules.cpp \ + $(liblumieracommon_la_srcdir)/interface.c \ + $(liblumieracommon_la_srcdir)/interfaceregistry.c \ + $(liblumieracommon_la_srcdir)/plugin.c \ + $(liblumieracommon_la_srcdir)/plugin_dynlib.c \ $(liblumieracommon_la_srcdir)/guifacade.cpp \ $(liblumieracommon_la_srcdir)/configfacade.cpp \ $(liblumieracommon_la_srcdir)/appstate.cpp \ @@ -33,9 +46,20 @@ liblumieracommon_la_SOURCES = \ noinst_HEADERS += \ - $(lumiera_srcdir)/lumiera/subsys.hpp \ - $(lumiera_srcdir)/lumiera/appstate.hpp \ - $(lumiera_srcdir)/lumiera/option.hpp \ - $(lumiera_srcdir)/lumiera/subsystemrunner.hpp \ - $(lumiera_srcdir)/lumiera/instancehandle.hpp + $(liblumieracommon_la_srcdir)/interface.h \ + $(liblumieracommon_la_srcdir)/interfaceregistry.h \ + $(liblumieracommon_la_srcdir)/interfacedescriptor.h \ + $(liblumieracommon_la_srcdir)/plugin.h \ + $(liblumieracommon_la_srcdir)/config.h \ + $(liblumieracommon_la_srcdir)/configentry.h \ + $(liblumieracommon_la_srcdir)/configitem.h \ + $(liblumieracommon_la_srcdir)/config_lookup.h \ + $(liblumieracommon_la_srcdir)/config_interface.h \ + $(liblumieracommon_la_srcdir)/configrules.hpp \ + $(liblumieracommon_la_srcdir)/query/fake-configrules.hpp + $(liblumieracommon_la_srcdir)/subsys.hpp \ + $(liblumieracommon_la_srcdir)/appstate.hpp \ + $(liblumieracommon_la_srcdir)/option.hpp \ + $(liblumieracommon_la_srcdir)/subsystemrunner.hpp \ + $(liblumieracommon_la_srcdir)/instancehandle.hpp diff --git a/src/common/appstate.cpp b/src/common/appstate.cpp index 2f3fe8010..926525a39 100644 --- a/src/common/appstate.cpp +++ b/src/common/appstate.cpp @@ -28,11 +28,11 @@ #include "common/subsystemrunner.hpp" extern "C" { -#include "lib/config_interface.h" +#include "common/config_interface.h" -#include "lib/interface.h" -#include "lib/interfaceregistry.h" -#include "lib/plugin.h" +#include "common/interface.h" +#include "common/interfaceregistry.h" +#include "common/plugin.h" } #include "lib/util.hpp" diff --git a/src/lib/config.c b/src/common/config.c similarity index 99% rename from src/lib/config.c rename to src/common/config.c index 0bb44e2d6..8801c4576 100644 --- a/src/lib/config.c +++ b/src/common/config.c @@ -21,7 +21,7 @@ //TODO: Support library includes// #include "lib/safeclib.h" -#include "lib/config.h" +#include "common/config.h" //TODO: Lumiera header includes// diff --git a/src/lib/config.h b/src/common/config.h similarity index 99% rename from src/lib/config.h rename to src/common/config.h index 79ac04368..0eeca4913 100644 --- a/src/lib/config.h +++ b/src/common/config.h @@ -51,8 +51,8 @@ LUMIERA_ERROR_DECLARE (CONFIG_NO_ENTRY); //TODO: Lumiera header includes// -#include "lib/config_lookup.h" -#include "lib/configitem.h" +#include "common/config_lookup.h" +#include "common/configitem.h" //TODO: System includes// #include diff --git a/src/lib/config_interface.c b/src/common/config_interface.c similarity index 99% rename from src/lib/config_interface.c rename to src/common/config_interface.c index 091d7b1b7..a40a8ab03 100644 --- a/src/lib/config_interface.c +++ b/src/common/config_interface.c @@ -23,8 +23,8 @@ //TODO: Lumiera header includes// -#include "lib/config_interface.h" -#include "lib/config.h" +#include "common/config_interface.h" +#include "common/config.h" //TODO: internal/static forward declarations// @@ -140,7 +140,7 @@ LUMIERA_EXPORT( #ifndef LUMIERA_PLUGIN -#include "lib/interfaceregistry.h" +#include "common/interfaceregistry.h" void lumiera_config_interface_init (void) { diff --git a/src/lib/config_interface.h b/src/common/config_interface.h similarity index 99% rename from src/lib/config_interface.h rename to src/common/config_interface.h index 5cad4c888..d4eca205a 100644 --- a/src/lib/config_interface.h +++ b/src/common/config_interface.h @@ -24,7 +24,7 @@ //TODO: Support library includes// -#include "lib/interface.h" +#include "common/interface.h" //TODO: Forward declarations// diff --git a/src/lib/config_lookup.c b/src/common/config_lookup.c similarity index 99% rename from src/lib/config_lookup.c rename to src/common/config_lookup.c index c44127623..1c5792edf 100644 --- a/src/lib/config_lookup.c +++ b/src/common/config_lookup.c @@ -20,8 +20,8 @@ */ #include "lib/safeclib.h" -#include "lib/config_lookup.h" -#include "lib/config.h" +#include "common/config_lookup.h" +#include "common/config.h" /* we only use one fatal error for now, when allocation in the config system fail, something else is pretty wrong */ LUMIERA_ERROR_DEFINE (CONFIG_LOOKUP, "config lookup failure"); diff --git a/src/lib/config_lookup.h b/src/common/config_lookup.h similarity index 99% rename from src/lib/config_lookup.h rename to src/common/config_lookup.h index 50dabcf47..aa11e8dff 100644 --- a/src/lib/config_lookup.h +++ b/src/common/config_lookup.h @@ -33,7 +33,7 @@ typedef struct lumiera_config_lookupentry_struct lumiera_config_lookupentry; typedef lumiera_config_lookupentry* LumieraConfigLookupentry; -#include "lib/configitem.h" +#include "common/configitem.h" #include diff --git a/src/lib/config_typed.c b/src/common/config_typed.c similarity index 99% rename from src/lib/config_typed.c rename to src/common/config_typed.c index a892a9834..5a278665a 100644 --- a/src/lib/config_typed.c +++ b/src/common/config_typed.c @@ -24,7 +24,7 @@ //TODO: Lumiera header includes// -#include "lib/config.h" +#include "common/config.h" //TODO: internal/static forward declarations// extern LumieraConfig lumiera_global_config; diff --git a/src/lib/config_wordlist.c b/src/common/config_wordlist.c similarity index 99% rename from src/lib/config_wordlist.c rename to src/common/config_wordlist.c index 2bdad97d2..9b479f796 100644 --- a/src/lib/config_wordlist.c +++ b/src/common/config_wordlist.c @@ -23,7 +23,7 @@ #include "lib/safeclib.h" -#include "lib/config.h" +#include "common/config.h" extern LumieraConfig lumiera_global_config; diff --git a/src/lib/configentry.c b/src/common/configentry.c similarity index 98% rename from src/lib/configentry.c rename to src/common/configentry.c index 3f4f05c74..0b09f76c3 100644 --- a/src/lib/configentry.c +++ b/src/common/configentry.c @@ -23,7 +23,7 @@ #include "lib/safeclib.h" //TODO: Lumiera header includes// -#include "lib/configentry.h" +#include "common/configentry.h" //TODO: internal/static forward declarations// diff --git a/src/lib/configentry.h b/src/common/configentry.h similarity index 98% rename from src/lib/configentry.h rename to src/common/configentry.h index c22cde84b..92d63ec46 100644 --- a/src/lib/configentry.h +++ b/src/common/configentry.h @@ -31,7 +31,7 @@ typedef lumiera_configentry* LumieraConfigentry; //TODO: Lumiera header includes// -#include "lib/configitem.h" +#include "common/configitem.h" //TODO: System includes// #include diff --git a/src/lib/configitem.c b/src/common/configitem.c similarity index 99% rename from src/lib/configitem.c rename to src/common/configitem.c index 5eb854633..9897158b1 100644 --- a/src/lib/configitem.c +++ b/src/common/configitem.c @@ -25,9 +25,9 @@ //TODO: Lumiera header includes// -#include "lib/config.h" -#include "lib/configitem.h" -#include "lib/configentry.h" +#include "common/config.h" +#include "common/configitem.h" +#include "common/configentry.h" static LumieraConfigitem parse_directive (LumieraConfigitem self, char* itr); diff --git a/src/lib/configitem.h b/src/common/configitem.h similarity index 99% rename from src/lib/configitem.h rename to src/common/configitem.h index 23d3f25b2..942f77ef8 100644 --- a/src/lib/configitem.h +++ b/src/common/configitem.h @@ -33,7 +33,7 @@ typedef lumiera_configitem* LumieraConfigitem; struct lumiera_configitem_vtable; //TODO: Lumiera header includes// -#include "lib/config_lookup.h" +#include "common/config_lookup.h" //TODO: System includes// diff --git a/src/lib/configrules.cpp b/src/common/configrules.cpp similarity index 95% rename from src/lib/configrules.cpp rename to src/common/configrules.cpp index c563579ba..f50814fb7 100644 --- a/src/lib/configrules.cpp +++ b/src/common/configrules.cpp @@ -21,8 +21,8 @@ * *****************************************************/ -#include "lib/configrules.hpp" -#include "lib/query/mockconfigrules.hpp" +#include "common/configrules.hpp" +#include "common/query/fake-configrules.hpp" //#include "lib/util.hpp" #include "include/nobugcfg.h" diff --git a/src/lib/configrules.hpp b/src/common/configrules.hpp similarity index 100% rename from src/lib/configrules.hpp rename to src/common/configrules.hpp diff --git a/src/common/instancehandle.hpp b/src/common/instancehandle.hpp index bdbba91a5..26dd084be 100644 --- a/src/common/instancehandle.hpp +++ b/src/common/instancehandle.hpp @@ -42,8 +42,8 @@ #include "include/nobugcfg.h" extern "C" { -#include "lib/interface.h" -#include "lib/interfaceregistry.h" +#include "common/interface.h" +#include "common/interfaceregistry.h" } #include diff --git a/src/lib/interface.c b/src/common/interface.c similarity index 99% rename from src/lib/interface.c rename to src/common/interface.c index 9c88b9a20..9b86ae4f3 100644 --- a/src/lib/interface.c +++ b/src/common/interface.c @@ -22,10 +22,10 @@ #include "lib/mutex.h" #include "lib/safeclib.h" -#include "lib/plugin.h" -#include "lib/interface.h" +#include "common/plugin.h" +#include "common/interface.h" -#include "lib/interfaceregistry.h" +#include "common/interfaceregistry.h" #include diff --git a/src/lib/interface.h b/src/common/interface.h similarity index 100% rename from src/lib/interface.h rename to src/common/interface.h diff --git a/src/lib/interfacedescriptor.h b/src/common/interfacedescriptor.h similarity index 99% rename from src/lib/interfacedescriptor.h rename to src/common/interfacedescriptor.h index 93282469a..121c0711e 100644 --- a/src/lib/interfacedescriptor.h +++ b/src/common/interfacedescriptor.h @@ -21,7 +21,7 @@ #ifndef LUMIERA_INTERFACEDESCRIPTOR_H #define LUMIERA_INTERFACEDESCRIPTOR_H -#include "lib/interface.h" +#include "common/interface.h" /** diff --git a/src/common/interfaceproxy.cpp b/src/common/interfaceproxy.cpp index ea12e5239..9d7c5479a 100644 --- a/src/common/interfaceproxy.cpp +++ b/src/common/interfaceproxy.cpp @@ -27,7 +27,7 @@ #include "include/error.hpp" extern "C" { -#include "lib/interface.h" +#include "common/interface.h" } using util::cStr; diff --git a/src/lib/interfaceregistry.c b/src/common/interfaceregistry.c similarity index 99% rename from src/lib/interfaceregistry.c rename to src/common/interfaceregistry.c index 10809ec48..81ad12b06 100644 --- a/src/lib/interfaceregistry.c +++ b/src/common/interfaceregistry.c @@ -29,8 +29,8 @@ -#include "lib/plugin.h" -#include "lib/interfaceregistry.h" +#include "common/plugin.h" +#include "common/interfaceregistry.h" /** * @file diff --git a/src/lib/interfaceregistry.h b/src/common/interfaceregistry.h similarity index 98% rename from src/lib/interfaceregistry.h rename to src/common/interfaceregistry.h index a440ee3d1..41ba6cecd 100644 --- a/src/lib/interfaceregistry.h +++ b/src/common/interfaceregistry.h @@ -24,8 +24,8 @@ #include "lib/mutex.h" #include "lib/psplay.h" -#include "lib/interface.h" -#include "lib/plugin.h" +#include "common/interface.h" +#include "common/plugin.h" #include diff --git a/src/lib/plugin.c b/src/common/plugin.c similarity index 99% rename from src/lib/plugin.c rename to src/common/plugin.c index 55c760f4e..3795f8511 100644 --- a/src/lib/plugin.c +++ b/src/common/plugin.c @@ -25,9 +25,9 @@ #include "lib/mutex.h" #include "lib/error.h" -#include "lib/interfaceregistry.h" -#include "lib/config.h" -#include "lib/plugin.h" +#include "common/interfaceregistry.h" +#include "common/config.h" +#include "common/plugin.h" #include diff --git a/src/lib/plugin.h b/src/common/plugin.h similarity index 99% rename from src/lib/plugin.h rename to src/common/plugin.h index f82866bd0..c05cfe1bd 100644 --- a/src/lib/plugin.h +++ b/src/common/plugin.h @@ -24,7 +24,7 @@ #include "lib/psplay.h" #include "lib/error.h" -#include "lib/interface.h" +#include "common/interface.h" #include #include diff --git a/src/lib/plugin_dynlib.c b/src/common/plugin_dynlib.c similarity index 98% rename from src/lib/plugin_dynlib.c rename to src/common/plugin_dynlib.c index 487862823..afdb0e63c 100644 --- a/src/lib/plugin_dynlib.c +++ b/src/common/plugin_dynlib.c @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "lib/plugin.h" +#include "common/plugin.h" #include #include diff --git a/src/lib/query/mockconfigrules.cpp b/src/common/query/fake-configrules.cpp similarity index 99% rename from src/lib/query/mockconfigrules.cpp rename to src/common/query/fake-configrules.cpp index 9a68372d8..576fbdc50 100644 --- a/src/lib/query/mockconfigrules.cpp +++ b/src/common/query/fake-configrules.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "lib/query/mockconfigrules.hpp" +#include "common/query/fake-configrules.hpp" #include "proc/mobject/session/track.hpp" #include "proc/asset/procpatt.hpp" diff --git a/src/lib/query/mockconfigrules.hpp b/src/common/query/fake-configrules.hpp similarity index 96% rename from src/lib/query/mockconfigrules.hpp rename to src/common/query/fake-configrules.hpp index 0d0fca8a3..21da6f2eb 100644 --- a/src/lib/query/mockconfigrules.hpp +++ b/src/common/query/fake-configrules.hpp @@ -1,5 +1,5 @@ /* - MOCKCONFIGRULES.hpp - mock implementation of the config rules system + FAKE-CONFIGRULES.hpp - dummy implementation of the config rules system Copyright (C) Lumiera.org 2008, Hermann Vosseler @@ -21,9 +21,9 @@ */ -/** @file mockconfigrules.hpp +/** @file fake-configrules.hpp ** Mock/Test/Debugging Implementation of the config rules system. - ** Instead of actually parsing/analyzing/resolving queries, this implementation + ** Instead of actually parsing/analysing/resolving queries, this implementation ** uses a Table of hard wired queries together with preconfigured object instances ** as answer values. As of 1/2008 it is used to "keep the implementation work going" ** -- later on, when we use a real Prolog interpreter, it still may be useful for @@ -35,11 +35,11 @@ */ -#ifndef LUMIERA_MOCKCONFIGRULES_H -#define LUMIERA_MOCKCONFIGRULES_H +#ifndef LUMIERA_FAKECONFIGRULES_H +#define LUMIERA_FAKECONFIGRULES_H #include "proc/mobject/session.hpp" -#include "lib/configrules.hpp" +#include "common/configrules.hpp" #include "lib/util.hpp" #include diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp index 90e1cc1da..64dd4668c 100644 --- a/src/gui/gtk-lumiera.cpp +++ b/src/gui/gtk-lumiera.cpp @@ -33,7 +33,7 @@ #include "model/project.hpp" extern "C" { -#include "lib/interface.h" +#include "common/interface.h" } NOBUG_CPP_DEFINE_FLAG(gui); diff --git a/src/gui/guifacade.hpp b/src/gui/guifacade.hpp index dd45dad1c..677ef4711 100644 --- a/src/gui/guifacade.hpp +++ b/src/gui/guifacade.hpp @@ -41,7 +41,7 @@ #include "common/subsys.hpp" extern "C" { -#include "lib/interface.h" +#include "common/interface.h" } diff --git a/src/gui/guinotificationfacade.cpp b/src/gui/guinotificationfacade.cpp index 30dd4da60..a697367d4 100644 --- a/src/gui/guinotificationfacade.cpp +++ b/src/gui/guinotificationfacade.cpp @@ -27,7 +27,7 @@ #include "lib/util.hpp" extern "C" { -#include "lib/interfacedescriptor.h" +#include "common/interfacedescriptor.h" } #include diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp index 5ac6e4d43..8de92793e 100644 --- a/src/gui/guistart.cpp +++ b/src/gui/guistart.cpp @@ -48,8 +48,8 @@ #include "lib/singleton.hpp" extern "C" { -#include "lib/interface.h" -#include "lib/interfacedescriptor.h" +#include "common/interface.h" +#include "common/interfacedescriptor.h" } #include diff --git a/src/include/guinotificationfacade.h b/src/include/guinotificationfacade.h index ecb0f3b49..1f176470a 100644 --- a/src/include/guinotificationfacade.h +++ b/src/include/guinotificationfacade.h @@ -86,7 +86,7 @@ extern "C" { #endif /* =========================== CLI Interface ================= */ -#include "lib/interface.h" +#include "common/interface.h" LUMIERA_INTERFACE_DECLARE (lumieraorg_GuiNotification, 1, LUMIERA_INTERFACE_SLOT (void, displayInfo, (const char*)), diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 7ab58afe3..ee832c018 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -22,6 +22,7 @@ liblumiera_la_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -DLUMIERA_PLUGIN_PATH= liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/error.c \ + $(liblumiera_la_srcdir)/exception.cpp \ $(liblumiera_la_srcdir)/mutex.c \ $(liblumiera_la_srcdir)/rwlock.c \ $(liblumiera_la_srcdir)/condition.c \ @@ -31,26 +32,12 @@ liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/psplay.c \ $(liblumiera_la_srcdir)/mrucache.c \ $(liblumiera_la_srcdir)/time.c \ - $(liblumiera_la_srcdir)/config.c \ - $(liblumiera_la_srcdir)/config_typed.c \ - $(liblumiera_la_srcdir)/config_wordlist.c \ - $(liblumiera_la_srcdir)/configentry.c \ - $(liblumiera_la_srcdir)/configitem.c \ - $(liblumiera_la_srcdir)/config_lookup.c \ - $(liblumiera_la_srcdir)/config_interface.c \ - $(liblumiera_la_srcdir)/interface.c \ - $(liblumiera_la_srcdir)/interfaceregistry.c \ - $(liblumiera_la_srcdir)/plugin.c \ - $(liblumiera_la_srcdir)/plugin_dynlib.c \ $(liblumiera_la_srcdir)/allocationcluster.cpp \ $(liblumiera_la_srcdir)/external/libgavl.cpp \ $(liblumiera_la_srcdir)/lumitime.cpp \ $(liblumiera_la_srcdir)/util.cpp \ $(liblumiera_la_srcdir)/visitor.cpp \ - $(liblumiera_la_srcdir)/configrules.cpp \ - $(liblumiera_la_srcdir)/exception.cpp \ $(liblumiera_la_srcdir)/query.cpp \ - $(liblumiera_la_srcdir)/query/mockconfigrules.cpp \ $(liblumiera_la_srcdir)/streamtype.cpp \ $(liblumiera_la_srcdir)/test/testoption.cpp \ $(liblumiera_la_srcdir)/test/suite.cpp \ @@ -68,15 +55,6 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/mrucache.h \ $(liblumiera_la_srcdir)/time.h \ $(liblumiera_la_srcdir)/ppmpl.h \ - $(liblumiera_la_srcdir)/interface.h \ - $(liblumiera_la_srcdir)/interfaceregistry.h \ - $(liblumiera_la_srcdir)/interfacedescriptor.h \ - $(liblumiera_la_srcdir)/plugin.h \ - $(liblumiera_la_srcdir)/config.h \ - $(liblumiera_la_srcdir)/configentry.h \ - $(liblumiera_la_srcdir)/configitem.h \ - $(liblumiera_la_srcdir)/config_lookup.h \ - $(liblumiera_la_srcdir)/config_interface.h \ $(liblumiera_la_srcdir)/allocationcluster.hpp \ $(liblumiera_la_srcdir)/scopedholdertransfer.hpp \ $(liblumiera_la_srcdir)/scopedholder.hpp \ @@ -91,7 +69,6 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/visitor.hpp \ $(liblumiera_la_srcdir)/visitordispatcher.hpp \ $(liblumiera_la_srcdir)/visitorpolicies.hpp \ - $(liblumiera_la_srcdir)/configrules.hpp \ $(liblumiera_la_srcdir)/multithread.hpp \ $(liblumiera_la_srcdir)/p.hpp \ $(liblumiera_la_srcdir)/query.hpp \ @@ -107,5 +84,4 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/test/suite.hpp \ $(liblumiera_la_srcdir)/test/testoption.hpp \ $(liblumiera_la_srcdir)/test/run.hpp \ - $(liblumiera_la_srcdir)/query/mockconfigrules.hpp diff --git a/src/lib/query.hpp b/src/lib/query.hpp index e0eac98e4..8aafae6ff 100644 --- a/src/lib/query.hpp +++ b/src/lib/query.hpp @@ -58,7 +58,7 @@ namespace lumiera { return string(typeid(OBJ).name())+": "+*this; } - operator string& () { return *this; } // TODO: needed temporarily by mockconfigrules + operator string& () { return *this; } // TODO: needed temporarily by fake-configrules }; // for calling removeTerm on the string-ref.... diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index fce504c46..1aecc48d1 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -26,7 +26,7 @@ #include "proc/asset/procpatt.hpp" #include "proc/asset/track.hpp" #include "proc/asset/pipe.hpp" -#include "lib/configrules.hpp" +#include "common/configrules.hpp" #include "proc/asset/structfactoryimpl.hpp" diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp index 49a9ca1c4..feb346002 100644 --- a/src/proc/asset/structfactoryimpl.hpp +++ b/src/proc/asset/structfactoryimpl.hpp @@ -35,7 +35,7 @@ #include "proc/mobject/session.hpp" -#include "lib/configrules.hpp" +#include "common/configrules.hpp" #include "include/error.hpp" #include "lib/util.hpp" diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp index 63579b789..456ff4b0d 100644 --- a/src/proc/mobject/session/defsmanager.cpp +++ b/src/proc/mobject/session/defsmanager.cpp @@ -23,7 +23,7 @@ #include "proc/mobject/session/defsmanager.hpp" #include "proc/mobject/session/defsregistry.hpp" -#include "lib/configrules.hpp" +#include "common/configrules.hpp" #include "include/error.hpp" #include diff --git a/tests/backend/test-filedescriptors.c b/tests/backend/test-filedescriptors.c index 26e020302..7f92a7fd1 100644 --- a/tests/backend/test-filedescriptors.c +++ b/tests/backend/test-filedescriptors.c @@ -20,7 +20,7 @@ */ #include "lib/safeclib.h" -#include "lib/config.h" +#include "common/config.h" #include "backend/backend.h" #include "backend/filedescriptor.h" diff --git a/tests/backend/test-filehandles.c b/tests/backend/test-filehandles.c index 0b7d0ba30..8e2f67edd 100644 --- a/tests/backend/test-filehandles.c +++ b/tests/backend/test-filehandles.c @@ -20,7 +20,7 @@ */ #include "lib/llist.h" #include "lib/safeclib.h" -#include "lib/config.h" +#include "common/config.h" #include "backend/backend.h" #include "backend/filehandlecache.h" diff --git a/tests/backend/test-filemmap.c b/tests/backend/test-filemmap.c index e17b2e5d6..b07c430e4 100644 --- a/tests/backend/test-filemmap.c +++ b/tests/backend/test-filemmap.c @@ -23,7 +23,7 @@ //#include #include "lib/llist.h" -#include "lib/config.h" +#include "common/config.h" #include "backend/backend.h" #include "backend/file.h" diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp index 7a54f1db0..1e714882b 100644 --- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp +++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp @@ -28,7 +28,7 @@ #include "proc/asset.hpp" #include "proc/asset/pipe.hpp" -#include "lib/configrules.hpp" +#include "common/configrules.hpp" #include "proc/assetmanager.hpp" #include "proc/mobject/session.hpp" diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp index 4aa976de0..1e4abdc0c 100644 --- a/tests/components/proc/mobject/session/defsmanagertest.cpp +++ b/tests/components/proc/mobject/session/defsmanagertest.cpp @@ -29,7 +29,7 @@ #include "proc/asset.hpp" #include "proc/asset/pipe.hpp" #include "lib/query.hpp" -#include "lib/configrules.hpp" ///////TODO just temp +#include "common/configrules.hpp" ///////TODO just temp #include "proc/assetmanager.hpp" #include "proc/mobject/session.hpp" diff --git a/tests/lumiera/hello_interface.h b/tests/lumiera/hello_interface.h index 8f04c7b93..8155879c4 100644 --- a/tests/lumiera/hello_interface.h +++ b/tests/lumiera/hello_interface.h @@ -1,4 +1,4 @@ -#include "lib/interface.h" +#include "common/interface.h" /* one interface which can greet in different languages diff --git a/tests/lumiera/test-config.c b/tests/lumiera/test-config.c index c6d96557e..3c6bf0de2 100644 --- a/tests/lumiera/test-config.c +++ b/tests/lumiera/test-config.c @@ -21,8 +21,8 @@ */ #include "lib/safeclib.h" -#include "lib/config.h" -#include "lib/configitem.h" +#include "common/config.h" +#include "common/configitem.h" #include "tests/test.h" diff --git a/tests/lumiera/test-interfaces.c b/tests/lumiera/test-interfaces.c index 1f7d8b402..17a3463fb 100644 --- a/tests/lumiera/test-interfaces.c +++ b/tests/lumiera/test-interfaces.c @@ -19,11 +19,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "lib/interface.h" -#include "lib/interfaceregistry.h" -#include "lib/interfacedescriptor.h" -#include "lib/config.h" -#include "lib/config_interface.h" +#include "common/interface.h" +#include "common/interfaceregistry.h" +#include "common/interfacedescriptor.h" +#include "common/config.h" +#include "common/config_interface.h" #include "tests/test.h" #include "tests/lumiera/hello_interface.h" diff --git a/tests/plugin/example_plugin.c b/tests/plugin/example_plugin.c index c42f92b28..bd4a1f76d 100644 --- a/tests/plugin/example_plugin.c +++ b/tests/plugin/example_plugin.c @@ -23,8 +23,8 @@ #include -#include "lib/interfacedescriptor.h" -#include "lib/config_interface.h" +#include "common/interfacedescriptor.h" +#include "common/config_interface.h" #include "tests/lumiera/hello_interface.h"