From 4286c860886dcf3d1023ec0abcf4a4d5fc287cbc Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 18 Oct 2008 05:29:35 +0200 Subject: [PATCH] merge after landing config system --- SConstruct | 2 +- icons/svg/tool-arrow.svg | 237 +++++++++++++++++++++++++-------------- src/gui/gtk-lumiera.cpp | 4 +- src/gui/gtk-lumiera.hpp | 3 - src/gui/lumiera_ui.rc | 25 +++-- src/proc/lumiera.hpp | 73 +++++++++++- src/tool/SConscript | 1 + src/tool/luidgen.c | 51 +++++++++ tests/SConscript | 20 ++-- tests/test.h | 2 +- tests/test.sh | 2 +- 11 files changed, 306 insertions(+), 114 deletions(-) create mode 100644 src/tool/luidgen.c diff --git a/SConstruct b/SConstruct index 9660003ef..07b791cb0 100644 --- a/SConstruct +++ b/SConstruct @@ -293,7 +293,7 @@ def defineBuildTargets(env, artifacts): objplug = srcSubtree(env,'$SRCDIR/plugin', isShared=True) core = ( env.StaticLibrary('$BINDIR/lumiback.la', objback) + env.StaticLibrary('$BINDIR/lumiproc.la', objproc) - + env.StaticLibrary('$BINDIR/lumi.la', objlib) + + env.StaticLibrary('$BINDIR/lumiera.la', objlib) ) diff --git a/icons/svg/tool-arrow.svg b/icons/svg/tool-arrow.svg index 026b6633f..3f0b72102 100644 --- a/icons/svg/tool-arrow.svg +++ b/icons/svg/tool-arrow.svg @@ -510,6 +510,89 @@ y1="-129.52815" x2="252.00447" y2="-135.47408" /> + + + + + + + + - - - - - + + + - - - - - - + + + + - - - - - - - + + + + + + + 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. +*/ + +#include "lib/luid.h" + +#include + +/** + * @file + * Generate amd print a Lumiera uid as octal escaped string + */ + +int +main (int argc, char** argv) +{ + lumiera_uid luid; + lumiera_uid_gen (&luid); + + printf ("\""); + for (int i = 0; i < 16; ++i) + printf ("\\%.3hho", *(((char*)&luid)+i)); + printf ("\"\n"); + + return 0; +} + +/* +// Local Variables: +// mode: C +// c-file-style: "gnu" +// indent-tabs-mode: nil +// End: +*/ diff --git a/tests/SConscript b/tests/SConscript index b817cdece..d47b9d943 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -36,26 +36,32 @@ def testCollection(env,dir): """ treat a Directory containing a collection of standalone tests. Link each of them into an independent executable """ + srcpatt = ['test-*.c'] exeName = lambda p: path.basename(path.splitext(p)[0]) buildIt = lambda p: env.Program("#$BINDIR/"+exeName(p), [p] + core) - return [buildIt(f) for f in scanSubtree(dir)] + return [buildIt(f) for f in scanSubtree(dir,srcpatt)] def treatPluginTestcase(env): """ Special case: the test-plugin executable """ + tree = 'backend' env = env.Clone() - env.Append(CPPPATH='plugin') - prfx = 'plugin/example_plugin' + env.Append(CPPPATH=tree) + prfx = path.join(tree,'example_plugin') oC = env.SharedObject(prfx, prfx+'.c') oCPP = env.SharedObject(prfx+'_cpp', prfx+'.cpp') testplugin = ( env.SharedLibrary('#$BINDIR/.libs/example_plugin', oC, SHLIBPREFIX='') + env.SharedLibrary('#$BINDIR/.libs/example_plugin_cpp', oCPP, SHLIBPREFIX='') ) - testExe = env.Program('#$BINDIR/test-plugin', ['plugin/plugin_main.c'] + core) - env.Depends(testExe, testplugin) - return testExe - #-- it depentds (at the moment) on a specific isolated test-plugin, +# testExe = env.Program('#$BINDIR/test-plugin', ['plugin/plugin_main.c'] + core) +# env.Depends(testExe, testplugin) +# return testExe + + # 10/2008 example_plugin moved to backend directory. + # ...we should try to find some convention here + return testplugin + #-- it depends (at the moment) on a specific isolated test-plugin, # which is not integrated in the "normal procedure" for building Plugins # (which is not yet implemented as of 8/07) # TODO: handle this case automatically diff --git a/tests/test.h b/tests/test.h index 060d007fc..987892956 100644 --- a/tests/test.h +++ b/tests/test.h @@ -33,7 +33,7 @@ LUMIERA_ERROR_DEFINE (TEST, "test error"); #define TESTS_BEGIN \ int \ -main (int argc, char** argv) \ +main (int argc, const char** argv) \ { \ NOBUG_INIT; \ NOBUG_INIT_FLAG (tests); \ diff --git a/tests/test.sh b/tests/test.sh index d919ed073..e2d5159b7 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -30,7 +30,7 @@ export LC_ALL=C arg0="$0" srcdir="$(dirname "$arg0")" -ulimit -S -t 1 -v 524288 +ulimit -S -t 2 -v 524288 valgrind="" if [ "$VALGRINDFLAGS" = 'DISABLE' ]; then echo "valgrind explicit disabled"