From 628be502e5433c223c08ccff4bf6f6b37be7853e Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Wed, 26 Nov 2008 05:19:59 +0100 Subject: [PATCH] reordered some files to use the new include and lumiera directories --- SConstruct | 8 ++++++-- src/backend/mediaaccessfacade.hpp | 2 +- src/common/configrules.cpp | 2 +- src/common/error.cpp | 2 +- src/common/multithread.hpp | 2 +- src/common/p.hpp | 4 ++-- src/common/query.cpp | 2 +- src/common/query/mockconfigrules.cpp | 2 +- src/common/singletonfactory.hpp | 2 +- src/common/singletonpolicies.hpp | 2 +- src/common/test/run.hpp | 2 +- src/common/test/suite.cpp | 6 +++--- src/common/test/testoption.cpp | 2 +- src/common/test/testoption.hpp | 2 +- src/common/visitordispatcher.hpp | 2 +- src/common/visitorpolicies.hpp | 2 +- src/{common => include}/error.hpp | 8 ++++---- src/{proc => include}/nobugcfg.hpp | 6 +++--- src/lib/allocationcluster.cpp | 2 +- src/lib/allocationcluster.hpp | 2 +- src/{common => lib}/cmdline.cpp | 4 ++-- src/{common => lib}/cmdline.hpp | 4 ++-- src/lib/external/libgavl.cpp | 2 +- src/lib/scopedholder.hpp | 2 +- src/lib/scopedholdertransfer.hpp | 2 +- src/{lib => lumiera}/appconfig.cpp | 4 ++-- src/{lib => lumiera}/appconfig.hpp | 0 src/lumiera/lumiera.c | 2 +- src/{ => lumiera}/main.cpp | 5 +++-- src/pre.hpp | 2 +- src/pre_a.hpp | 2 +- src/proc/asset.hpp | 2 +- src/proc/asset/category.cpp | 2 +- src/proc/asset/db.hpp | 2 +- src/proc/asset/media.cpp | 2 +- src/proc/asset/meta.cpp | 2 +- src/proc/asset/proc.cpp | 2 +- src/proc/asset/struct.cpp | 2 +- src/proc/asset/structfactoryimpl.hpp | 2 +- src/proc/assetmanager.hpp | 2 +- src/proc/{lumiera.hpp => common.hpp} | 4 ++-- src/proc/control/stypemanager.cpp | 2 +- src/proc/engine/buffhandle.hpp | 2 +- src/proc/engine/bufftable.hpp | 2 +- src/proc/engine/processor.hpp | 2 +- src/proc/engine/procnode.hpp | 2 +- src/proc/mobject/mobject.hpp | 2 +- src/proc/mobject/session/defsmanager.cpp | 2 +- src/proc/mobject/session/fixture.cpp | 2 +- src/proc/mobject/session/locatingpin.hpp | 2 +- src/proc/mobject/session/segment.hpp | 2 +- src/proc/mobject/session/sessionimpl.cpp | 2 +- src/proc/mobject/session/sessmanagerimpl.cpp | 2 +- src/proc/nobugcfg.cpp | 4 ++-- src/proc/state.hpp | 2 +- src/tool/try.cpp | 2 +- tests/SConscript | 5 +++-- tests/common/appconfigtest.cpp | 2 +- tests/common/exceptionerrortest.cpp | 2 +- tests/common/lifecycletest.cpp | 2 +- tests/common/mainsuite.cpp | 2 +- tests/common/query/queryutilstest.cpp | 2 +- tests/common/test/cmdlinewrappertest.cpp | 2 +- tests/components/proc/engine/bufftabletest.cpp | 2 +- tests/components/proc/mobject/session/testsession1.hpp | 2 +- tests/{lumiera => plugin}/example_plugin.c | 4 +++- tests/{lumiera => plugin}/example_plugin.cpp | 0 67 files changed, 89 insertions(+), 81 deletions(-) rename src/{common => include}/error.hpp (98%) rename src/{proc => include}/nobugcfg.hpp (94%) rename src/{common => lib}/cmdline.cpp (97%) rename src/{common => lib}/cmdline.hpp (98%) rename src/{lib => lumiera}/appconfig.cpp (98%) rename src/{lib => lumiera}/appconfig.hpp (100%) rename src/{ => lumiera}/main.cpp (89%) rename src/proc/{lumiera.hpp => common.hpp} (96%) rename tests/{lumiera => plugin}/example_plugin.c (99%) rename tests/{lumiera => plugin}/example_plugin.cpp (100%) diff --git a/SConstruct b/SConstruct index 26efb00e8..03c0723a6 100644 --- a/SConstruct +++ b/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 diff --git a/src/backend/mediaaccessfacade.hpp b/src/backend/mediaaccessfacade.hpp index 63741b02e..539d4141e 100644 --- a/src/backend/mediaaccessfacade.hpp +++ b/src/backend/mediaaccessfacade.hpp @@ -26,7 +26,7 @@ #include "common/singleton.hpp" -#include "common/error.hpp" +#include "include/error.hpp" diff --git a/src/common/configrules.cpp b/src/common/configrules.cpp index 02a0bfcb6..15852a05d 100644 --- a/src/common/configrules.cpp +++ b/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" diff --git a/src/common/error.cpp b/src/common/error.cpp index 64dea31a5..0e43a4481 100644 --- a/src/common/error.cpp +++ b/src/common/error.cpp @@ -22,7 +22,7 @@ -#include "common/error.hpp" +#include "include/error.hpp" #include "common/util.hpp" #include diff --git a/src/common/multithread.hpp b/src/common/multithread.hpp index 8cdbe8002..ed1d5ebcc 100644 --- a/src/common/multithread.hpp +++ b/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" diff --git a/src/common/p.hpp b/src/common/p.hpp index 0a303ace7..8e8a65543 100644 --- a/src/common/p.hpp +++ b/src/common/p.hpp @@ -53,8 +53,8 @@ #include -namespace lumiera - { +namespace lumiera { + using std::tr1::shared_ptr; using std::tr1::weak_ptr; diff --git a/src/common/query.cpp b/src/common/query.cpp index 255061476..28dd06a65 100644 --- a/src/common/query.cpp +++ b/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 #include diff --git a/src/common/query/mockconfigrules.cpp b/src/common/query/mockconfigrules.cpp index 0ae7f29ed..547183a68 100644 --- a/src/common/query/mockconfigrules.cpp +++ b/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; diff --git a/src/common/singletonfactory.hpp b/src/common/singletonfactory.hpp index 0f6a12755..776dc3e5c 100644 --- a/src/common/singletonfactory.hpp +++ b/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" diff --git a/src/common/singletonpolicies.hpp b/src/common/singletonpolicies.hpp index f0b448305..b3da780d2 100644 --- a/src/common/singletonpolicies.hpp +++ b/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 diff --git a/src/common/test/run.hpp b/src/common/test/run.hpp index b1dbd08b6..13fcf1bd4 100644 --- a/src/common/test/run.hpp +++ b/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" diff --git a/src/common/test/suite.cpp b/src/common/test/suite.cpp index 37a303ef6..7c73cbfdb 100644 --- a/src/common/test/suite.cpp +++ b/src/common/test/suite.cpp @@ -30,11 +30,11 @@ #include #include -#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" diff --git a/src/common/test/testoption.cpp b/src/common/test/testoption.cpp index c591e895d..064c3b6d3 100644 --- a/src/common/test/testoption.cpp +++ b/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" diff --git a/src/common/test/testoption.hpp b/src/common/test/testoption.hpp index 28a82ff55..31b69ff24 100644 --- a/src/common/test/testoption.hpp +++ b/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 #include diff --git a/src/common/visitordispatcher.hpp b/src/common/visitordispatcher.hpp index 4ed6a52e2..34d166b33 100644 --- a/src/common/visitordispatcher.hpp +++ b/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" diff --git a/src/common/visitorpolicies.hpp b/src/common/visitorpolicies.hpp index 829dd5546..a31b781a1 100644 --- a/src/common/visitorpolicies.hpp +++ b/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 diff --git a/src/common/error.hpp b/src/include/error.hpp similarity index 98% rename from src/common/error.hpp rename to src/include/error.hpp index ffd344323..74ed49721 100644 --- a/src/common/error.hpp +++ b/src/include/error.hpp @@ -25,13 +25,13 @@ #define LUMIERA_ERROR_HPP_ #include -#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; diff --git a/src/proc/nobugcfg.hpp b/src/include/nobugcfg.hpp similarity index 94% rename from src/proc/nobugcfg.hpp rename to src/include/nobugcfg.hpp index edb079d05..6dd3f69a8 100644 --- a/src/proc/nobugcfg.hpp +++ b/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 definitions. This section @@ -45,8 +45,8 @@ #include #include -#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... */ diff --git a/src/lib/allocationcluster.cpp b/src/lib/allocationcluster.cpp index 306e4a659..b00161d26 100644 --- a/src/lib/allocationcluster.cpp +++ b/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; diff --git a/src/lib/allocationcluster.hpp b/src/lib/allocationcluster.hpp index a44151957..881d9cd4b 100644 --- a/src/lib/allocationcluster.hpp +++ b/src/lib/allocationcluster.hpp @@ -52,7 +52,7 @@ #include #include "common/multithread.hpp" -#include "common/error.hpp" +#include "include/error.hpp" #include "lib/scopedholder.hpp" #include "lib/scopedholdertransfer.hpp" diff --git a/src/common/cmdline.cpp b/src/lib/cmdline.cpp similarity index 97% rename from src/common/cmdline.cpp rename to src/lib/cmdline.cpp index eca0b18bb..753e4a1c9 100644 --- a/src/common/cmdline.cpp +++ b/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 #include diff --git a/src/common/cmdline.hpp b/src/lib/cmdline.hpp similarity index 98% rename from src/common/cmdline.hpp rename to src/lib/cmdline.hpp index 3f5455587..31d49acff 100644 --- a/src/common/cmdline.hpp +++ b/src/lib/cmdline.hpp @@ -30,8 +30,8 @@ -namespace util - { +namespace util { + using std::string; using std::vector; using std::ostream; diff --git a/src/lib/external/libgavl.cpp b/src/lib/external/libgavl.cpp index 740515052..a5711584d 100644 --- a/src/lib/external/libgavl.cpp +++ b/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" diff --git a/src/lib/scopedholder.hpp b/src/lib/scopedholder.hpp index 0019b6966..986ba956b 100644 --- a/src/lib/scopedholder.hpp +++ b/src/lib/scopedholder.hpp @@ -57,7 +57,7 @@ #include -#include "common/error.hpp" +#include "include/error.hpp" diff --git a/src/lib/scopedholdertransfer.hpp b/src/lib/scopedholdertransfer.hpp index d894de114..75c67d8c7 100644 --- a/src/lib/scopedholdertransfer.hpp +++ b/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 diff --git a/src/lib/appconfig.cpp b/src/lumiera/appconfig.cpp similarity index 98% rename from src/lib/appconfig.cpp rename to src/lumiera/appconfig.cpp index ad114fb56..99a41d742 100644 --- a/src/lib/appconfig.cpp +++ b/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" diff --git a/src/lib/appconfig.hpp b/src/lumiera/appconfig.hpp similarity index 100% rename from src/lib/appconfig.hpp rename to src/lumiera/appconfig.hpp diff --git a/src/lumiera/lumiera.c b/src/lumiera/lumiera.c index 3499e795b..434a513c2 100644 --- a/src/lumiera/lumiera.c +++ b/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; diff --git a/src/main.cpp b/src/lumiera/main.cpp similarity index 89% rename from src/main.cpp rename to src/lumiera/main.cpp index 0e04ef89f..f54b84138 100644 --- a/src/main.cpp +++ b/src/lumiera/main.cpp @@ -2,7 +2,8 @@ main.cpp - start the Lumiera Application Copyright (C) Lumiera.org - 2008, Christian Thaeter + 2007-2008, Joel Holdsworth + Christian Thaeter Hermann Vosseler This program is free software; you can redistribute it and/or @@ -23,7 +24,7 @@ #include -#include "proc/lumiera.hpp" +#include "proc/common.hpp" using std::cout; using std::endl; diff --git a/src/pre.hpp b/src/pre.hpp index ca948b7d6..d1495d952 100644 --- a/src/pre.hpp +++ b/src/pre.hpp @@ -45,7 +45,7 @@ #include #include -#include "proc/lumiera.hpp" +#include "proc/common.hpp" diff --git a/src/pre_a.hpp b/src/pre_a.hpp index 6174b83e8..2d032c03c 100644 --- a/src/pre_a.hpp +++ b/src/pre_a.hpp @@ -42,7 +42,7 @@ #include #include -#include "proc/lumiera.hpp" +#include "proc/common.hpp" #include "proc/asset.hpp" diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index 2ed5141c8..3c1b780f4 100644 --- a/src/proc/asset.hpp +++ b/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 diff --git a/src/proc/asset/category.cpp b/src/proc/asset/category.cpp index 3d178e549..7467325e4 100644 --- a/src/proc/asset/category.cpp +++ b/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 diff --git a/src/proc/asset/db.hpp b/src/proc/asset/db.hpp index f35785e5e..6543483f1 100644 --- a/src/proc/asset/db.hpp +++ b/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 #include diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp index 68fcb0b56..1344c791d 100644 --- a/src/proc/asset/media.cpp +++ b/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 #include diff --git a/src/proc/asset/meta.cpp b/src/proc/asset/meta.cpp index ec58b493c..f2f42bc22 100644 --- a/src/proc/asset/meta.cpp +++ b/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 diff --git a/src/proc/asset/proc.cpp b/src/proc/asset/proc.cpp index 61dd228b7..d383b8c31 100644 --- a/src/proc/asset/proc.cpp +++ b/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 diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index 5813ce339..9305722e0 100644 --- a/src/proc/asset/struct.cpp +++ b/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 diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp index c2f6f2ab7..249259a13 100644 --- a/src/proc/asset/structfactoryimpl.hpp +++ b/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 diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp index 3f62d2ecd..ec1e715f0 100644 --- a/src/proc/assetmanager.hpp +++ b/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" diff --git a/src/proc/lumiera.hpp b/src/proc/common.hpp similarity index 96% rename from src/proc/lumiera.hpp rename to src/proc/common.hpp index f9ce3b838..622c3c1ea 100644 --- a/src/proc/lumiera.hpp +++ b/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" /** diff --git a/src/proc/control/stypemanager.cpp b/src/proc/control/stypemanager.cpp index d28ee3eb0..2d2982118 100644 --- a/src/proc/control/stypemanager.cpp +++ b/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" diff --git a/src/proc/engine/buffhandle.hpp b/src/proc/engine/buffhandle.hpp index 069b9f83e..a3d690398 100644 --- a/src/proc/engine/buffhandle.hpp +++ b/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" diff --git a/src/proc/engine/bufftable.hpp b/src/proc/engine/bufftable.hpp index ac1329265..67c565a4d 100644 --- a/src/proc/engine/bufftable.hpp +++ b/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" diff --git a/src/proc/engine/processor.hpp b/src/proc/engine/processor.hpp index 3f0890c93..f9bb7b164 100644 --- a/src/proc/engine/processor.hpp +++ b/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" diff --git a/src/proc/engine/procnode.hpp b/src/proc/engine/procnode.hpp index 9cf3a2ea8..4889c0041 100644 --- a/src/proc/engine/procnode.hpp +++ b/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" diff --git a/src/proc/mobject/mobject.hpp b/src/proc/mobject/mobject.hpp index eb481489f..abb5d7adb 100644 --- a/src/proc/mobject/mobject.hpp +++ b/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? diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp index 538e8c9a8..456ff4b0d 100644 --- a/src/proc/mobject/session/defsmanager.cpp +++ b/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 diff --git a/src/proc/mobject/session/fixture.cpp b/src/proc/mobject/session/fixture.cpp index 19ba84970..bfccd57a4 100644 --- a/src/proc/mobject/session/fixture.cpp +++ b/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 { diff --git a/src/proc/mobject/session/locatingpin.hpp b/src/proc/mobject/session/locatingpin.hpp index ecd82ab30..799255589 100644 --- a/src/proc/mobject/session/locatingpin.hpp +++ b/src/proc/mobject/session/locatingpin.hpp @@ -42,7 +42,7 @@ #define MOBJECT_SESSION_LOCATINGPIN_H -#include "proc/lumiera.hpp" +#include "proc/common.hpp" #include #include diff --git a/src/proc/mobject/session/segment.hpp b/src/proc/mobject/session/segment.hpp index 4d978f810..72b25fcbc 100644 --- a/src/proc/mobject/session/segment.hpp +++ b/src/proc/mobject/session/segment.hpp @@ -26,7 +26,7 @@ #include -#include "proc/lumiera.hpp" +#include "proc/common.hpp" #include "proc/mobject/explicitplacement.hpp" diff --git a/src/proc/mobject/session/sessionimpl.cpp b/src/proc/mobject/session/sessionimpl.cpp index e8f8c1e21..defcf7116 100644 --- a/src/proc/mobject/session/sessionimpl.cpp +++ b/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 { diff --git a/src/proc/mobject/session/sessmanagerimpl.cpp b/src/proc/mobject/session/sessmanagerimpl.cpp index 7ac96bee4..6e95f0597 100644 --- a/src/proc/mobject/session/sessmanagerimpl.cpp +++ b/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; diff --git a/src/proc/nobugcfg.cpp b/src/proc/nobugcfg.cpp index 7dc68a9bb..8896e8d9e 100644 --- a/src/proc/nobugcfg.cpp +++ b/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_ diff --git a/src/proc/state.hpp b/src/proc/state.hpp index cd98a39b8..9f7ee9788 100644 --- a/src/proc/state.hpp +++ b/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" diff --git a/src/tool/try.cpp b/src/tool/try.cpp index 5d1034645..95ad7ef93 100644 --- a/src/tool/try.cpp +++ b/src/tool/try.cpp @@ -15,7 +15,7 @@ #include -//#include "proc/nobugcfg.hpp" +//#include "include/nobugcfg.hpp" #include //#include diff --git a/tests/SConscript b/tests/SConscript index fe378b891..ef663da0b 100644 --- a/tests/SConscript +++ b/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') ) diff --git a/tests/common/appconfigtest.cpp b/tests/common/appconfigtest.cpp index c51b413bc..c5a3e93cb 100644 --- a/tests/common/appconfigtest.cpp +++ b/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" diff --git a/tests/common/exceptionerrortest.cpp b/tests/common/exceptionerrortest.cpp index e1c133e4f..336b87c0e 100644 --- a/tests/common/exceptionerrortest.cpp +++ b/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" diff --git a/tests/common/lifecycletest.cpp b/tests/common/lifecycletest.cpp index 21a33dce5..4d5e3b594 100644 --- a/tests/common/lifecycletest.cpp +++ b/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" diff --git a/tests/common/mainsuite.cpp b/tests/common/mainsuite.cpp index 455bfd98e..d7dbb7903 100644 --- a/tests/common/mainsuite.cpp +++ b/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; diff --git a/tests/common/query/queryutilstest.cpp b/tests/common/query/queryutilstest.cpp index fc5e914a9..b641d9d0a 100644 --- a/tests/common/query/queryutilstest.cpp +++ b/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" diff --git a/tests/common/test/cmdlinewrappertest.cpp b/tests/common/test/cmdlinewrappertest.cpp index f5d1eaf25..e99e2bd8c 100644 --- a/tests/common/test/cmdlinewrappertest.cpp +++ b/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 diff --git a/tests/components/proc/engine/bufftabletest.cpp b/tests/components/proc/engine/bufftabletest.cpp index 420d30636..436285c95 100644 --- a/tests/components/proc/engine/bufftabletest.cpp +++ b/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" diff --git a/tests/components/proc/mobject/session/testsession1.hpp b/tests/components/proc/mobject/session/testsession1.hpp index d9c422f2f..bb8745851 100644 --- a/tests/components/proc/mobject/session/testsession1.hpp +++ b/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" diff --git a/tests/lumiera/example_plugin.c b/tests/plugin/example_plugin.c similarity index 99% rename from tests/lumiera/example_plugin.c rename to tests/plugin/example_plugin.c index a398819a6..13d704634 100644 --- a/tests/lumiera/example_plugin.c +++ b/tests/plugin/example_plugin.c @@ -1,9 +1,11 @@ #include -#include "hello_interface.h" #include "lumiera/interfacedescriptor.h" #include "lumiera/config_interface.h" +#include "tests/lumiera/hello_interface.h" + + LUMIERA_PLUGIN_INTERFACEHANDLE; LumieraInterface diff --git a/tests/lumiera/example_plugin.cpp b/tests/plugin/example_plugin.cpp similarity index 100% rename from tests/lumiera/example_plugin.cpp rename to tests/plugin/example_plugin.cpp