reordered some files to use the new include and lumiera directories

SConstruct

@@ -87,6 +87,8 @@ def setupBasicEnvironment():
     # setup search path for Lumiera plugins
     appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR\\"'
                                    ,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera\\"') 
+    appendCppDefine(env,'PKGDATADIR','LUMIERA_CONFIG_PATH=\\"$PKGLIBDIR\\"'
+                                    ,'LUMIERA_CONFIG_PATH=\\"$DESTDIR/share/lumiera\\"') 
     
     prepareOptionsHelp(opts,env)
     opts.Save(OPTIONSCACHEFILE, env)
@@ -149,6 +151,7 @@ def defineCmdlineOptions():
 #                   allowed_values=('auto', 'i386', 'i686', 'x86_64' ), ignorecase=2)
         ,PathOption('DESTDIR', 'Installation dir prefix', '/usr/local')
         ,PathOption('PKGLIBDIR', 'Installation dir for plugins, defaults to DESTDIR/lib/lumiera', '',PathOption.PathAccept)
+        ,PathOption('PKGDATADIR', 'Installation dir for default config, usually DESTDIR/share/lumiera', '',PathOption.PathAccept)
         ,PathOption('SRCTAR', 'Create source tarball prior to compiling', '..', PathOption.PathAccept)
         ,PathOption('DOCTAR', 'Create tarball with dev documentaionl', '..', PathOption.PathAccept)
      )
@@ -306,7 +309,8 @@ def defineBuildTargets(env, artifacts):
     
     objback =   srcSubtree(env,'$SRCDIR/backend') 
     objproc =   srcSubtree(env,'$SRCDIR/proc')
-    objlib  = ( srcSubtree(env,'$SRCDIR/common')
+    objlib  = ( srcSubtree(env,'$SRCDIR/lumiera')
+              + srcSubtree(env,'$SRCDIR/common')
               + srcSubtree(env,'$SRCDIR/lib')
               )
     objplug = srcSubtree(env,'$SRCDIR/plugin', isShared=True)
@@ -316,7 +320,7 @@ def defineBuildTargets(env, artifacts):
             )
     
     
-    artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp']+ core )
+    artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/lumiera/main.cpp']+ core )
     artifacts['plugins'] = env.LoadableModule('$BINDIR/lumiera-plugin', objplug)
     
     # the Lumiera GTK GUI

src/backend/mediaaccessfacade.hpp

@@ -26,7 +26,7 @@
 
 
 #include "common/singleton.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 
 

src/common/configrules.cpp

@@ -24,7 +24,7 @@
 #include "common/configrules.hpp"
 #include "common/query/mockconfigrules.hpp"
 //#include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 
 

src/common/error.cpp

@@ -22,7 +22,7 @@
 
 
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/util.hpp"
 
 #include <exception>

src/common/multithread.hpp

@@ -26,7 +26,7 @@
 #ifndef LUMIERA_MULTITHREAD_H
 #define LUMIERA_MULTITHREAD_H
 
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 #include "common/util.hpp"
 
 

src/common/p.hpp

@@ -53,8 +53,8 @@
 #include <tr1/memory>
 
 
-namespace lumiera
-  {
+namespace lumiera {
+  
   using std::tr1::shared_ptr;
   using std::tr1::weak_ptr;
   

src/common/query.cpp

@@ -23,7 +23,7 @@
 
 #include "common/query.hpp"
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>

src/common/query/mockconfigrules.cpp

@@ -28,7 +28,7 @@
 #include "proc/asset/pipe.hpp"
 
 
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 #include "common/util.hpp"
 
 using util::isnil;

src/common/singletonfactory.hpp

@@ -38,7 +38,7 @@ This code is heavily inspired by
 #include "common/singletonpolicies.hpp"  // several Policies usable together with SingletonFactory
 
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 
 

src/common/singletonpolicies.hpp

@@ -35,7 +35,7 @@ This code is heavily inspired by
 #define LUMIERA_SINGLETONPOLICIES_H
 
 #include "common/multithread.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 #include <vector>
 

src/common/test/run.hpp

@@ -28,7 +28,7 @@
 #include "pre.hpp"
 
 
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 #include "common/test/suite.hpp"
 #include "common/util.hpp"

src/common/test/suite.cpp

@@ -30,11 +30,11 @@
 #include <sstream>
 #include <boost/algorithm/string.hpp>
 
-#include "proc/nobugcfg.hpp"
-#include "common/cmdline.hpp"
+#include "include/nobugcfg.hpp"
+#include "lib/cmdline.hpp"
 #include "common/test/suite.hpp"
 #include "common/test/run.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/util.hpp"
 
 

src/common/test/testoption.cpp

@@ -24,7 +24,7 @@
 #include "common/test/testoption.hpp"
 #include "common/test/suite.hpp"
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 
 

src/common/test/testoption.hpp

@@ -24,7 +24,7 @@
 #ifndef TESTHELPER_TESTOPTION_H
 #define TESTHELPER_TESTOPTION_H
 
-#include "common/cmdline.hpp"
+#include "lib/cmdline.hpp"
 
 #include <string>
 #include <iostream>

src/common/visitordispatcher.hpp

@@ -25,7 +25,7 @@
 #ifndef LUMIERA_VISITORDISPATCHER_H
 #define LUMIERA_VISITORDISPATCHER_H
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/util.hpp"
 #include "common/singleton.hpp"
 #include "common/multithread.hpp"

src/common/visitorpolicies.hpp

@@ -32,7 +32,7 @@
 #ifndef LUMIERA_VISITORPOLICIES_H
 #define LUMIERA_VISITORPOLICIES_H
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 
 namespace lumiera

src/include/error.hpp

@@ -25,13 +25,13 @@
 #define LUMIERA_ERROR_HPP_
 
 #include <string>
-#include "proc/nobugcfg.hpp"
-#include "lib/appconfig.hpp"
+#include "include/nobugcfg.hpp"
+#include "lumiera/appconfig.hpp"
 #include "lib/error.h"
 
 
-namespace lumiera
-  {
+namespace lumiera {
+  
   using std::string;
 
 

src/include/nobugcfg.hpp

@@ -27,7 +27,7 @@
  ** The idea is that configuration and some globally used flag 
  ** declarations are to be kept in one central location. Normally,
  ** this header will be included via some of the basic headers like
- ** error.hpp, which in turn gets included by proc/lumiera.hpp
+ ** error.hpp, which in turn gets included by proc/common.hpp
  **
  ** @par Besides the usual guarded declarations, this header contains
  ** one section with the corresponding <b>definitions</b>. This section
@@ -45,8 +45,8 @@
 
 #include <syslog.h>
 #include <nobug.h>
-#include "lib/appconfig.hpp"
-#include "common/error.hpp"  ///< make assertions throw instead of abort()
+#include "lumiera/appconfig.hpp"
+#include "include/error.hpp"  ///< make assertions throw instead of abort()
 
 
   /* declare flags used throughout the code base... */

src/lib/allocationcluster.cpp

@@ -22,7 +22,7 @@
 
 
 #include "lib/allocationcluster.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/util.hpp"
 
 using util::isnil;

src/lib/allocationcluster.hpp

@@ -52,7 +52,7 @@
 #include <boost/noncopyable.hpp>
 
 #include "common/multithread.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "lib/scopedholder.hpp"
 #include "lib/scopedholdertransfer.hpp"
 

src/lib/cmdline.cpp

@@ -22,9 +22,9 @@
 
 
 
-#include "common/cmdline.hpp"
+#include "lib/cmdline.hpp"
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 #include <boost/regex.hpp>
 #include <boost/algorithm/string/split.hpp>

src/lib/cmdline.hpp

@@ -30,8 +30,8 @@
 
 
 
-namespace util
-  {
+namespace util {
+  
   using std::string;
   using std::vector;
   using std::ostream;

src/lib/external/libgavl.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "lib/external/libgavl.hpp"
 #include "proc/control/stypemanager.hpp"
 

src/lib/scopedholder.hpp

@@ -57,7 +57,7 @@
 
 #include <boost/scoped_ptr.hpp>
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 
 

src/lib/scopedholdertransfer.hpp

@@ -25,7 +25,7 @@
 #ifndef LIB_SCOPEDHOLDERVECTOR_H
 #define LIB_SCOPEDHOLDERVECTOR_H
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include <memory>
 
 

src/lumiera/appconfig.cpp

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

src/lumiera/lumiera.c

@@ -48,7 +48,7 @@
 
 //code goes here//
 int
-main (int argc, char** argv)
+start (int argc, char** argv)
 {
   (void) argc;
   (void) argv;

src/lumiera/main.cpp

@@ -2,7 +2,8 @@
   main.cpp  -  start the Lumiera Application
 
   Copyright (C)         Lumiera.org
-    2008,               Christian Thaeter <ct@pipapo.org>
+    2007-2008,          Joel Holdsworth <joel@airwebreathe.org.uk>
+                        Christian Thaeter <ct@pipapo.org>
                         Hermann Vosseler <Ichthyostega@web.de>
 
   This program is free software; you can redistribute it and/or
@@ -23,7 +24,7 @@
 
 #include <iostream>
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 
 using std::cout;
 using std::endl;

src/pre.hpp

@@ -45,7 +45,7 @@
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 
 
 

src/pre_a.hpp

@@ -42,7 +42,7 @@
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "proc/asset.hpp"
 
 

src/proc/asset.hpp

@@ -56,7 +56,7 @@
 
 
 #include "proc/asset/category.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/p.hpp"
 
 #include <boost/type_traits/is_base_of.hpp>

src/proc/asset/category.cpp

@@ -23,7 +23,7 @@
 
 #include "proc/asset/category.hpp"
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 #include <boost/algorithm/string.hpp>
 

src/proc/asset/db.hpp

@@ -28,7 +28,7 @@
 #include "pre_a.hpp"
 
 #include "proc/asset.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 #include <tr1/memory>
 #include <tr1/unordered_map>

src/proc/asset/media.cpp

@@ -29,7 +29,7 @@
 #include "proc/mobject/session/clip.hpp"
 #include "proc/mobject/session/mobjectfactory.hpp"
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 #include <boost/regex.hpp>
 #include <boost/format.hpp>

src/proc/asset/meta.cpp

@@ -24,7 +24,7 @@
 #include "proc/assetmanager.hpp"
 #include "proc/asset/meta.hpp"
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 
 namespace asset

src/proc/asset/proc.cpp

@@ -24,7 +24,7 @@
 #include "proc/assetmanager.hpp"
 #include "proc/asset/proc.hpp"
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 
 namespace asset

src/proc/asset/struct.cpp

@@ -31,7 +31,7 @@
 #include "proc/asset/structfactoryimpl.hpp"
 
 #include "common/util.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 #include <boost/format.hpp>
 

src/proc/asset/structfactoryimpl.hpp

@@ -36,7 +36,7 @@
 
 #include "proc/mobject/session.hpp"
 #include "common/configrules.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/util.hpp"
 
 #include <boost/format.hpp>

src/proc/assetmanager.hpp

@@ -39,7 +39,7 @@
 #include "pre_a.hpp"
 
 #include "proc/asset.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/singleton.hpp"
 
 

src/proc/common.hpp

@@ -45,8 +45,8 @@
 #include "common/p.hpp"
 #include "common/util.hpp"
 #include "common/lumitime.hpp"
-#include "common/error.hpp"   ///< pulls in NoBug via nobugcfg.hpp
-#include "lib/appconfig.hpp"
+#include "include/error.hpp"   ///< pulls in NoBug via nobugcfg.hpp
+#include "lumiera/appconfig.hpp"
 
 
 /**

src/proc/control/stypemanager.cpp

@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "proc/control/stypemanager.hpp"
 #include "proc/control/styperegistry.hpp"
 

src/proc/engine/buffhandle.hpp

@@ -39,7 +39,7 @@
 #define ENGINE_BUFFHANDLE_H
 
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "common/streamtype.hpp"
 
 

src/proc/engine/bufftable.hpp

@@ -25,7 +25,7 @@
 #define ENGINE_BUFFHTABLE_H
 
 
-#include "common/error.hpp"
+#include "include/error.hpp"
 #include "proc/engine/buffhandle.hpp"
 #include "proc/engine/procnode.hpp"
 

src/proc/engine/processor.hpp

@@ -24,7 +24,7 @@
 #ifndef ENGINE_PROCESSOR_H
 #define ENGINE_PROCESSOR_H
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "proc/state.hpp"
 
 

src/proc/engine/procnode.hpp

@@ -42,7 +42,7 @@
 
 #include "pre.hpp"
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "proc/state.hpp"
 #include "proc/mobject/parameter.hpp"
 

src/proc/mobject/mobject.hpp

@@ -27,7 +27,7 @@
 #include "pre.hpp"
 
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "proc/mobject/builder/buildertool.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/asset.hpp"                 // TODO finally not needed?

src/proc/mobject/session/defsmanager.cpp

@@ -24,7 +24,7 @@
 #include "proc/mobject/session/defsmanager.hpp"
 #include "proc/mobject/session/defsregistry.hpp"
 #include "common/configrules.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 #include <boost/format.hpp>
 

src/proc/mobject/session/fixture.cpp

@@ -22,7 +22,7 @@
 
 
 #include "proc/mobject/session/fixture.hpp"
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 namespace mobject
   {

src/proc/mobject/session/locatingpin.hpp

@@ -42,7 +42,7 @@
 #define MOBJECT_SESSION_LOCATINGPIN_H
 
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 
 #include <utility>
 #include <tr1/memory>

src/proc/mobject/session/segment.hpp

@@ -26,7 +26,7 @@
 
 #include <list>
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "proc/mobject/explicitplacement.hpp"
 
 

src/proc/mobject/session/sessionimpl.cpp

@@ -23,7 +23,7 @@
 
 #include "proc/mobject/session/sessionimpl.hpp"
 #include "proc/mobject/placement.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 namespace mobject
   {

src/proc/mobject/session/sessmanagerimpl.cpp

@@ -40,7 +40,7 @@
 #include "proc/mobject/session/sessionimpl.hpp"
 #include "proc/mobject/session/defsmanager.hpp"
 //#include "proc/mobject/session/defsregistry.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 using boost::scoped_ptr;
 

src/proc/nobugcfg.cpp

@@ -21,10 +21,10 @@
 * *****************************************************/
 
 
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 
 #define NOBUG_INIT_DEFS_
-#include "proc/nobugcfg.hpp"
+#include "include/nobugcfg.hpp"
 #undef NOBUG_INIT_DEFS_
 
 

src/proc/state.hpp

@@ -27,7 +27,7 @@
 
 #include "pre.hpp"
 
-#include "proc/lumiera.hpp"
+#include "proc/common.hpp"
 #include "common/frameid.hpp"
 #include "proc/engine/buffhandle.hpp"
 

src/tool/try.cpp

@@ -15,7 +15,7 @@
 
 
 #include <nobug.h>
-//#include "proc/nobugcfg.hpp"
+//#include "include/nobugcfg.hpp"
 
 #include <iostream>
 //#include <typeinfo>

tests/SConscript

@@ -46,7 +46,7 @@ def testCollection(env,dir):
 def treatPluginTestcase(env):
     """ Special case: the test-plugin executable
     """
-    tree = 'backend'
+    tree = 'plugin'
     env = env.Clone()
     env.Append(CPPPATH=tree, CPPDEFINES='LUMIERA_PLUGIN')
     prfx = path.join(tree,'example_plugin')
@@ -69,7 +69,7 @@ def treatPluginTestcase(env):
 moduledirs = globRootdirs('*')
 
 # but have to treat some subdirs individually.
-specials = ['plugin','library','backend']
+specials = ['plugin','library','backend','lumiera']
 
 
 
@@ -77,6 +77,7 @@ artifacts['testsuite'] = ts = ( [ testExecutable(env, dir) for dir in moduledirs
                               + treatPluginTestcase(env)
                               + testCollection(env, 'library')
                               + testCollection(env, 'backend')
+                              + testCollection(env, 'lumiera')
                               ) 
                               
 

tests/common/appconfigtest.cpp

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

tests/common/exceptionerrortest.cpp

@@ -23,7 +23,7 @@
 
 
 #include "lib/error.h"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 #include "common/test/run.hpp"
 #include "common/util.hpp"

tests/common/lifecycletest.cpp

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

tests/common/mainsuite.cpp

@@ -23,7 +23,7 @@
 
 #include "common/test/suite.hpp"
 #include "common/test/testoption.hpp"
-#include "lib/appconfig.hpp"
+#include "lumiera/appconfig.hpp"
 
 using lumiera::Appconfig;
 using lumiera::ON_GLOBAL_INIT;

tests/common/query/queryutilstest.cpp

@@ -24,7 +24,7 @@
 #include "common/test/run.hpp"
 #include "common/util.hpp"
 
-#include "common/cmdline.hpp"
+#include "lib/cmdline.hpp"
 #include "common/query.hpp"
 #include "query/querydiagnostics.hpp"
 

tests/common/test/cmdlinewrappertest.cpp

@@ -22,7 +22,7 @@
 
 
 #include "common/test/run.hpp"
-#include "common/cmdline.hpp"
+#include "lib/cmdline.hpp"
 #include "common/util.hpp"
 
 #include <iostream>

tests/components/proc/engine/bufftabletest.cpp

@@ -22,7 +22,7 @@
 
 
 #include "common/test/run.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
 #include "proc/engine/procnode.hpp"
 #include "proc/engine/bufftable.hpp"

tests/components/proc/mobject/session/testsession1.hpp

@@ -26,7 +26,7 @@
 
 
 #include "proc/mobject/session.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 //#include "common/factory.hpp"
 //#include "common/util.hpp"
 

tests/plugin/example_plugin.c

@@ -1,9 +1,11 @@
 #include <stdio.h>
 
-#include "hello_interface.h"
 #include "lumiera/interfacedescriptor.h"
 #include "lumiera/config_interface.h"
 
+#include "tests/lumiera/hello_interface.h"
+
+
 LUMIERA_PLUGIN_INTERFACEHANDLE;
 
 LumieraInterface