From 1e1c3706dcf9ed600354f79a58f11ef256afac83 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 5 Apr 2011 00:44:30 +0200 Subject: [PATCH 1/2] update some DIR_INFO entries --- DIR_INFO | 2 +- data/DIR_INFO | 2 +- doc/design/DIR_INFO | 1 + doc/technical/DIR_INFO | 1 + doc/user/DIR_INFO | 2 +- src/DIR_INFO | 2 +- src/backend/DIR_INFO | 2 +- src/common/DIR_INFO | 8 +------- src/gui/DIR_INFO | 1 + src/lumiera/DIR_INFO | 2 +- src/tool/DIR_INFO | 2 +- target/DIR_INFO | 2 +- target/modules/DIR_INFO | 2 +- tests/DIR_INFO | 2 +- tests/components/DIR_INFO | 2 +- tests/lib/DIR_INFO | 1 + wiki/DIR_INFO | 2 +- 17 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 doc/design/DIR_INFO create mode 100644 doc/technical/DIR_INFO create mode 100644 src/gui/DIR_INFO create mode 100644 tests/lib/DIR_INFO diff --git a/DIR_INFO b/DIR_INFO index f05e9a881..53261a52b 100644 --- a/DIR_INFO +++ b/DIR_INFO @@ -1 +1 @@ -The root dir for the Lumiera project +Root of the main Lumiera project tree diff --git a/data/DIR_INFO b/data/DIR_INFO index fc5c22ea2..f691b6d45 100644 --- a/data/DIR_INFO +++ b/data/DIR_INFO @@ -1 +1 @@ -Additional configuration, icons, graphics etc. to be installed with Lumiera +Additional configuration, icons, graphics for install diff --git a/doc/design/DIR_INFO b/doc/design/DIR_INFO new file mode 100644 index 000000000..4f75272b5 --- /dev/null +++ b/doc/design/DIR_INFO @@ -0,0 +1 @@ +design and concepts diff --git a/doc/technical/DIR_INFO b/doc/technical/DIR_INFO new file mode 100644 index 000000000..307341317 --- /dev/null +++ b/doc/technical/DIR_INFO @@ -0,0 +1 @@ +technical documentation diff --git a/doc/user/DIR_INFO b/doc/user/DIR_INFO index 61d585d2f..9bffac5af 100644 --- a/doc/user/DIR_INFO +++ b/doc/user/DIR_INFO @@ -1 +1 @@ -user documentation in texinfo +user documentation and manual diff --git a/src/DIR_INFO b/src/DIR_INFO index b6c7308d3..b7c705736 100644 --- a/src/DIR_INFO +++ b/src/DIR_INFO @@ -1 +1 @@ -root of sourcecode tree +Lumiera applilcation sourcecode tree diff --git a/src/backend/DIR_INFO b/src/backend/DIR_INFO index 0c5dfc094..c046837b6 100644 --- a/src/backend/DIR_INFO +++ b/src/backend/DIR_INFO @@ -1,2 +1,2 @@ -data and caching backend +Lumiera backend layer sourcecode diff --git a/src/common/DIR_INFO b/src/common/DIR_INFO index e3b6d818a..8b648aa43 100644 --- a/src/common/DIR_INFO +++ b/src/common/DIR_INFO @@ -1,7 +1 @@ -Common application services (liblumieracommon) - -contains: - * the config system - * commandline parsing - * interfaces and plugin loading - * lua interpreter (planned) +Common application services diff --git a/src/gui/DIR_INFO b/src/gui/DIR_INFO new file mode 100644 index 000000000..cad7376e2 --- /dev/null +++ b/src/gui/DIR_INFO @@ -0,0 +1 @@ +Lumiera GTK GUI diff --git a/src/lumiera/DIR_INFO b/src/lumiera/DIR_INFO index fc536d0ed..2a31026e8 100644 --- a/src/lumiera/DIR_INFO +++ b/src/lumiera/DIR_INFO @@ -1 +1 @@ -The Lumiera application shell +The Lumiera application diff --git a/src/tool/DIR_INFO b/src/tool/DIR_INFO index c8933be3e..db1f8c765 100644 --- a/src/tool/DIR_INFO +++ b/src/tool/DIR_INFO @@ -1 +1 @@ -source code of supplementary tools to be built alongside with Lumiera +source code of supplementary tools diff --git a/target/DIR_INFO b/target/DIR_INFO index 8764b3989..7a85b70c2 100644 --- a/target/DIR_INFO +++ b/target/DIR_INFO @@ -1 +1 @@ -Lumiera program package tree, holding executable(s) and libraries to be built +Lumiera Application binary tree, executable(s) and modules diff --git a/target/modules/DIR_INFO b/target/modules/DIR_INFO index ffdc4efcb..21643380f 100644 --- a/target/modules/DIR_INFO +++ b/target/modules/DIR_INFO @@ -1 +1 @@ -Lumiera subsystems and other dynamically loadable application components +Lumiera subsystems and dynamically loadable components diff --git a/tests/DIR_INFO b/tests/DIR_INFO index cd5d69231..f6bbbc963 100644 --- a/tests/DIR_INFO +++ b/tests/DIR_INFO @@ -1 +1 @@ -test suite +Lumiera test suite sourcecode diff --git a/tests/components/DIR_INFO b/tests/components/DIR_INFO index 55fe55def..a01bda331 100644 --- a/tests/components/DIR_INFO +++ b/tests/components/DIR_INFO @@ -1 +1 @@ -Testsuite sourcecode tree +core components testsuite diff --git a/tests/lib/DIR_INFO b/tests/lib/DIR_INFO new file mode 100644 index 000000000..7855cfb57 --- /dev/null +++ b/tests/lib/DIR_INFO @@ -0,0 +1 @@ +support library testsuite diff --git a/wiki/DIR_INFO b/wiki/DIR_INFO index 2bbb2fa6b..c9eb35989 100644 --- a/wiki/DIR_INFO +++ b/wiki/DIR_INFO @@ -1 +1 @@ -tiddlywiki for semi-persistent documentation +TiddlyWiki to document ongoing work From e6cc7d3f99d1a66a706b847433d5a9d3cb1f87c3 Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Thu, 28 Apr 2011 13:14:29 +0200 Subject: [PATCH 2/2] WIP: autotools catchup, make it build again Lumiera builds again, but some tests are missing and the new setup.ini isn't loaded correctly which makes the plugin loader fail. --- configure.ac | 9 ++++++++- src/common/Makefile.am | 2 ++ src/lib/Makefile.am | 13 +++++-------- src/proc/Makefile.am | 34 ++++++++++++++++++---------------- tests/lib/Makefile.am | 12 ++++++------ 5 files changed, 39 insertions(+), 31 deletions(-) diff --git a/configure.ac b/configure.ac index 75185b3d9..8a139aeb8 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,7 @@ AC_CHECK_FUNCS(clock_gettime, AC_MSG_NOTICE([clock_gettime is in the clib]), AC_CHECK_LIB(rt, clock_gettime, [LUMIERA_LIBS="$LUMIERA_LIBS -lrt"], - AC_MSG_ERROR([No library providing clock_gettime found]) + AC_MSG_ERROR([No library providing clock_gettime found]) ) ) @@ -143,6 +143,13 @@ AC_CHECK_HEADER([boost/regex.hpp], AC_MSG_ERROR([boost::regex missing (http://www.boost.org/)]) ) +AC_CHECK_HEADER([boost/filesystem.hpp], + [LUMIERA_BOOST_LIBS="$LUMIERA_BOOST_LIBS -lboost_filesystem-mt"], + AC_MSG_ERROR([boost::filesystem missing (http://www.boost.org/)]) + ) + + + AC_LANG_POP([C++]) AC_SUBST(LUMIERA_BOOST_CFLAGS) AC_SUBST(LUMIERA_BOOST_LIBS) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 5f30d3cb1..f84559290 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -28,6 +28,7 @@ liblumieracommon_la_LIBADD = \ liblumieracommon_la_SOURCES = \ $(liblumieracommon_la_srcdir)/appstate.cpp \ + $(liblumieracommon_la_srcdir)/basic-setup.cpp \ $(liblumieracommon_la_srcdir)/config.c \ $(liblumieracommon_la_srcdir)/config_interface.c \ $(liblumieracommon_la_srcdir)/config_lookup.c \ @@ -51,6 +52,7 @@ liblumieracommon_la_SOURCES = \ noinst_HEADERS += \ $(liblumieracommon_la_srcdir)/appstate.hpp \ + $(liblumieracommon_la_srcdir)/basic-setup.hpp \ $(liblumieracommon_la_srcdir)/config.h \ $(liblumieracommon_la_srcdir)/config_interface.h \ $(liblumieracommon_la_srcdir)/config_lookup.h \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index fe64f516a..a44b47423 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -54,8 +54,10 @@ liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/recmutex.c \ $(liblumiera_la_srcdir)/rwlock.c \ $(liblumiera_la_srcdir)/safeclib.c \ + $(liblumiera_la_srcdir)/searchpath.cpp \ $(liblumiera_la_srcdir)/streamtype.cpp \ $(liblumiera_la_srcdir)/symbol-impl.cpp \ + $(liblumiera_la_srcdir)/sync.cpp \ $(liblumiera_la_srcdir)/test/suite.cpp \ $(liblumiera_la_srcdir)/test/test-helper.cpp \ $(liblumiera_la_srcdir)/test/testoption.cpp \ @@ -88,14 +90,11 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/meta/typelist.hpp \ $(liblumiera_la_srcdir)/mpool.h \ $(liblumiera_la_srcdir)/mrucache.h \ - $(liblumiera_la_srcdir)/mrucache.h \ $(liblumiera_la_srcdir)/mutex.h \ $(liblumiera_la_srcdir)/nobug-init.hpp \ $(liblumiera_la_srcdir)/observable-list.hpp \ $(liblumiera_la_srcdir)/p.hpp \ $(liblumiera_la_srcdir)/ppmpl.h \ - $(liblumiera_la_srcdir)/ppmpl.h \ - $(liblumiera_la_srcdir)/psplay.h \ $(liblumiera_la_srcdir)/psplay.h \ $(liblumiera_la_srcdir)/query.hpp \ $(liblumiera_la_srcdir)/reccondition.h \ @@ -103,25 +102,23 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/rwlock.h \ $(liblumiera_la_srcdir)/safeclib.h \ $(liblumiera_la_srcdir)/scoped-holder.hpp \ - $(liblumiera_la_srcdir)/singleton-subclass.hpp \ - $(liblumiera_la_srcdir)/singleton.hpp \ + $(liblumiera_la_srcdir)/searchpath.hpp \ $(liblumiera_la_srcdir)/singleton-factory.hpp \ $(liblumiera_la_srcdir)/singleton-policies.hpp \ $(liblumiera_la_srcdir)/singleton-preconfigure.hpp \ + $(liblumiera_la_srcdir)/singleton-subclass.hpp \ + $(liblumiera_la_srcdir)/singleton.hpp \ $(liblumiera_la_srcdir)/sync-classlock.hpp \ $(liblumiera_la_srcdir)/sync.hpp \ - $(liblumiera_la_srcdir)/sync.hpp \ $(liblumiera_la_srcdir)/test/mockinjector.hpp \ $(liblumiera_la_srcdir)/test/run.hpp \ $(liblumiera_la_srcdir)/test/suite.hpp \ $(liblumiera_la_srcdir)/test/test-helper.hpp \ $(liblumiera_la_srcdir)/test/testoption.hpp \ $(liblumiera_la_srcdir)/time.h \ - $(liblumiera_la_srcdir)/time.h \ $(liblumiera_la_srcdir)/tmpbuf.h \ $(liblumiera_la_srcdir)/tree.hpp \ $(liblumiera_la_srcdir)/util.hpp \ $(liblumiera_la_srcdir)/visitor-dispatcher.hpp \ $(liblumiera_la_srcdir)/visitor-policies.hpp \ $(liblumiera_la_srcdir)/visitor.hpp - diff --git a/src/proc/Makefile.am b/src/proc/Makefile.am index 56ef795df..ddbf2f29f 100644 --- a/src/proc/Makefile.am +++ b/src/proc/Makefile.am @@ -39,22 +39,23 @@ noinst_LTLIBRARIES += liblumiprocasset.la liblumiprocasset_la_CFLAGS = $(AM_CFLAGS) $(LUMIERA_PROC_CFLAGS) -std=gnu99 -Wall -Wextra -Werror liblumiprocasset_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wextra -liblumiprocasset_la_SOURCES = \ - $(liblumiprocasset_la_srcdir)/category.cpp \ - $(liblumiprocasset_la_srcdir)/clip.cpp \ - $(liblumiprocasset_la_srcdir)/codec.cpp \ - $(liblumiprocasset_la_srcdir)/compoundmedia.cpp \ - $(liblumiprocasset_la_srcdir)/effect.cpp \ - $(liblumiprocasset_la_srcdir)/media.cpp \ - $(liblumiprocasset_la_srcdir)/meta.cpp \ - $(liblumiprocasset_la_srcdir)/pipe.cpp \ - $(liblumiprocasset_la_srcdir)/preview.cpp \ - $(liblumiprocasset_la_srcdir)/proc.cpp \ - $(liblumiprocasset_la_srcdir)/procpatt.cpp \ - $(liblumiprocasset_la_srcdir)/sequence.cpp \ - $(liblumiprocasset_la_srcdir)/struct.cpp \ - $(liblumiprocasset_la_srcdir)/timeline.cpp \ - $(liblumiprocasset_la_srcdir)/typed-lookup.cpp \ +liblumiprocasset_la_SOURCES = \ + $(liblumiprocasset_la_srcdir)/category.cpp \ + $(liblumiprocasset_la_srcdir)/clip.cpp \ + $(liblumiprocasset_la_srcdir)/codec.cpp \ + $(liblumiprocasset_la_srcdir)/compoundmedia.cpp \ + $(liblumiprocasset_la_srcdir)/effect.cpp \ + $(liblumiprocasset_la_srcdir)/media.cpp \ + $(liblumiprocasset_la_srcdir)/meta.cpp \ + $(liblumiprocasset_la_srcdir)/meta/time-grid.cpp \ + $(liblumiprocasset_la_srcdir)/pipe.cpp \ + $(liblumiprocasset_la_srcdir)/preview.cpp \ + $(liblumiprocasset_la_srcdir)/proc.cpp \ + $(liblumiprocasset_la_srcdir)/procpatt.cpp \ + $(liblumiprocasset_la_srcdir)/sequence.cpp \ + $(liblumiprocasset_la_srcdir)/struct.cpp \ + $(liblumiprocasset_la_srcdir)/timeline.cpp \ + $(liblumiprocasset_la_srcdir)/typed-lookup.cpp \ $(liblumiprocasset_la_srcdir)/unknown.cpp @@ -199,6 +200,7 @@ noinst_HEADERS += \ $(liblumiproc_la_srcdir)/asset/effect.hpp \ $(liblumiproc_la_srcdir)/asset/media.hpp \ $(liblumiproc_la_srcdir)/asset/meta.hpp \ + $(liblumiproc_la_srcdir)/asset/meta/time-grid.hpp \ $(liblumiproc_la_srcdir)/asset/pipe.hpp \ $(liblumiproc_la_srcdir)/asset/preview.hpp \ $(liblumiproc_la_srcdir)/asset/proc.hpp \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 12d1892cf..347ee36a1 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -44,8 +44,9 @@ test_lib_SOURCES = \ $(testlib_srcdir)/advice/advice-multiplicity-test.cpp \ $(testlib_srcdir)/advice/advice-situations-test.cpp \ $(testlib_srcdir)/allocation-cluster-test.cpp \ - $(testlib_srcdir)/appconfigtest.cpp \ + $(testlib_srcdir)/app-config-test.cpp \ $(testlib_srcdir)/bool-checkable-test.cpp \ + $(testlib_srcdir)/cmdline-wrapper-test.cpp \ $(testlib_srcdir)/custom-shared-ptr-test.cpp \ $(testlib_srcdir)/del-stash-test.cpp \ $(testlib_srcdir)/exceptionerrortest.cpp \ @@ -61,6 +62,7 @@ test_lib_SOURCES = \ $(testlib_srcdir)/iter-source-test.cpp \ $(testlib_srcdir)/itertools-test.cpp \ $(testlib_srcdir)/lifecycletest.cpp \ + $(testlib_srcdir)/lumitime-test.cpp \ $(testlib_srcdir)/mainsuite.cpp \ $(testlib_srcdir)/meta/config-flags-test.cpp \ $(testlib_srcdir)/meta/duck-detector-test.cpp \ @@ -83,8 +85,8 @@ test_lib_SOURCES = \ $(testlib_srcdir)/removefromsettest.cpp \ $(testlib_srcdir)/sanitised-identifier-test.cpp \ $(testlib_srcdir)/scoped-holder-test.cpp \ - $(testlib_srcdir)/scoped-ptrvect-test.cpp \ $(testlib_srcdir)/scoped-holder-transfer-test.cpp \ + $(testlib_srcdir)/scoped-ptrvect-test.cpp \ $(testlib_srcdir)/singleton-subclass-test.cpp \ $(testlib_srcdir)/singleton-test.cpp \ $(testlib_srcdir)/singleton-testmock-test.cpp \ @@ -97,15 +99,13 @@ test_lib_SOURCES = \ $(testlib_srcdir)/sync-classlock-test.cpp \ $(testlib_srcdir)/sync-locking-test.cpp \ $(testlib_srcdir)/sync-waiting-test.cpp \ - $(testlib_srcdir)/test/cmdlinewrappertest.cpp \ $(testlib_srcdir)/test/test-helper-test.cpp \ $(testlib_srcdir)/test/testoptiontest.cpp \ $(testlib_srcdir)/thread-wrapper-join-test.cpp \ $(testlib_srcdir)/thread-wrapper-test.cpp \ - $(testlib_srcdir)/lumitime-test.cpp \ - $(testlib_srcdir)/time/time-value-test.cpp \ - $(testlib_srcdir)/time/time-quantisation-test.cpp \ $(testlib_srcdir)/time/time-formats-test.cpp \ + $(testlib_srcdir)/time/time-quantisation-test.cpp \ + $(testlib_srcdir)/time/time-value-test.cpp \ $(testlib_srcdir)/typed-allocation-manager-test.cpp \ $(testlib_srcdir)/typed-counter-test.cpp \ $(testlib_srcdir)/util-foreach-test.cpp \