start refactoring: liblumieracommon.so (application core services)

src/backend/enginefacade.hpp

@@ -25,7 +25,7 @@
 #define BACKEND_INTERFACE_ENGINEFACADE_H
 
 
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 
 
 

src/backend/netnodefacade.hpp

@@ -25,7 +25,7 @@
 #define BACKEND_INTERFACE_NETNODEFACADE_H
 
 
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 
 
 

src/backend/scriptrunnerfacade.hpp

@@ -25,7 +25,7 @@
 #define BACKEND_INTERFACE_SCRIPTRUNNERFACADE_H
 
 
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 
 
 

src/common/DIR_INFO

@@ -0,0 +1,7 @@
+Common application services (liblumieracommon)
+
+contains:
+ * the config system
+ * commandline parsing
+ * interfaces and plugin loading
+ * lua interpreter (planned)

src/common/Makefile.am

@@ -0,0 +1,41 @@
+#  Copyright (C)         Lumiera.org
+#    2008,               Christian Thaeter <ct@pipapo.org>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+liblumieracommon_la_srcdir = $(top_srcdir)/src/common
+lib_LTLIBRARIES += liblumieracommon.la
+
+liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS)
+liblumieracommon_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
+liblumieracommon_la_LIBADD = liblumiera.la
+
+liblumieracommon_la_SOURCES =                  \
+	$(liblumieracommon_la_srcdir)/guifacade.cpp   	\
+	$(liblumieracommon_la_srcdir)/configfacade.cpp	\
+	$(liblumieracommon_la_srcdir)/appstate.cpp     	\
+	$(liblumieracommon_la_srcdir)/option.cpp 	\
+	$(liblumieracommon_la_srcdir)/subsys.cpp 	\
+	$(liblumieracommon_la_srcdir)/interfaceproxy.cpp\
+	$(liblumieracommon_la_srcdir)/nobugcfg.cpp          
+
+
+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
+

src/common/appstate.cpp

@@ -23,9 +23,9 @@
 
 #include "include/error.hpp"
 #include "include/lifecycle.h"
-#include "lumiera/appstate.hpp"
+#include "common/appstate.hpp"
 #include "lib/lifecycleregistry.hpp"
-#include "lumiera/subsystemrunner.hpp"
+#include "common/subsystemrunner.hpp"
 
 extern "C" {
 #include "lib/config_interface.h"

src/common/appstate.hpp

@@ -36,8 +36,8 @@
 #define LUMIERA_APPSTATE_H
 
 #include "include/symbol.hpp"
-#include "lumiera/option.hpp"
-#include "lumiera/subsys.hpp"
+#include "common/option.hpp"
+#include "common/subsys.hpp"
 
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>

src/common/guifacade.cpp

@@ -26,7 +26,7 @@
 #include "include/error.hpp"
 #include "lib/singleton.hpp"
 #include "lib/functorutil.hpp"
-#include "lumiera/instancehandle.hpp"
+#include "common/instancehandle.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <tr1/functional>

src/common/option.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "lumiera/option.hpp"
+#include "common/option.hpp"
 
 #include "include/error.hpp"
 #include "lib/util.hpp"

src/common/subsys.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 
 #include "include/error.hpp"
 //#include "lib/util.hpp"

src/common/subsys.hpp

@@ -44,7 +44,7 @@
 #define LUMIERA_SUBSYS_H
 
 #include "include/error.hpp"
-#include "lumiera/option.hpp"
+#include "common/option.hpp"
 
 #include <boost/noncopyable.hpp>
 #include <tr1/functional>

src/common/subsystemrunner.hpp

@@ -26,7 +26,7 @@
 
 #include "include/error.hpp"
 #include "lib/util.hpp"
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 #include "lib/multithread.hpp"
 
 #include <tr1/functional>

src/gui/guifacade.hpp

@@ -38,7 +38,7 @@
 #define GUI_FACADE_H
 
 
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 
 extern "C" {
 #include "lib/interface.h"

src/gui/guistart.cpp

@@ -44,7 +44,7 @@
 
 
 #include "gui/guifacade.hpp"
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 #include "lib/singleton.hpp"
 
 extern "C" {

src/lumiera/DIR_INFO

@@ -1,7 +1 @@
-The main application shell
-
-contains:
- * the config system
- * commandline parsing
- * interfaces and plugin loading
- * lua interpreter (planned)
+The Lumiera application shell

src/lumiera/Makefile.am

@@ -15,28 +15,15 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-lumiera_srcdir = $(top_srcdir)/src
+lumiera_srcdir = $(top_srcdir)/src/lumiera
 
 bin_PROGRAMS += lumiera
-lumiera_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
+lumiera_CPPFLAGS = $(AM_CPPFLAGS)
 lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
 lumiera_LDADD = liblumierabackend.la liblumieraproc.la liblumiera.la \
 		$(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
 
 lumiera_SOURCES =				\
-	$(lumiera_srcdir)/lumiera/guifacade.cpp		\
-	$(lumiera_srcdir)/lumiera/configfacade.cpp	\
-	$(lumiera_srcdir)/lumiera/appstate.cpp		\
-	$(lumiera_srcdir)/lumiera/option.cpp		\
-	$(lumiera_srcdir)/lumiera/subsys.cpp		\
-	$(lumiera_srcdir)/lumiera/interfaceproxy.cpp	\
-	$(lumiera_srcdir)/lumiera/nobugcfg.cpp		\
 	$(lumiera_srcdir)/main.cpp
 
 
-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

src/lumiera/main.cpp

@@ -24,8 +24,8 @@
 
 #include "include/nobugcfg.h"
 #include "include/error.hpp"
-#include "lumiera/appstate.hpp"
-#include "lumiera/option.hpp"
+#include "common/appstate.hpp"
+#include "common/option.hpp"
 
 #include "backend/enginefacade.hpp"
 #include "backend/netnodefacade.hpp"

src/proc/facade.hpp

@@ -25,7 +25,7 @@
 #define PROC_INTERFACE_FACADE_H
 
 
-#include "lumiera/subsys.hpp"
+#include "common/subsys.hpp"
 
 
 

tests/lib/appconfigtest.cpp

@@ -25,7 +25,7 @@
 #include "lib/test/run.hpp"
 #include "lib/util.hpp"
 
-#include "lumiera/appstate.hpp"
+#include "common/appstate.hpp"
 
 
 

tests/lib/lifecycletest.cpp

@@ -25,7 +25,7 @@
 #include "lib/test/run.hpp"
 #include "lib/util.hpp"
 
-#include "lumiera/appstate.hpp"
+#include "common/appstate.hpp"
 
 
 

tests/lib/mainsuite.cpp

@@ -23,7 +23,7 @@
 
 #include "lib/test/suite.hpp"
 #include "lib/test/testoption.hpp"
-#include "lumiera/appstate.hpp"
+#include "common/appstate.hpp"
 #include "include/lifecycle.h"
 
 using lumiera::AppState;