move config, interfaces and pluginsystem to liblumieracommon

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"

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 <unistd.h>
 #include <sys/mman.h>

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
 

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"

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//

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 <nobug.h>

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)
 {

src/common/config_interface.h

@@ -24,7 +24,7 @@
 
 //TODO: Support library includes//
 
-#include "lib/interface.h"
+#include "common/interface.h"
 
 //TODO: Forward declarations//
 

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");

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 <nobug.h>

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;

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;
 

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//
 

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 <nobug.h>

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);

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//

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"
 

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 <boost/noncopyable.hpp>

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 <nobug.h>
 

src/common/interfacedescriptor.h

@@ -21,7 +21,7 @@
 #ifndef LUMIERA_INTERFACEDESCRIPTOR_H
 #define LUMIERA_INTERFACEDESCRIPTOR_H
 
-#include "lib/interface.h"
+#include "common/interface.h"
 
 
 /**

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;

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

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 <nobug.h>
 

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 <glob.h>
 

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 <stdlib.h>
 #include <nobug.h>

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 <dlfcn.h>
 #include <nobug.h>

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"

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 <Ichthyostega@web.de>
@@ -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 <boost/scoped_ptr.hpp>

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);

src/gui/guifacade.hpp

@@ -41,7 +41,7 @@
 #include "common/subsys.hpp"
 
 extern "C" {
-#include "lib/interface.h"
+#include "common/interface.h"
 }
 
 

src/gui/guinotificationfacade.cpp

@@ -27,7 +27,7 @@
 #include "lib/util.hpp"
 
 extern "C" {
-#include "lib/interfacedescriptor.h"
+#include "common/interfacedescriptor.h"
 }
 
 #include <string>

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 <string>

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*)),

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
 

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....
 
     

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"
 

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"
 

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 <boost/format.hpp>

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"
 

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"

tests/backend/test-filemmap.c

@@ -23,7 +23,7 @@
 //#include <string.h>
 
 #include "lib/llist.h"
-#include "lib/config.h"
+#include "common/config.h"
 
 #include "backend/backend.h"
 #include "backend/file.h"

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"
 

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"
 

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

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"
 

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"

tests/plugin/example_plugin.c

@@ -23,8 +23,8 @@
 
 #include <stdio.h>
 
-#include "lib/interfacedescriptor.h"
-#include "lib/config_interface.h"
+#include "common/interfacedescriptor.h"
+#include "common/config_interface.h"
 
 #include "tests/lumiera/hello_interface.h"