diff --git a/SConstruct b/SConstruct index f3f9f0ddc..4d2f2ee9c 100644 --- a/SConstruct +++ b/SConstruct @@ -1,6 +1,6 @@ # -*- python -*- ## -## SConstruct - SCons based build-sytem for Cinelerra +## SConstruct - SCons based build-sytem for Lumiera ## # Copyright (C) Lumiera.org @@ -61,7 +61,7 @@ def setupBasicEnvironment(): , SRCDIR=SRCDIR , BINDIR=BINDIR , CPPPATH=["#"+SRCDIR] # used to find includes, "#" means always absolute to build-root - , CPPDEFINES=['-DCINELERRA_VERSION='+VERSION ] # note: it's a list to append further defines + , CPPDEFINES=['-DLUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines , CCFLAGS='-Wall ' # -fdiagnostics-show-option ) @@ -234,21 +234,21 @@ def defineBuildTargets(env, artifacts): We use a custom function to declare a whole tree of srcfiles. """ - cinobj = ( srcSubtree(env,'$SRCDIR/backend') + lumobj = ( srcSubtree(env,'$SRCDIR/backend') + srcSubtree(env,'$SRCDIR/proc') + srcSubtree(env,'$SRCDIR/common') + srcSubtree(env,'$SRCDIR/lib') ) plugobj = srcSubtree(env,'$SRCDIR/plugin', isShared=True) - core = env.StaticLibrary('$BINDIR/core.la', cinobj) - #core = cinobj # use this for linking directly + core = env.StaticLibrary('$BINDIR/core.la', lumobj) + #core = lumobj # use this for linking directly # use PCH to speed up building precomp = env.PrecompiledHeader('$SRCDIR/pre') - env.Depends(cinobj, precomp) + env.Depends(lumobj, precomp) - artifacts['cinelerra'] = env.Program('$BINDIR/cinelerra', ['$SRCDIR/main.cpp']+ core ) - artifacts['plugins'] = env.SharedLibrary('$BINDIR/cinelerra-plugin', plugobj) + artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp']+ core ) + artifacts['plugins'] = env.SharedLibrary('$BINDIR/lumiera-plugin', plugobj) # call subdir SConscript(s) for independent components SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts') @@ -264,7 +264,7 @@ def definePostBuildTargets(env, artifacts): il = env.Alias('install-lib', '$DESTDIR/lib') env.Alias('install', [ib, il]) - build = env.Alias('build', artifacts['cinelerra']+artifacts['plugins']) + build = env.Alias('build', artifacts['lumiera']+artifacts['plugins']) allbu = env.Alias('allbuild', build+artifacts['testsuite']) env.Default('build') # additional files to be cleaned when cleaning 'build' @@ -286,11 +286,11 @@ def definePostBuildTargets(env, artifacts): def defineInstallTargets(env, artifacts): """ define some artifacts to be installed into target locations. """ - env.Install(dir = '$DESTDIR/bin', source=artifacts['cinelerra']) + env.Install(dir = '$DESTDIR/bin', source=artifacts['lumiera']) env.Install(dir = '$DESTDIR/lib', source=artifacts['plugins']) env.Install(dir = '$DESTDIR/bin', source=artifacts['tools']) - env.Install(dir = '$DESTDIR/share/doc/cinelerra$VERSION/devel', source=artifacts['doxydoc']) + env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=artifacts['doxydoc']) ##################################################################### @@ -310,7 +310,7 @@ artifacts = {} # the various things we build. # Each entry actually is a SCons-Node list. # Passing these entries to other builders defines dependencies. -# 'cinelerra' : the App +# 'lumiera' : the App # 'plugins' : plugin shared lib # 'tools' : small tool applications (e.g mpegtoc) # 'src,tar' : source tree as tarball (without doc) diff --git a/admin/scons/Buildhelper.py b/admin/scons/Buildhelper.py index f37cff630..ae3f5fb1f 100644 --- a/admin/scons/Buildhelper.py +++ b/admin/scons/Buildhelper.py @@ -123,8 +123,8 @@ def Tarball(env,location,dirs,suffix=''): """ targetID = '../extern-tar%s' % suffix versionID = env['VERSION'] - defaultName = 'cinelerra%s_%s' % (suffix, versionID) - nameprefix = 'cinelerra-%s/' % (versionID) + defaultName = 'lumiera%s_%s' % (suffix, versionID) + nameprefix = 'lumiera-%s/' % (versionID) location = env.subst(location) dirs = env.subst(dirs) return env.Command(targetID,None, createTarball, diff --git a/bin/DIR_INFO b/bin/DIR_INFO index c9048f8c1..9dafe61c3 100644 --- a/bin/DIR_INFO +++ b/bin/DIR_INFO @@ -1 +1 @@ -cinelerra executable(s) and libraries will be built here +Lumiera executable(s) and libraries will be built here diff --git a/oldsrc/DIR_INFO b/oldsrc/DIR_INFO index 666124344..e3f9d5b47 100644 --- a/oldsrc/DIR_INFO +++ b/oldsrc/DIR_INFO @@ -1 +1 @@ -cinelerra2 sources, added per case when needed +Cinelerra2 sources, added per case when needed diff --git a/src/common/appconfig.cpp b/src/common/appconfig.cpp index aba876966..fdf16cf40 100644 --- a/src/common/appconfig.cpp +++ b/src/common/appconfig.cpp @@ -45,8 +45,8 @@ namespace cinelerra * to beeing dependant on inclusion order of headers. */ // scoped_ptr Appconfig::theApp_; -#ifndef CINELERRA_VERSION -#define CINELERRA_VERSION 3++devel +#ifndef LUMIERA_VERSION +#define LUMIERA_VERSION 3++devel #endif @@ -67,7 +67,7 @@ namespace cinelerra // install our own handler for undeclared exceptions std::set_unexpected (cinelerra::error::cinelerra_unexpectedException); - (*configParam_)["version"] = STRINGIFY (CINELERRA_VERSION); + (*configParam_)["version"] = STRINGIFY (LUMIERA_VERSION); } diff --git a/src/lib/DIR_INFO b/src/lib/DIR_INFO index 1bc5bfed3..6946a8b7e 100644 --- a/src/lib/DIR_INFO +++ b/src/lib/DIR_INFO @@ -1,2 +1,2 @@ -cinelerra support library +Lumiera support library This dir contains the code for some tools and library code which will be used in many places diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 396e8ff81..89da7dc19 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -15,31 +15,31 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -libcin3_a_srcdir = $(top_srcdir)/src/lib -noinst_LIBRARIES += libcin3.a +liblumi_a_srcdir = $(top_srcdir)/src/lib +noinst_LIBRARIES += liblumi.a -libcin3_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -libcin3_a_CPPFLAGS = -I$(top_srcdir)/src/ +liblumi_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror +liblumi_a_CPPFLAGS = -I$(top_srcdir)/src/ -libcin3_a_SOURCES = \ - $(libcin3_a_srcdir)/plugin.c \ - $(libcin3_a_srcdir)/error.c \ - $(libcin3_a_srcdir)/time.c \ - $(libcin3_a_srcdir)/framerate.c \ - $(libcin3_a_srcdir)/mutex.c \ - $(libcin3_a_srcdir)/rwlock.c \ - $(libcin3_a_srcdir)/condition.c \ - $(libcin3_a_srcdir)/references.c +liblumi_a_SOURCES = \ + $(liblumi_a_srcdir)/plugin.c \ + $(liblumi_a_srcdir)/error.c \ + $(liblumi_a_srcdir)/time.c \ + $(liblumi_a_srcdir)/framerate.c \ + $(liblumi_a_srcdir)/mutex.c \ + $(liblumi_a_srcdir)/rwlock.c \ + $(liblumi_a_srcdir)/condition.c \ + $(liblumi_a_srcdir)/references.c noinst_HEADERS += \ - $(libcin3_a_srcdir)/plugin.h \ - $(libcin3_a_srcdir)/error.h \ - $(libcin3_a_srcdir)/time.h \ - $(libcin3_a_srcdir)/framerate.h \ - $(libcin3_a_srcdir)/locking.h \ - $(libcin3_a_srcdir)/mutex.h \ - $(libcin3_a_srcdir)/rwlock.h \ - $(libcin3_a_srcdir)/condition.h \ - $(libcin3_a_srcdir)/references.h + $(liblumi_a_srcdir)/plugin.h \ + $(liblumi_a_srcdir)/error.h \ + $(liblumi_a_srcdir)/time.h \ + $(liblumi_a_srcdir)/framerate.h \ + $(liblumi_a_srcdir)/locking.h \ + $(liblumi_a_srcdir)/mutex.h \ + $(liblumi_a_srcdir)/rwlock.h \ + $(liblumi_a_srcdir)/condition.h \ + $(liblumi_a_srcdir)/references.h diff --git a/src/proc/DIR_INFO b/src/proc/DIR_INFO index e709101eb..dac54f26c 100644 --- a/src/proc/DIR_INFO +++ b/src/proc/DIR_INFO @@ -1 +1 @@ -cinelerra processing core +Lumiera processing core diff --git a/src/tool/DIR_INFO b/src/tool/DIR_INFO index 76e84db53..c8933be3e 100644 --- a/src/tool/DIR_INFO +++ b/src/tool/DIR_INFO @@ -1 +1 @@ -source code of supplementary tools to be built alongside with Cinelerra +source code of supplementary tools to be built alongside with Lumiera diff --git a/src/tool/SConscript b/src/tool/SConscript index fe3a35dcc..738483498 100644 --- a/src/tool/SConscript +++ b/src/tool/SConscript @@ -5,10 +5,6 @@ Import('env','artifacts') -# at the moment (8/07), Ichthyo tries to find out how to configure NoBug -# does it help, if we set the NOBUG_LOG to the environment used for building?? -env = env.Clone() -env['ENV']['NOBUG_LOG'] = 'ttt:WARNING' # build the ubiquitous Hello World application (note: C source) artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c') diff --git a/tests/Makefile.am b/tests/Makefile.am index 26fe4b678..9e06a9a25 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,12 +21,12 @@ tests_srcdir = $(top_srcdir)/tests check_PROGRAMS += test-error test_error_SOURCES = $(tests_srcdir)/error/errortest.c test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_error_LDADD = libcin3.a -lnobugmt -lpthread -ldl +test_error_LDADD = liblumi.a -lnobugmt -lpthread -ldl check_PROGRAMS += test-time test_time_SOURCES = $(tests_srcdir)/time/test-time.c test_time_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_time_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm +test_time_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm check_PROGRAMS += test-locking test_locking_SOURCES = \ @@ -34,21 +34,21 @@ test_locking_SOURCES = \ $(tests_srcdir)/locking/mutex.c \ $(tests_srcdir)/locking/condition.c test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_locking_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm +test_locking_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm check_PROGRAMS += test-llist test_llist_SOURCES = $(tests_srcdir)/library/test-llist.c test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_llist_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm +test_llist_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm check_PROGRAMS += test-references test_references_SOURCES = $(tests_srcdir)/library/test-references.c test_references_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -test_references_LDADD = libcin3.a -lnobugmt -lpthread -ldl -lm -lrt +test_references_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm -lrt #check_PROGRAMS += test-filehandles #test_filehandles_SOURCES = $(tests_srcdir)/backend/test-filehandles.c #test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/ -#test_filehandles_LDADD = libcin3backend.a libcin3.a -lnobugmt -lpthread -ldl -lm +#test_filehandles_LDADD = liblumibackend.a liblumi.a -lnobugmt -lpthread -ldl -lm TESTS = $(tests_srcdir)/test.sh diff --git a/tests/plugin/DIR_INFO b/tests/plugin/DIR_INFO index 19ed2b9e2..c051168cc 100644 --- a/tests/plugin/DIR_INFO +++ b/tests/plugin/DIR_INFO @@ -1,3 +1,3 @@ -working example code for cinelerra's plugin system +working example code for Lumiera's plugin system This directory contains example code which shows how to use specific features. All examples will be build and run as part of the testsuite diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am index 2cd33997e..c6afc8e36 100644 --- a/tests/plugin/Makefile.am +++ b/tests/plugin/Makefile.am @@ -20,7 +20,7 @@ noinst_PROGRAMS += test-plugin test_plugin_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Werror test_plugin_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src -test_plugin_LDADD = libcin3.a -lnobugmt -lpthread -ldl +test_plugin_LDADD = liblumi.a -lnobugmt -lpthread -ldl test_plugin_SOURCES = $(examples_srcdir)/plugin_main.c noinst_HEADERS += $(examples_srcdir)/hello_interface.h