From: g0dil Date: Fri, 21 Aug 2009 13:52:50 +0000 (+0000) Subject: Move sourcecode into 'senf/' directory X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git Move sourcecode into 'senf/' directory Add PACKET_BUNDLES environment variable Fix doumentation build process Remove 'include/' directory git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1316 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/.gitignore b/.gitignore index f83fefe..1b0466f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ # Local files (files in this directory) /Doxyfile.local -/local_config.hh /.prepare-stamp /libsenf.a /build-arch-debug-stamp diff --git a/Examples/MCSniffer/SConscript b/Examples/MCSniffer/SConscript index 9d517a2..c9b860a 100644 --- a/Examples/MCSniffer/SConscript +++ b/Examples/MCSniffer/SConscript @@ -7,4 +7,4 @@ import SENFSCons sources, tests, includes = SENFSCons.Glob(env) -env.Default(env.Program('mcsniffer', sources + [ '#/Packets/DefaultBundle/DefaultBundle.o' ])) +env.Default(env.Program('mcsniffer', sources + env['PACKET_BUNDLES'])) diff --git a/Examples/RateStuffer/Doxyfile b/Examples/RateStuffer/Doxyfile index 01dbc0b..e4d44f5 100644 --- a/Examples/RateStuffer/Doxyfile +++ b/Examples/RateStuffer/Doxyfile @@ -2,5 +2,5 @@ SHOW_NAMESPACES = NO ALPHABETICAL_INDEX = NO -PROJECT_NAME = RateStuffer +PROJECT_NAME = Examples EXAMPLE_PATH = . diff --git a/Examples/SConscript b/Examples/SConscript index 545a382..c5e6c01 100644 --- a/Examples/SConscript +++ b/Examples/SConscript @@ -1,18 +1,16 @@ -import sys, glob, os.path, datetime -sys.path.append('senfscons') +# -*- python -*- + Import('env') -import SENFSCons +import SENFSCons, glob, yaptu ########################################################################### -import yaptu - -HOWTOS = [] +EXAMPLES = [] for dox in sorted(glob.glob("*/Mainpage.dox")): title = ([None] + [ line.split('\\mainpage',1)[-1].strip() for line in file(dox) if '\\mainpage' in line ])[-1] if title: - HOWTOS.append( (dox.split('/',1)[0], title) ) + EXAMPLES.append( (dox.split('/',1)[0], title) ) MAINPAGE=""" /** \mainpage Examples @@ -20,7 +18,7 @@ MAINPAGE=""" \htmlonly
-{{ for name, title in HOWTOS: +{{ for name, title in EXAMPLES:
${name}
${title}
}} diff --git a/Examples/Sniffer/Doxyfile b/Examples/Sniffer/Doxyfile index ae04497..e4d44f5 100644 --- a/Examples/Sniffer/Doxyfile +++ b/Examples/Sniffer/Doxyfile @@ -2,5 +2,5 @@ SHOW_NAMESPACES = NO ALPHABETICAL_INDEX = NO -PROJECT_NAME = Sniffer +PROJECT_NAME = Examples EXAMPLE_PATH = . diff --git a/Examples/Sniffer/SConscript b/Examples/Sniffer/SConscript index a398943..44150eb 100644 --- a/Examples/Sniffer/SConscript +++ b/Examples/Sniffer/SConscript @@ -7,8 +7,5 @@ import SENFSCons sources, tests, includes = SENFSCons.Glob(env) -env.Program('sniffer', sources + [ '#/Packets/DefaultBundle/DefaultBundle.o', - '#/Packets/MPEGDVBBundle/MPEGDVBBundle.o', - '#/Packets/80221Bundle/80221Bundle.o', - '#/Packets/80211Bundle/80211Bundle.o' ] ) +env.Program('sniffer', sources + env['PACKET_BUNDLES']) SENFSCons.Doxygen(env) diff --git a/Examples/UDPClientServer/Doxyfile b/Examples/UDPClientServer/Doxyfile index df4580b..e4d44f5 100644 --- a/Examples/UDPClientServer/Doxyfile +++ b/Examples/UDPClientServer/Doxyfile @@ -2,5 +2,5 @@ SHOW_NAMESPACES = NO ALPHABETICAL_INDEX = NO -PROJECT_NAME = UDPClientServer +PROJECT_NAME = Examples EXAMPLE_PATH = . diff --git a/HowTos/Doxyfile b/HowTos/Doxyfile index b742612..8f27f39 100644 --- a/HowTos/Doxyfile +++ b/HowTos/Doxyfile @@ -1,4 +1,4 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" INPUT = . -PROJECT_NAME = "HowTos" +PROJECT_NAME = HowTos diff --git a/HowTos/NewPacket/Doxyfile b/HowTos/NewPacket/Doxyfile index 4342f32..b998009 100644 --- a/HowTos/NewPacket/Doxyfile +++ b/HowTos/NewPacket/Doxyfile @@ -1,5 +1,5 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" INPUT = . -PROJECT_NAME = NewPacket +PROJECT_NAME = HowTos EXAMPLE_PATH = . diff --git a/HowTos/SConscript b/HowTos/SConscript index 86793ee..4ff973a 100644 --- a/HowTos/SConscript +++ b/HowTos/SConscript @@ -1,8 +1,7 @@ # -*- python -*- Import('env') -import SENFSCons, glob, sys -import yaptu +import SENFSCons, glob, yaptu ########################################################################### diff --git a/Mainpage.dox b/Mainpage.dox index 049d80c..77ead86 100644 --- a/Mainpage.dox +++ b/Mainpage.dox @@ -47,6 +47,61 @@ \see \ref senf_usage\n Examples + + \section senfutil_overview Building Projects using SENF + + When building projects using senf, SENFSCons has a very simple helper module \ref senfutil to + make the building of libraries utilizing senf simpler: + \code + import sys + sys.path.extend(('senf/site_scons','/usr/lib/senf/site_scons')) + import os.path, glob, senfutil + + env = Environment() + + senfutil.SetupForSENF( env ) + + env.Append( + + LIBS = [ ], + CXXFLAGS = [ '-Wall', '-Woverloaded-virtual' ], + LINKFLAGS = [ ], + + CXXFLAGS_debug = [ ], + LINKFLAGS_debug = [ ], + LOGLEVELS_debug = [ 'senf::log::Debug||VERBOSE' ], + + CXXFLAGS_final = [ '-O3' ], + LINKFLAGS_final = [ ], + LOGLEVELS_final = [ ], + + SENF_BUILDOPTS = [ ], + + ) + + env.Default( + env.Program( target = 'udpforward', + source = glob.glob('*.cc') ) + ) + + env.Clean(DEFAULT_TARGETS, [ 'udpforward.log', 'udpforward.pid' ]) + \endcode + + This example builds a simple binary from a number of source files (all '.cc' files). It links + against the SENF library and automatically sets all the correct compiler options using + senfutil.SetupForSENF( env ). + + This script automatically uses a SENF installation either symlinked or imported into the current + project in directory 'senf' or, if this directory does not exist, a globaly installed SENF. A + locally installed SENF is automatically recompiled if needed. Parallel building is also + supported. + + This script automatically supports the \c final and \c LOGLEVELS command line parameters. The + LOGLEVELS parameter uses a much more readable syntax than SENF_LOG_CONF: + 
+    $ scons -j2 final=1 \
+          LOGLEVELS='senf::log::Debug||IMPORTANT myapp::Transactions|mytrans::Area|VERBOSE'
+
*/ /** \page senf_usage Using the SENF framework diff --git a/SConstruct b/SConstruct index b0f7742..1c4c1dc 100644 --- a/SConstruct +++ b/SConstruct @@ -50,7 +50,7 @@ env.Append( ENV = { 'PATH' : os.environ.get('PATH') }, CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*', '.sconsign' ], - CPPPATH = [ '#/include' ], + CPPPATH = [ '#' ], LOCALLIBDIR = '#', LIBPATH = [ '$LOCALLIBDIR' ], LIBS = [ '$LIBSENF$LIBADDSUFFIX', 'rt', '$BOOSTREGEXLIB', @@ -111,26 +111,20 @@ Export('env') if not os.path.exists("Doxyfile.local"): Execute(Touch("Doxyfile.local")) -# Create local_config.h -if not env.GetOption('clean') and not os.path.exists("local_config.hh"): - Execute(Touch("local_config.hh")) - if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \ and not os.environ.get("SCONS") and COMMAND_LINE_TARGETS != [ 'prepare' ]: env.Execute([ "scons prepare" ]) -# Load SConscripts. Need to load some first (they change the global environment) -initSConscripts = [ - "debian/SConscript", - "doclib/SConscript", -] +# Load SConscripts -SConscript(initSConscripts) +SConscript("debian/SConscript") +SConscript("doclib/SConscript") +if os.path.exists('SConscript.local') : SConscript('SConscript.local') -if os.path.exists('SConscript.local'): - SConscript('SConscript.local') +SConscript("senf/SConscript") -SConscript(list(set(glob.glob("*/SConscript")) - set(initSConscripts))) +SConscript("Examples/SConscript") +SConscript("HowTos/SConscript") ########################################################################### # Define build targets @@ -139,10 +133,9 @@ SConscript(list(set(glob.glob("*/SConscript")) - set(initSConscripts))) env.Depends(SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION'])) #### libsenf.a -libsenf = env.Library(env.subst("$LIBSENF$LIBADDSUFFIX"), env['ALLOBJECTS']) +libsenf = env.Library("$LOCALLIBDIR/${LIBSENF}${LIBADDSUFFIX}", env['ALLOBJECTS']) env.Default(libsenf) -env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = [ 'config.hh' ]) env.Install('$LIBINSTALLDIR', libsenf) #### install_all, default, all_tests, all diff --git a/Utils/main.test.cc b/Utils/main.test.cc deleted file mode 100644 index d2f37be..0000000 --- a/Utils/main.test.cc +++ /dev/null @@ -1,53 +0,0 @@ -// $Id$ -// -// Copyright (C) 2006 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund -// -// 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., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -// Definition of non-inline non-template functions - -//#include "test.hh" -//#include "test.ih" - -// Custom includes -#define BOOST_AUTO_TEST_MAIN -#include "../Utils/auto_unit_test.hh" -#include - -#define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// - -BOOST_AUTO_UNIT_TEST(testMain) -{ - BOOST_CHECK( true ); -} - -///////////////////////////////cc.e//////////////////////////////////////// -#undef prefix_ - - -// Local Variables: -// mode: c++ -// fill-column: 100 -// c-file-style: "senf" -// indent-tabs-mode: nil -// ispell-local-dictionary: "american" -// compile-command: "scons -u test" -// comment-column: 40 -// End: diff --git a/doclib/SConscript b/doclib/SConscript index 9fbf7d9..85654a9 100644 --- a/doclib/SConscript +++ b/doclib/SConscript @@ -127,11 +127,14 @@ def modules(): # Naja ... etwas rumgehackt aber was solls ... global EXTRA_MODULES mods = {} - pathbase = len(env.Dir('#').abspath)+1 + pathbase = env.Dir('#/senf').abspath + pathbasel = len(pathbase)+1 for module in env.Alias('all_docs')[0].sources: if module.name != 'html.stamp' : continue - mods[module.dir.dir.dir.abspath] = [ module.dir.dir.dir.name, - module.dir.abspath[pathbase:], + if not module.dir.dir.dir.abspath.startswith(pathbase): continue + mods[module.dir.dir.dir.abspath] = [ module.dir.dir.dir.abspath[pathbasel:].replace('/','_'), + module.dir.dir.dir.name, + module.dir.abspath[pathbasel:], 0 ] rv = [] @@ -140,39 +143,18 @@ def modules(): for mod in keys: i = 0 while i < len(rv): - if len(rv[i]) > pathbase and mod.startswith(rv[i] + '/'): - level = mods[rv[i]][2] + 1 + if len(rv[i]) > pathbasel and mod.startswith(rv[i] + '/'): + level = mods[rv[i]][-1] + 1 i += 1 while i < len(rv) and mods[rv[i]][2] >= level: i += 1 rv[i:i] = [ mod ] - mods[mod][2] = level + mods[mod][-1] = level break i += 1 if i == len(rv): rv.append(mod) - for mod in keys: - if mods[mod][2] == 0: - mods[mod][0] = 'lib' + mods[mod][0] - - n = 0 - for name,path in EXTRA_MODULES: - path = env.Dir(path).dir.dir.abspath - i = 0 - while i < len(rv): - if rv[i] == path: - mods[rv[i]][0] = name - m = 1 - while i+m < len(rv) and mods[rv[i+m]][2] > mods[rv[i]][2]: - m += 1 - rv[n:n] = rv[i:i+m] - rv[i+m:i+2*m] = [] - i += m - n += m - else: - i += 1 - return ( tuple(mods[mod]) for mod in rv ) def indices(): @@ -191,14 +173,6 @@ writeTemplate = env.Action(writeTemplate, varlist = [ 'TEMPLATE' ]) ########################################################################### -# Extra documentation modules which are handled (named) different from -# library modules -EXTRA_MODULES = [ - ('Overview', '#/doc/html'), - ('Examples', '#/Examples/doc/html'), - ('HowTos', '#/HowTos/doc/html'), - ('SENFSCons', '#/senfscons/doc/html') ] - HEADER = """ @@ -239,11 +213,16 @@ div.tabs li.$projectname a { background-color: #EDE497; }
+
  • Overview
    • +
  • Examples
    • +
  • HowTos
    • +
  • Glossary
    • +
    +
      -{{ for name, path, level in modules(): -
    • ${name}
      • +{{ for id, name, path, level in modules(): +
    • ${name}
      • }} -
    • Glossary
    """ diff --git a/senf/.gitignore b/senf/.gitignore new file mode 100644 index 0000000..d215d6d --- /dev/null +++ b/senf/.gitignore @@ -0,0 +1,2 @@ +/Ext/*/ +/local_config.hh diff --git a/include/senf/PPI.hh b/senf/PPI.hh similarity index 100% rename from include/senf/PPI.hh rename to senf/PPI.hh diff --git a/PPI/ActiveFeeder.cc b/senf/PPI/ActiveFeeder.cc similarity index 100% rename from PPI/ActiveFeeder.cc rename to senf/PPI/ActiveFeeder.cc diff --git a/PPI/ActiveFeeder.cci b/senf/PPI/ActiveFeeder.cci similarity index 100% rename from PPI/ActiveFeeder.cci rename to senf/PPI/ActiveFeeder.cci diff --git a/PPI/ActiveFeeder.hh b/senf/PPI/ActiveFeeder.hh similarity index 100% rename from PPI/ActiveFeeder.hh rename to senf/PPI/ActiveFeeder.hh diff --git a/PPI/ActiveFeeder.test.cc b/senf/PPI/ActiveFeeder.test.cc similarity index 100% rename from PPI/ActiveFeeder.test.cc rename to senf/PPI/ActiveFeeder.test.cc diff --git a/PPI/AnnotationRouter.ct b/senf/PPI/AnnotationRouter.ct similarity index 100% rename from PPI/AnnotationRouter.ct rename to senf/PPI/AnnotationRouter.ct diff --git a/PPI/AnnotationRouter.hh b/senf/PPI/AnnotationRouter.hh similarity index 100% rename from PPI/AnnotationRouter.hh rename to senf/PPI/AnnotationRouter.hh diff --git a/PPI/AnnotationRouter.test.cc b/senf/PPI/AnnotationRouter.test.cc similarity index 100% rename from PPI/AnnotationRouter.test.cc rename to senf/PPI/AnnotationRouter.test.cc diff --git a/PPI/CloneSource.cc b/senf/PPI/CloneSource.cc similarity index 100% rename from PPI/CloneSource.cc rename to senf/PPI/CloneSource.cc diff --git a/PPI/CloneSource.hh b/senf/PPI/CloneSource.hh similarity index 100% rename from PPI/CloneSource.hh rename to senf/PPI/CloneSource.hh diff --git a/PPI/CloneSource.test.cc b/senf/PPI/CloneSource.test.cc similarity index 100% rename from PPI/CloneSource.test.cc rename to senf/PPI/CloneSource.test.cc diff --git a/PPI/Connectors.cc b/senf/PPI/Connectors.cc similarity index 100% rename from PPI/Connectors.cc rename to senf/PPI/Connectors.cc diff --git a/PPI/Connectors.cci b/senf/PPI/Connectors.cci similarity index 100% rename from PPI/Connectors.cci rename to senf/PPI/Connectors.cci diff --git a/PPI/Connectors.cti b/senf/PPI/Connectors.cti similarity index 100% rename from PPI/Connectors.cti rename to senf/PPI/Connectors.cti diff --git a/PPI/Connectors.hh b/senf/PPI/Connectors.hh similarity index 100% rename from PPI/Connectors.hh rename to senf/PPI/Connectors.hh diff --git a/PPI/Connectors.ih b/senf/PPI/Connectors.ih similarity index 100% rename from PPI/Connectors.ih rename to senf/PPI/Connectors.ih diff --git a/PPI/Connectors.test.cc b/senf/PPI/Connectors.test.cc similarity index 100% rename from PPI/Connectors.test.cc rename to senf/PPI/Connectors.test.cc diff --git a/PPI/DebugEvent.cci b/senf/PPI/DebugEvent.cci similarity index 100% rename from PPI/DebugEvent.cci rename to senf/PPI/DebugEvent.cci diff --git a/PPI/DebugEvent.hh b/senf/PPI/DebugEvent.hh similarity index 100% rename from PPI/DebugEvent.hh rename to senf/PPI/DebugEvent.hh diff --git a/PPI/DebugEvent.test.cc b/senf/PPI/DebugEvent.test.cc similarity index 100% rename from PPI/DebugEvent.test.cc rename to senf/PPI/DebugEvent.test.cc diff --git a/PPI/DebugModules.cc b/senf/PPI/DebugModules.cc similarity index 100% rename from PPI/DebugModules.cc rename to senf/PPI/DebugModules.cc diff --git a/PPI/DebugModules.cci b/senf/PPI/DebugModules.cci similarity index 100% rename from PPI/DebugModules.cci rename to senf/PPI/DebugModules.cci diff --git a/PPI/DebugModules.cti b/senf/PPI/DebugModules.cti similarity index 100% rename from PPI/DebugModules.cti rename to senf/PPI/DebugModules.cti diff --git a/PPI/DebugModules.hh b/senf/PPI/DebugModules.hh similarity index 100% rename from PPI/DebugModules.hh rename to senf/PPI/DebugModules.hh diff --git a/PPI/DebugModules.test.cc b/senf/PPI/DebugModules.test.cc similarity index 100% rename from PPI/DebugModules.test.cc rename to senf/PPI/DebugModules.test.cc diff --git a/PPI/DiscardSink.cc b/senf/PPI/DiscardSink.cc similarity index 100% rename from PPI/DiscardSink.cc rename to senf/PPI/DiscardSink.cc diff --git a/PPI/DiscardSink.hh b/senf/PPI/DiscardSink.hh similarity index 100% rename from PPI/DiscardSink.hh rename to senf/PPI/DiscardSink.hh diff --git a/PPI/DiscardSink.test.cc b/senf/PPI/DiscardSink.test.cc similarity index 100% rename from PPI/DiscardSink.test.cc rename to senf/PPI/DiscardSink.test.cc diff --git a/PPI/Doxyfile b/senf/PPI/Doxyfile similarity index 82% rename from PPI/Doxyfile rename to senf/PPI/Doxyfile index a328aa4..8de88ab 100644 --- a/PPI/Doxyfile +++ b/senf/PPI/Doxyfile @@ -1,6 +1,6 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = libPPI +PROJECT_NAME = PPI RECURSIVE = No SHOW_DIRECTORIES = Yes INPUT = . detail diff --git a/PPI/Duplicators.cc b/senf/PPI/Duplicators.cc similarity index 100% rename from PPI/Duplicators.cc rename to senf/PPI/Duplicators.cc diff --git a/PPI/Duplicators.cci b/senf/PPI/Duplicators.cci similarity index 100% rename from PPI/Duplicators.cci rename to senf/PPI/Duplicators.cci diff --git a/PPI/Duplicators.hh b/senf/PPI/Duplicators.hh similarity index 100% rename from PPI/Duplicators.hh rename to senf/PPI/Duplicators.hh diff --git a/PPI/Duplicators.test.cc b/senf/PPI/Duplicators.test.cc similarity index 100% rename from PPI/Duplicators.test.cc rename to senf/PPI/Duplicators.test.cc diff --git a/PPI/EventManager.cc b/senf/PPI/EventManager.cc similarity index 100% rename from PPI/EventManager.cc rename to senf/PPI/EventManager.cc diff --git a/PPI/EventManager.cci b/senf/PPI/EventManager.cci similarity index 100% rename from PPI/EventManager.cci rename to senf/PPI/EventManager.cci diff --git a/PPI/EventManager.ct b/senf/PPI/EventManager.ct similarity index 100% rename from PPI/EventManager.ct rename to senf/PPI/EventManager.ct diff --git a/PPI/EventManager.hh b/senf/PPI/EventManager.hh similarity index 100% rename from PPI/EventManager.hh rename to senf/PPI/EventManager.hh diff --git a/PPI/EventManager.test.cc b/senf/PPI/EventManager.test.cc similarity index 100% rename from PPI/EventManager.test.cc rename to senf/PPI/EventManager.test.cc diff --git a/PPI/Events.cc b/senf/PPI/Events.cc similarity index 100% rename from PPI/Events.cc rename to senf/PPI/Events.cc diff --git a/PPI/Events.cci b/senf/PPI/Events.cci similarity index 98% rename from PPI/Events.cci rename to senf/PPI/Events.cci index 3800f20..7a42b28 100644 --- a/PPI/Events.cci +++ b/senf/PPI/Events.cci @@ -24,7 +24,7 @@ \brief Events inline non-template implementation */ // Custom includes -#include <../Utils/senfassert.hh> +#include "../Utils/senfassert.hh" #define prefix_ inline ///////////////////////////////cci.p/////////////////////////////////////// diff --git a/PPI/Events.cti b/senf/PPI/Events.cti similarity index 100% rename from PPI/Events.cti rename to senf/PPI/Events.cti diff --git a/PPI/Events.hh b/senf/PPI/Events.hh similarity index 100% rename from PPI/Events.hh rename to senf/PPI/Events.hh diff --git a/PPI/Events.ih b/senf/PPI/Events.ih similarity index 100% rename from PPI/Events.ih rename to senf/PPI/Events.ih diff --git a/PPI/Events.test.cc b/senf/PPI/Events.test.cc similarity index 100% rename from PPI/Events.test.cc rename to senf/PPI/Events.test.cc diff --git a/PPI/IOEvent.cc b/senf/PPI/IOEvent.cc similarity index 100% rename from PPI/IOEvent.cc rename to senf/PPI/IOEvent.cc diff --git a/PPI/IOEvent.cci b/senf/PPI/IOEvent.cci similarity index 100% rename from PPI/IOEvent.cci rename to senf/PPI/IOEvent.cci diff --git a/PPI/IOEvent.ct b/senf/PPI/IOEvent.ct similarity index 100% rename from PPI/IOEvent.ct rename to senf/PPI/IOEvent.ct diff --git a/PPI/IOEvent.cti b/senf/PPI/IOEvent.cti similarity index 100% rename from PPI/IOEvent.cti rename to senf/PPI/IOEvent.cti diff --git a/PPI/IOEvent.hh b/senf/PPI/IOEvent.hh similarity index 100% rename from PPI/IOEvent.hh rename to senf/PPI/IOEvent.hh diff --git a/PPI/IOEvent.test.cc b/senf/PPI/IOEvent.test.cc similarity index 100% rename from PPI/IOEvent.test.cc rename to senf/PPI/IOEvent.test.cc diff --git a/PPI/IdleEvent.cc b/senf/PPI/IdleEvent.cc similarity index 100% rename from PPI/IdleEvent.cc rename to senf/PPI/IdleEvent.cc diff --git a/PPI/IdleEvent.cci b/senf/PPI/IdleEvent.cci similarity index 100% rename from PPI/IdleEvent.cci rename to senf/PPI/IdleEvent.cci diff --git a/PPI/IdleEvent.hh b/senf/PPI/IdleEvent.hh similarity index 100% rename from PPI/IdleEvent.hh rename to senf/PPI/IdleEvent.hh diff --git a/PPI/IdleEvent.test.cc b/senf/PPI/IdleEvent.test.cc similarity index 100% rename from PPI/IdleEvent.test.cc rename to senf/PPI/IdleEvent.test.cc diff --git a/PPI/IntervalTimer.cc b/senf/PPI/IntervalTimer.cc similarity index 100% rename from PPI/IntervalTimer.cc rename to senf/PPI/IntervalTimer.cc diff --git a/PPI/IntervalTimer.cci b/senf/PPI/IntervalTimer.cci similarity index 100% rename from PPI/IntervalTimer.cci rename to senf/PPI/IntervalTimer.cci diff --git a/PPI/IntervalTimer.hh b/senf/PPI/IntervalTimer.hh similarity index 100% rename from PPI/IntervalTimer.hh rename to senf/PPI/IntervalTimer.hh diff --git a/PPI/IntervalTimer.test.cc b/senf/PPI/IntervalTimer.test.cc similarity index 100% rename from PPI/IntervalTimer.test.cc rename to senf/PPI/IntervalTimer.test.cc diff --git a/PPI/Jack.cci b/senf/PPI/Jack.cci similarity index 100% rename from PPI/Jack.cci rename to senf/PPI/Jack.cci diff --git a/PPI/Jack.cti b/senf/PPI/Jack.cti similarity index 100% rename from PPI/Jack.cti rename to senf/PPI/Jack.cti diff --git a/PPI/Jack.hh b/senf/PPI/Jack.hh similarity index 100% rename from PPI/Jack.hh rename to senf/PPI/Jack.hh diff --git a/PPI/Jack.test.cc b/senf/PPI/Jack.test.cc similarity index 100% rename from PPI/Jack.test.cc rename to senf/PPI/Jack.test.cc diff --git a/PPI/Joins.cc b/senf/PPI/Joins.cc similarity index 100% rename from PPI/Joins.cc rename to senf/PPI/Joins.cc diff --git a/PPI/Joins.cci b/senf/PPI/Joins.cci similarity index 100% rename from PPI/Joins.cci rename to senf/PPI/Joins.cci diff --git a/PPI/Joins.hh b/senf/PPI/Joins.hh similarity index 100% rename from PPI/Joins.hh rename to senf/PPI/Joins.hh diff --git a/PPI/Joins.test.cc b/senf/PPI/Joins.test.cc similarity index 100% rename from PPI/Joins.test.cc rename to senf/PPI/Joins.test.cc diff --git a/PPI/Mainpage.dox b/senf/PPI/Mainpage.dox similarity index 100% rename from PPI/Mainpage.dox rename to senf/PPI/Mainpage.dox diff --git a/PPI/Module.cc b/senf/PPI/Module.cc similarity index 100% rename from PPI/Module.cc rename to senf/PPI/Module.cc diff --git a/PPI/Module.cci b/senf/PPI/Module.cci similarity index 100% rename from PPI/Module.cci rename to senf/PPI/Module.cci diff --git a/PPI/Module.ct b/senf/PPI/Module.ct similarity index 100% rename from PPI/Module.ct rename to senf/PPI/Module.ct diff --git a/PPI/Module.hh b/senf/PPI/Module.hh similarity index 100% rename from PPI/Module.hh rename to senf/PPI/Module.hh diff --git a/PPI/Module.ih b/senf/PPI/Module.ih similarity index 100% rename from PPI/Module.ih rename to senf/PPI/Module.ih diff --git a/PPI/Module.test.cc b/senf/PPI/Module.test.cc similarity index 100% rename from PPI/Module.test.cc rename to senf/PPI/Module.test.cc diff --git a/PPI/ModuleManager.cc b/senf/PPI/ModuleManager.cc similarity index 100% rename from PPI/ModuleManager.cc rename to senf/PPI/ModuleManager.cc diff --git a/PPI/ModuleManager.cci b/senf/PPI/ModuleManager.cci similarity index 100% rename from PPI/ModuleManager.cci rename to senf/PPI/ModuleManager.cci diff --git a/PPI/ModuleManager.hh b/senf/PPI/ModuleManager.hh similarity index 100% rename from PPI/ModuleManager.hh rename to senf/PPI/ModuleManager.hh diff --git a/PPI/ModuleManager.test.cc b/senf/PPI/ModuleManager.test.cc similarity index 100% rename from PPI/ModuleManager.test.cc rename to senf/PPI/ModuleManager.test.cc diff --git a/PPI/MonitorModule.ct b/senf/PPI/MonitorModule.ct similarity index 100% rename from PPI/MonitorModule.ct rename to senf/PPI/MonitorModule.ct diff --git a/PPI/MonitorModule.cti b/senf/PPI/MonitorModule.cti similarity index 100% rename from PPI/MonitorModule.cti rename to senf/PPI/MonitorModule.cti diff --git a/PPI/MonitorModule.hh b/senf/PPI/MonitorModule.hh similarity index 100% rename from PPI/MonitorModule.hh rename to senf/PPI/MonitorModule.hh diff --git a/PPI/MonitorModule.test.cc b/senf/PPI/MonitorModule.test.cc similarity index 100% rename from PPI/MonitorModule.test.cc rename to senf/PPI/MonitorModule.test.cc diff --git a/PPI/MultiConnectorMixin.cti b/senf/PPI/MultiConnectorMixin.cti similarity index 100% rename from PPI/MultiConnectorMixin.cti rename to senf/PPI/MultiConnectorMixin.cti diff --git a/PPI/MultiConnectorMixin.hh b/senf/PPI/MultiConnectorMixin.hh similarity index 100% rename from PPI/MultiConnectorMixin.hh rename to senf/PPI/MultiConnectorMixin.hh diff --git a/PPI/MultiConnectorMixin.ih b/senf/PPI/MultiConnectorMixin.ih similarity index 100% rename from PPI/MultiConnectorMixin.ih rename to senf/PPI/MultiConnectorMixin.ih diff --git a/PPI/MultiConnectorMixin.mpp b/senf/PPI/MultiConnectorMixin.mpp similarity index 100% rename from PPI/MultiConnectorMixin.mpp rename to senf/PPI/MultiConnectorMixin.mpp diff --git a/PPI/MultiConnectorMixin.test.cc b/senf/PPI/MultiConnectorMixin.test.cc similarity index 100% rename from PPI/MultiConnectorMixin.test.cc rename to senf/PPI/MultiConnectorMixin.test.cc diff --git a/PPI/PPI.hh b/senf/PPI/PPI.hh similarity index 100% rename from PPI/PPI.hh rename to senf/PPI/PPI.hh diff --git a/PPI/PassiveQueue.cc b/senf/PPI/PassiveQueue.cc similarity index 100% rename from PPI/PassiveQueue.cc rename to senf/PPI/PassiveQueue.cc diff --git a/PPI/PassiveQueue.cci b/senf/PPI/PassiveQueue.cci similarity index 100% rename from PPI/PassiveQueue.cci rename to senf/PPI/PassiveQueue.cci diff --git a/PPI/PassiveQueue.cti b/senf/PPI/PassiveQueue.cti similarity index 100% rename from PPI/PassiveQueue.cti rename to senf/PPI/PassiveQueue.cti diff --git a/PPI/PassiveQueue.hh b/senf/PPI/PassiveQueue.hh similarity index 100% rename from PPI/PassiveQueue.hh rename to senf/PPI/PassiveQueue.hh diff --git a/PPI/PassiveQueue.test.cc b/senf/PPI/PassiveQueue.test.cc similarity index 100% rename from PPI/PassiveQueue.test.cc rename to senf/PPI/PassiveQueue.test.cc diff --git a/PPI/Queueing.cc b/senf/PPI/Queueing.cc similarity index 100% rename from PPI/Queueing.cc rename to senf/PPI/Queueing.cc diff --git a/PPI/Queueing.cci b/senf/PPI/Queueing.cci similarity index 100% rename from PPI/Queueing.cci rename to senf/PPI/Queueing.cci diff --git a/PPI/Queueing.hh b/senf/PPI/Queueing.hh similarity index 100% rename from PPI/Queueing.hh rename to senf/PPI/Queueing.hh diff --git a/PPI/Queueing.test.cc b/senf/PPI/Queueing.test.cc similarity index 100% rename from PPI/Queueing.test.cc rename to senf/PPI/Queueing.test.cc diff --git a/PPI/RateAnalyzer.cc b/senf/PPI/RateAnalyzer.cc similarity index 100% rename from PPI/RateAnalyzer.cc rename to senf/PPI/RateAnalyzer.cc diff --git a/PPI/RateAnalyzer.hh b/senf/PPI/RateAnalyzer.hh similarity index 100% rename from PPI/RateAnalyzer.hh rename to senf/PPI/RateAnalyzer.hh diff --git a/PPI/RateAnalyzer.test.cc b/senf/PPI/RateAnalyzer.test.cc similarity index 100% rename from PPI/RateAnalyzer.test.cc rename to senf/PPI/RateAnalyzer.test.cc diff --git a/PPI/RateFilter.cc b/senf/PPI/RateFilter.cc similarity index 100% rename from PPI/RateFilter.cc rename to senf/PPI/RateFilter.cc diff --git a/PPI/RateFilter.hh b/senf/PPI/RateFilter.hh similarity index 100% rename from PPI/RateFilter.hh rename to senf/PPI/RateFilter.hh diff --git a/PPI/RateFilter.test.cc b/senf/PPI/RateFilter.test.cc similarity index 100% rename from PPI/RateFilter.test.cc rename to senf/PPI/RateFilter.test.cc diff --git a/PPI/Route.cci b/senf/PPI/Route.cci similarity index 100% rename from PPI/Route.cci rename to senf/PPI/Route.cci diff --git a/PPI/Route.ct b/senf/PPI/Route.ct similarity index 100% rename from PPI/Route.ct rename to senf/PPI/Route.ct diff --git a/PPI/Route.cti b/senf/PPI/Route.cti similarity index 100% rename from PPI/Route.cti rename to senf/PPI/Route.cti diff --git a/PPI/Route.hh b/senf/PPI/Route.hh similarity index 100% rename from PPI/Route.hh rename to senf/PPI/Route.hh diff --git a/PPI/Route.ih b/senf/PPI/Route.ih similarity index 100% rename from PPI/Route.ih rename to senf/PPI/Route.ih diff --git a/PPI/Route.test.cc b/senf/PPI/Route.test.cc similarity index 100% rename from PPI/Route.test.cc rename to senf/PPI/Route.test.cc diff --git a/PPI/SConscript b/senf/PPI/SConscript similarity index 100% rename from PPI/SConscript rename to senf/PPI/SConscript diff --git a/PPI/Setup.cci b/senf/PPI/Setup.cci similarity index 100% rename from PPI/Setup.cci rename to senf/PPI/Setup.cci diff --git a/PPI/Setup.cti b/senf/PPI/Setup.cti similarity index 100% rename from PPI/Setup.cti rename to senf/PPI/Setup.cti diff --git a/PPI/Setup.hh b/senf/PPI/Setup.hh similarity index 100% rename from PPI/Setup.hh rename to senf/PPI/Setup.hh diff --git a/PPI/Setup.test.cc b/senf/PPI/Setup.test.cc similarity index 100% rename from PPI/Setup.test.cc rename to senf/PPI/Setup.test.cc diff --git a/PPI/SocketSink.cc b/senf/PPI/SocketSink.cc similarity index 100% rename from PPI/SocketSink.cc rename to senf/PPI/SocketSink.cc diff --git a/PPI/SocketSink.cci b/senf/PPI/SocketSink.cci similarity index 100% rename from PPI/SocketSink.cci rename to senf/PPI/SocketSink.cci diff --git a/PPI/SocketSink.ct b/senf/PPI/SocketSink.ct similarity index 100% rename from PPI/SocketSink.ct rename to senf/PPI/SocketSink.ct diff --git a/PPI/SocketSink.cti b/senf/PPI/SocketSink.cti similarity index 100% rename from PPI/SocketSink.cti rename to senf/PPI/SocketSink.cti diff --git a/PPI/SocketSink.hh b/senf/PPI/SocketSink.hh similarity index 100% rename from PPI/SocketSink.hh rename to senf/PPI/SocketSink.hh diff --git a/PPI/SocketSink.test.cc b/senf/PPI/SocketSink.test.cc similarity index 100% rename from PPI/SocketSink.test.cc rename to senf/PPI/SocketSink.test.cc diff --git a/PPI/SocketSource.ct b/senf/PPI/SocketSource.ct similarity index 100% rename from PPI/SocketSource.ct rename to senf/PPI/SocketSource.ct diff --git a/PPI/SocketSource.cti b/senf/PPI/SocketSource.cti similarity index 100% rename from PPI/SocketSource.cti rename to senf/PPI/SocketSource.cti diff --git a/PPI/SocketSource.hh b/senf/PPI/SocketSource.hh similarity index 100% rename from PPI/SocketSource.hh rename to senf/PPI/SocketSource.hh diff --git a/PPI/SocketSource.test.cc b/senf/PPI/SocketSource.test.cc similarity index 100% rename from PPI/SocketSource.test.cc rename to senf/PPI/SocketSource.test.cc diff --git a/PPI/ThrottleBarrier.cc b/senf/PPI/ThrottleBarrier.cc similarity index 100% rename from PPI/ThrottleBarrier.cc rename to senf/PPI/ThrottleBarrier.cc diff --git a/PPI/ThrottleBarrier.hh b/senf/PPI/ThrottleBarrier.hh similarity index 100% rename from PPI/ThrottleBarrier.hh rename to senf/PPI/ThrottleBarrier.hh diff --git a/PPI/ThrottleBarrier.test.cc b/senf/PPI/ThrottleBarrier.test.cc similarity index 100% rename from PPI/ThrottleBarrier.test.cc rename to senf/PPI/ThrottleBarrier.test.cc diff --git a/PPI/classes.dia b/senf/PPI/classes.dia similarity index 100% rename from PPI/classes.dia rename to senf/PPI/classes.dia diff --git a/PPI/detail/Callback.cti b/senf/PPI/detail/Callback.cti similarity index 100% rename from PPI/detail/Callback.cti rename to senf/PPI/detail/Callback.cti diff --git a/PPI/detail/Callback.hh b/senf/PPI/detail/Callback.hh similarity index 100% rename from PPI/detail/Callback.hh rename to senf/PPI/detail/Callback.hh diff --git a/PPI/detail/EventBinding.cc b/senf/PPI/detail/EventBinding.cc similarity index 100% rename from PPI/detail/EventBinding.cc rename to senf/PPI/detail/EventBinding.cc diff --git a/PPI/detail/EventBinding.cci b/senf/PPI/detail/EventBinding.cci similarity index 100% rename from PPI/detail/EventBinding.cci rename to senf/PPI/detail/EventBinding.cci diff --git a/PPI/detail/EventBinding.cti b/senf/PPI/detail/EventBinding.cti similarity index 100% rename from PPI/detail/EventBinding.cti rename to senf/PPI/detail/EventBinding.cti diff --git a/PPI/detail/EventBinding.hh b/senf/PPI/detail/EventBinding.hh similarity index 100% rename from PPI/detail/EventBinding.hh rename to senf/PPI/detail/EventBinding.hh diff --git a/PPI/drawmodules.py b/senf/PPI/drawmodules.py similarity index 100% rename from PPI/drawmodules.py rename to senf/PPI/drawmodules.py diff --git a/PPI/main.test.cc b/senf/PPI/main.test.cc similarity index 100% rename from PPI/main.test.cc rename to senf/PPI/main.test.cc diff --git a/PPI/predecl.hh b/senf/PPI/predecl.hh similarity index 100% rename from PPI/predecl.hh rename to senf/PPI/predecl.hh diff --git a/PPI/ratestuffer.dia b/senf/PPI/ratestuffer.dia similarity index 100% rename from PPI/ratestuffer.dia rename to senf/PPI/ratestuffer.dia diff --git a/PPI/scenario.dia b/senf/PPI/scenario.dia similarity index 100% rename from PPI/scenario.dia rename to senf/PPI/scenario.dia diff --git a/include/senf/Packets.hh b/senf/Packets.hh similarity index 100% rename from include/senf/Packets.hh rename to senf/Packets.hh diff --git a/Packets/.dir.el b/senf/Packets/.dir.el similarity index 100% rename from Packets/.dir.el rename to senf/Packets/.dir.el diff --git a/Packets/80211Bundle/Mainpage.dox b/senf/Packets/80211Bundle/Mainpage.dox similarity index 100% rename from Packets/80211Bundle/Mainpage.dox rename to senf/Packets/80211Bundle/Mainpage.dox diff --git a/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc similarity index 100% rename from Packets/80211Bundle/RadiotapPacket.cc rename to senf/Packets/80211Bundle/RadiotapPacket.cc diff --git a/Packets/80211Bundle/RadiotapPacket.hh b/senf/Packets/80211Bundle/RadiotapPacket.hh similarity index 100% rename from Packets/80211Bundle/RadiotapPacket.hh rename to senf/Packets/80211Bundle/RadiotapPacket.hh diff --git a/Packets/80211Bundle/RadiotapPacket.test.cc b/senf/Packets/80211Bundle/RadiotapPacket.test.cc similarity index 100% rename from Packets/80211Bundle/RadiotapPacket.test.cc rename to senf/Packets/80211Bundle/RadiotapPacket.test.cc diff --git a/Packets/80211Bundle/SConscript b/senf/Packets/80211Bundle/SConscript similarity index 81% rename from Packets/80211Bundle/SConscript rename to senf/Packets/80211Bundle/SConscript index ee66d7c..67f430b 100644 --- a/Packets/80211Bundle/SConscript +++ b/senf/Packets/80211Bundle/SConscript @@ -9,9 +9,12 @@ sources, tests, includes = SENFSCons.Glob(env) objects = env.Object(sources) cobject = env.CombinedObject('80211Bundle', objects) +env.Default(cobject) env.Append(ALLOBJECTS = objects) +env.Append(PACKET_BUNDLES = cobject) env.BoostUnitTest('test', tests + cobject) +env.Install('$OBJINSTALLDIR', cobject) env.InstallSubdir('$INCLUDEINSTALLDIR', includes) SConscript(glob.glob("*/SConscript")) diff --git a/Packets/80211Bundle/WLANPacket.cc b/senf/Packets/80211Bundle/WLANPacket.cc similarity index 100% rename from Packets/80211Bundle/WLANPacket.cc rename to senf/Packets/80211Bundle/WLANPacket.cc diff --git a/Packets/80211Bundle/WLANPacket.hh b/senf/Packets/80211Bundle/WLANPacket.hh similarity index 100% rename from Packets/80211Bundle/WLANPacket.hh rename to senf/Packets/80211Bundle/WLANPacket.hh diff --git a/Packets/80211Bundle/WLANPacket.test.cc b/senf/Packets/80211Bundle/WLANPacket.test.cc similarity index 100% rename from Packets/80211Bundle/WLANPacket.test.cc rename to senf/Packets/80211Bundle/WLANPacket.test.cc diff --git a/Packets/80211Bundle/main.test.cc b/senf/Packets/80211Bundle/main.test.cc similarity index 100% rename from Packets/80211Bundle/main.test.cc rename to senf/Packets/80211Bundle/main.test.cc diff --git a/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc similarity index 100% rename from Packets/80221Bundle/MIHPacket.cc rename to senf/Packets/80221Bundle/MIHPacket.cc diff --git a/Packets/80221Bundle/MIHPacket.cci b/senf/Packets/80221Bundle/MIHPacket.cci similarity index 100% rename from Packets/80221Bundle/MIHPacket.cci rename to senf/Packets/80221Bundle/MIHPacket.cci diff --git a/Packets/80221Bundle/MIHPacket.hh b/senf/Packets/80221Bundle/MIHPacket.hh similarity index 100% rename from Packets/80221Bundle/MIHPacket.hh rename to senf/Packets/80221Bundle/MIHPacket.hh diff --git a/Packets/80221Bundle/MIHPacket.test.cc b/senf/Packets/80221Bundle/MIHPacket.test.cc similarity index 100% rename from Packets/80221Bundle/MIHPacket.test.cc rename to senf/Packets/80221Bundle/MIHPacket.test.cc diff --git a/Packets/80221Bundle/Mainpage.dox b/senf/Packets/80221Bundle/Mainpage.dox similarity index 100% rename from Packets/80221Bundle/Mainpage.dox rename to senf/Packets/80221Bundle/Mainpage.dox diff --git a/Packets/80221Bundle/SConscript b/senf/Packets/80221Bundle/SConscript similarity index 63% rename from Packets/80221Bundle/SConscript rename to senf/Packets/80221Bundle/SConscript index 121b491..f58e4ec 100644 --- a/Packets/80221Bundle/SConscript +++ b/senf/Packets/80221Bundle/SConscript @@ -8,10 +8,13 @@ import SENFSCons, glob sources, tests, includes = SENFSCons.Glob(env) objects = env.Object(sources) -env.Install('$OBJINSTALLDIR', env.Default( env.CombinedObject('80221Bundle', objects) )) +cobject = env.CombinedObject('80221Bundle', objects) +env.Default(cobject) env.Append(ALLOBJECTS = objects) -env.BoostUnitTest('test', tests + ['80221Bundle.o']) +env.Append(PACKET_BUNDLES = cobject) +env.BoostUnitTest('test', tests + cobject) +env.Install('$OBJINSTALLDIR', cobject) env.InstallSubdir('$INCLUDEINSTALLDIR', includes) SConscript(glob.glob("*/SConscript")) diff --git a/Packets/80221Bundle/TLV.dia b/senf/Packets/80221Bundle/TLV.dia similarity index 100% rename from Packets/80221Bundle/TLV.dia rename to senf/Packets/80221Bundle/TLV.dia diff --git a/Packets/80221Bundle/TLVPacket.cc b/senf/Packets/80221Bundle/TLVPacket.cc similarity index 100% rename from Packets/80221Bundle/TLVPacket.cc rename to senf/Packets/80221Bundle/TLVPacket.cc diff --git a/Packets/80221Bundle/TLVPacket.cci b/senf/Packets/80221Bundle/TLVPacket.cci similarity index 100% rename from Packets/80221Bundle/TLVPacket.cci rename to senf/Packets/80221Bundle/TLVPacket.cci diff --git a/Packets/80221Bundle/TLVPacket.ct b/senf/Packets/80221Bundle/TLVPacket.ct similarity index 100% rename from Packets/80221Bundle/TLVPacket.ct rename to senf/Packets/80221Bundle/TLVPacket.ct diff --git a/Packets/80221Bundle/TLVPacket.hh b/senf/Packets/80221Bundle/TLVPacket.hh similarity index 100% rename from Packets/80221Bundle/TLVPacket.hh rename to senf/Packets/80221Bundle/TLVPacket.hh diff --git a/Packets/80221Bundle/TLVPacket.test.cc b/senf/Packets/80221Bundle/TLVPacket.test.cc similarity index 100% rename from Packets/80221Bundle/TLVPacket.test.cc rename to senf/Packets/80221Bundle/TLVPacket.test.cc diff --git a/Packets/80221Bundle/main.test.cc b/senf/Packets/80221Bundle/main.test.cc similarity index 100% rename from Packets/80221Bundle/main.test.cc rename to senf/Packets/80221Bundle/main.test.cc diff --git a/Packets/ArrayParser.ct b/senf/Packets/ArrayParser.ct similarity index 100% rename from Packets/ArrayParser.ct rename to senf/Packets/ArrayParser.ct diff --git a/Packets/ArrayParser.cti b/senf/Packets/ArrayParser.cti similarity index 100% rename from Packets/ArrayParser.cti rename to senf/Packets/ArrayParser.cti diff --git a/Packets/ArrayParser.hh b/senf/Packets/ArrayParser.hh similarity index 100% rename from Packets/ArrayParser.hh rename to senf/Packets/ArrayParser.hh diff --git a/Packets/ArrayParser.ih b/senf/Packets/ArrayParser.ih similarity index 100% rename from Packets/ArrayParser.ih rename to senf/Packets/ArrayParser.ih diff --git a/Packets/ArrayParser.test.cc b/senf/Packets/ArrayParser.test.cc similarity index 100% rename from Packets/ArrayParser.test.cc rename to senf/Packets/ArrayParser.test.cc diff --git a/Packets/AuxParser.cci b/senf/Packets/AuxParser.cci similarity index 100% rename from Packets/AuxParser.cci rename to senf/Packets/AuxParser.cci diff --git a/Packets/AuxParser.cti b/senf/Packets/AuxParser.cti similarity index 100% rename from Packets/AuxParser.cti rename to senf/Packets/AuxParser.cti diff --git a/Packets/AuxParser.hh b/senf/Packets/AuxParser.hh similarity index 100% rename from Packets/AuxParser.hh rename to senf/Packets/AuxParser.hh diff --git a/Packets/AuxParser.test.cc b/senf/Packets/AuxParser.test.cc similarity index 100% rename from Packets/AuxParser.test.cc rename to senf/Packets/AuxParser.test.cc diff --git a/Packets/DataPacket.cc b/senf/Packets/DataPacket.cc similarity index 100% rename from Packets/DataPacket.cc rename to senf/Packets/DataPacket.cc diff --git a/Packets/DataPacket.hh b/senf/Packets/DataPacket.hh similarity index 100% rename from Packets/DataPacket.hh rename to senf/Packets/DataPacket.hh diff --git a/Packets/DefaultBundle/EthernetPacket.cc b/senf/Packets/DefaultBundle/EthernetPacket.cc similarity index 100% rename from Packets/DefaultBundle/EthernetPacket.cc rename to senf/Packets/DefaultBundle/EthernetPacket.cc diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/senf/Packets/DefaultBundle/EthernetPacket.hh similarity index 100% rename from Packets/DefaultBundle/EthernetPacket.hh rename to senf/Packets/DefaultBundle/EthernetPacket.hh diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/senf/Packets/DefaultBundle/EthernetPacket.test.cc similarity index 100% rename from Packets/DefaultBundle/EthernetPacket.test.cc rename to senf/Packets/DefaultBundle/EthernetPacket.test.cc diff --git a/Packets/DefaultBundle/ICMPv6Packet.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.cc similarity index 100% rename from Packets/DefaultBundle/ICMPv6Packet.cc rename to senf/Packets/DefaultBundle/ICMPv6Packet.cc diff --git a/Packets/DefaultBundle/ICMPv6Packet.hh b/senf/Packets/DefaultBundle/ICMPv6Packet.hh similarity index 100% rename from Packets/DefaultBundle/ICMPv6Packet.hh rename to senf/Packets/DefaultBundle/ICMPv6Packet.hh diff --git a/Packets/DefaultBundle/ICMPv6Packet.test.cc b/senf/Packets/DefaultBundle/ICMPv6Packet.test.cc similarity index 100% rename from Packets/DefaultBundle/ICMPv6Packet.test.cc rename to senf/Packets/DefaultBundle/ICMPv6Packet.test.cc diff --git a/Packets/DefaultBundle/ICMPv6TypePacket.cc b/senf/Packets/DefaultBundle/ICMPv6TypePacket.cc similarity index 100% rename from Packets/DefaultBundle/ICMPv6TypePacket.cc rename to senf/Packets/DefaultBundle/ICMPv6TypePacket.cc diff --git a/Packets/DefaultBundle/ICMPv6TypePacket.hh b/senf/Packets/DefaultBundle/ICMPv6TypePacket.hh similarity index 100% rename from Packets/DefaultBundle/ICMPv6TypePacket.hh rename to senf/Packets/DefaultBundle/ICMPv6TypePacket.hh diff --git a/Packets/DefaultBundle/IPv4Packet.cc b/senf/Packets/DefaultBundle/IPv4Packet.cc similarity index 100% rename from Packets/DefaultBundle/IPv4Packet.cc rename to senf/Packets/DefaultBundle/IPv4Packet.cc diff --git a/Packets/DefaultBundle/IPv4Packet.hh b/senf/Packets/DefaultBundle/IPv4Packet.hh similarity index 100% rename from Packets/DefaultBundle/IPv4Packet.hh rename to senf/Packets/DefaultBundle/IPv4Packet.hh diff --git a/Packets/DefaultBundle/IPv4Packet.test.cc b/senf/Packets/DefaultBundle/IPv4Packet.test.cc similarity index 100% rename from Packets/DefaultBundle/IPv4Packet.test.cc rename to senf/Packets/DefaultBundle/IPv4Packet.test.cc diff --git a/Packets/DefaultBundle/IPv6Extensions.cc b/senf/Packets/DefaultBundle/IPv6Extensions.cc similarity index 100% rename from Packets/DefaultBundle/IPv6Extensions.cc rename to senf/Packets/DefaultBundle/IPv6Extensions.cc diff --git a/Packets/DefaultBundle/IPv6Extensions.hh b/senf/Packets/DefaultBundle/IPv6Extensions.hh similarity index 100% rename from Packets/DefaultBundle/IPv6Extensions.hh rename to senf/Packets/DefaultBundle/IPv6Extensions.hh diff --git a/Packets/DefaultBundle/IPv6Extensions.test.cc b/senf/Packets/DefaultBundle/IPv6Extensions.test.cc similarity index 100% rename from Packets/DefaultBundle/IPv6Extensions.test.cc rename to senf/Packets/DefaultBundle/IPv6Extensions.test.cc diff --git a/Packets/DefaultBundle/IPv6Packet.cc b/senf/Packets/DefaultBundle/IPv6Packet.cc similarity index 100% rename from Packets/DefaultBundle/IPv6Packet.cc rename to senf/Packets/DefaultBundle/IPv6Packet.cc diff --git a/Packets/DefaultBundle/IPv6Packet.hh b/senf/Packets/DefaultBundle/IPv6Packet.hh similarity index 100% rename from Packets/DefaultBundle/IPv6Packet.hh rename to senf/Packets/DefaultBundle/IPv6Packet.hh diff --git a/Packets/DefaultBundle/IPv6Packet.test.cc b/senf/Packets/DefaultBundle/IPv6Packet.test.cc similarity index 100% rename from Packets/DefaultBundle/IPv6Packet.test.cc rename to senf/Packets/DefaultBundle/IPv6Packet.test.cc diff --git a/Packets/DefaultBundle/LlcSnapPacket.cc b/senf/Packets/DefaultBundle/LlcSnapPacket.cc similarity index 100% rename from Packets/DefaultBundle/LlcSnapPacket.cc rename to senf/Packets/DefaultBundle/LlcSnapPacket.cc diff --git a/Packets/DefaultBundle/LlcSnapPacket.hh b/senf/Packets/DefaultBundle/LlcSnapPacket.hh similarity index 100% rename from Packets/DefaultBundle/LlcSnapPacket.hh rename to senf/Packets/DefaultBundle/LlcSnapPacket.hh diff --git a/Packets/DefaultBundle/LlcSnapPacket.test.cc b/senf/Packets/DefaultBundle/LlcSnapPacket.test.cc similarity index 100% rename from Packets/DefaultBundle/LlcSnapPacket.test.cc rename to senf/Packets/DefaultBundle/LlcSnapPacket.test.cc diff --git a/Packets/DefaultBundle/Mainpage.dox b/senf/Packets/DefaultBundle/Mainpage.dox similarity index 100% rename from Packets/DefaultBundle/Mainpage.dox rename to senf/Packets/DefaultBundle/Mainpage.dox diff --git a/Packets/DefaultBundle/Mldv2Packet.test.cc b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc similarity index 100% rename from Packets/DefaultBundle/Mldv2Packet.test.cc rename to senf/Packets/DefaultBundle/Mldv2Packet.test.cc diff --git a/Packets/DefaultBundle/RTPPacket.cc b/senf/Packets/DefaultBundle/RTPPacket.cc similarity index 100% rename from Packets/DefaultBundle/RTPPacket.cc rename to senf/Packets/DefaultBundle/RTPPacket.cc diff --git a/Packets/DefaultBundle/RTPPacket.hh b/senf/Packets/DefaultBundle/RTPPacket.hh similarity index 100% rename from Packets/DefaultBundle/RTPPacket.hh rename to senf/Packets/DefaultBundle/RTPPacket.hh diff --git a/Packets/DefaultBundle/RTPPacket.test.cc b/senf/Packets/DefaultBundle/RTPPacket.test.cc similarity index 100% rename from Packets/DefaultBundle/RTPPacket.test.cc rename to senf/Packets/DefaultBundle/RTPPacket.test.cc diff --git a/Packets/DefaultBundle/SConscript b/senf/Packets/DefaultBundle/SConscript similarity index 81% rename from Packets/DefaultBundle/SConscript rename to senf/Packets/DefaultBundle/SConscript index 037cafc..ac477bd 100644 --- a/Packets/DefaultBundle/SConscript +++ b/senf/Packets/DefaultBundle/SConscript @@ -9,9 +9,12 @@ sources, tests, includes = SENFSCons.Glob(env) objects = env.Object(sources) cobject = env.CombinedObject('DefaultBundle', objects) +env.Default(cobject) env.Append(ALLOBJECTS = objects) +env.Append(PACKET_BUNDLES = cobject) env.BoostUnitTest('test', tests + cobject) +env.Install('$OBJINSTALLDIR', cobject) env.InstallSubdir('$INCLUDEINSTALLDIR', includes) SConscript(glob.glob("*/SConscript")) diff --git a/Packets/DefaultBundle/TCPPacket.cc b/senf/Packets/DefaultBundle/TCPPacket.cc similarity index 100% rename from Packets/DefaultBundle/TCPPacket.cc rename to senf/Packets/DefaultBundle/TCPPacket.cc diff --git a/Packets/DefaultBundle/TCPPacket.hh b/senf/Packets/DefaultBundle/TCPPacket.hh similarity index 100% rename from Packets/DefaultBundle/TCPPacket.hh rename to senf/Packets/DefaultBundle/TCPPacket.hh diff --git a/Packets/DefaultBundle/TCPPacket.test.cc b/senf/Packets/DefaultBundle/TCPPacket.test.cc similarity index 100% rename from Packets/DefaultBundle/TCPPacket.test.cc rename to senf/Packets/DefaultBundle/TCPPacket.test.cc diff --git a/Packets/DefaultBundle/UDPPacket.cc b/senf/Packets/DefaultBundle/UDPPacket.cc similarity index 100% rename from Packets/DefaultBundle/UDPPacket.cc rename to senf/Packets/DefaultBundle/UDPPacket.cc diff --git a/Packets/DefaultBundle/UDPPacket.hh b/senf/Packets/DefaultBundle/UDPPacket.hh similarity index 100% rename from Packets/DefaultBundle/UDPPacket.hh rename to senf/Packets/DefaultBundle/UDPPacket.hh diff --git a/Packets/DefaultBundle/UDPPacket.test.cc b/senf/Packets/DefaultBundle/UDPPacket.test.cc similarity index 100% rename from Packets/DefaultBundle/UDPPacket.test.cc rename to senf/Packets/DefaultBundle/UDPPacket.test.cc diff --git a/Packets/DefaultBundle/extra_tests/PacketLink.test.cc b/senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc similarity index 100% rename from Packets/DefaultBundle/extra_tests/PacketLink.test.cc rename to senf/Packets/DefaultBundle/extra_tests/PacketLink.test.cc diff --git a/Packets/DefaultBundle/extra_tests/SConscript b/senf/Packets/DefaultBundle/extra_tests/SConscript similarity index 100% rename from Packets/DefaultBundle/extra_tests/SConscript rename to senf/Packets/DefaultBundle/extra_tests/SConscript diff --git a/Socket/Protocols/INet/main.test.cc b/senf/Packets/DefaultBundle/extra_tests/main.test.cc similarity index 100% copy from Socket/Protocols/INet/main.test.cc copy to senf/Packets/DefaultBundle/extra_tests/main.test.cc diff --git a/Packets/DefaultBundle/main.test.cc b/senf/Packets/DefaultBundle/main.test.cc similarity index 100% rename from Packets/DefaultBundle/main.test.cc rename to senf/Packets/DefaultBundle/main.test.cc diff --git a/Packets/Doxyfile b/senf/Packets/Doxyfile similarity index 80% rename from Packets/Doxyfile rename to senf/Packets/Doxyfile index 49a267d..6ebee75 100644 --- a/Packets/Doxyfile +++ b/senf/Packets/Doxyfile @@ -1,6 +1,6 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = libPackets +PROJECT_NAME = Packets INPUT = . RECURSIVE = YES EXAMPLE_PATH = . DefaultBundle diff --git a/Packets/IntParser.hh b/senf/Packets/IntParser.hh similarity index 100% rename from Packets/IntParser.hh rename to senf/Packets/IntParser.hh diff --git a/Packets/IntParser.ih b/senf/Packets/IntParser.ih similarity index 100% rename from Packets/IntParser.ih rename to senf/Packets/IntParser.ih diff --git a/Packets/IntParser.test.cc b/senf/Packets/IntParser.test.cc similarity index 100% rename from Packets/IntParser.test.cc rename to senf/Packets/IntParser.test.cc diff --git a/Packets/ListBParser.cti b/senf/Packets/ListBParser.cti similarity index 100% rename from Packets/ListBParser.cti rename to senf/Packets/ListBParser.cti diff --git a/Packets/ListBParser.hh b/senf/Packets/ListBParser.hh similarity index 100% rename from Packets/ListBParser.hh rename to senf/Packets/ListBParser.hh diff --git a/Packets/ListBParser.ih b/senf/Packets/ListBParser.ih similarity index 100% rename from Packets/ListBParser.ih rename to senf/Packets/ListBParser.ih diff --git a/Packets/ListBParser.test.cc b/senf/Packets/ListBParser.test.cc similarity index 100% rename from Packets/ListBParser.test.cc rename to senf/Packets/ListBParser.test.cc diff --git a/Packets/ListNParser.ct b/senf/Packets/ListNParser.ct similarity index 100% rename from Packets/ListNParser.ct rename to senf/Packets/ListNParser.ct diff --git a/Packets/ListNParser.cti b/senf/Packets/ListNParser.cti similarity index 100% rename from Packets/ListNParser.cti rename to senf/Packets/ListNParser.cti diff --git a/Packets/ListNParser.hh b/senf/Packets/ListNParser.hh similarity index 100% rename from Packets/ListNParser.hh rename to senf/Packets/ListNParser.hh diff --git a/Packets/ListNParser.ih b/senf/Packets/ListNParser.ih similarity index 100% rename from Packets/ListNParser.ih rename to senf/Packets/ListNParser.ih diff --git a/Packets/ListNParser.test.cc b/senf/Packets/ListNParser.test.cc similarity index 100% rename from Packets/ListNParser.test.cc rename to senf/Packets/ListNParser.test.cc diff --git a/Packets/ListParser.ct b/senf/Packets/ListParser.ct similarity index 100% rename from Packets/ListParser.ct rename to senf/Packets/ListParser.ct diff --git a/Packets/ListParser.cti b/senf/Packets/ListParser.cti similarity index 100% rename from Packets/ListParser.cti rename to senf/Packets/ListParser.cti diff --git a/Packets/ListParser.dox b/senf/Packets/ListParser.dox similarity index 100% rename from Packets/ListParser.dox rename to senf/Packets/ListParser.dox diff --git a/Packets/ListParser.hh b/senf/Packets/ListParser.hh similarity index 100% rename from Packets/ListParser.hh rename to senf/Packets/ListParser.hh diff --git a/Packets/ListParser.ih b/senf/Packets/ListParser.ih similarity index 100% rename from Packets/ListParser.ih rename to senf/Packets/ListParser.ih diff --git a/Packets/ListParser.test.cc b/senf/Packets/ListParser.test.cc similarity index 100% rename from Packets/ListParser.test.cc rename to senf/Packets/ListParser.test.cc diff --git a/Packets/MPEGDVBBundle/DTCPPacket.cc b/senf/Packets/MPEGDVBBundle/DTCPPacket.cc similarity index 100% rename from Packets/MPEGDVBBundle/DTCPPacket.cc rename to senf/Packets/MPEGDVBBundle/DTCPPacket.cc diff --git a/Packets/MPEGDVBBundle/DTCPPacket.hh b/senf/Packets/MPEGDVBBundle/DTCPPacket.hh similarity index 100% rename from Packets/MPEGDVBBundle/DTCPPacket.hh rename to senf/Packets/MPEGDVBBundle/DTCPPacket.hh diff --git a/Packets/MPEGDVBBundle/DTCPPacket.test.cc b/senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc similarity index 100% rename from Packets/MPEGDVBBundle/DTCPPacket.test.cc rename to senf/Packets/MPEGDVBBundle/DTCPPacket.test.cc diff --git a/Packets/MPEGDVBBundle/GREPacket.cc b/senf/Packets/MPEGDVBBundle/GREPacket.cc similarity index 100% rename from Packets/MPEGDVBBundle/GREPacket.cc rename to senf/Packets/MPEGDVBBundle/GREPacket.cc diff --git a/Packets/MPEGDVBBundle/GREPacket.hh b/senf/Packets/MPEGDVBBundle/GREPacket.hh similarity index 100% rename from Packets/MPEGDVBBundle/GREPacket.hh rename to senf/Packets/MPEGDVBBundle/GREPacket.hh diff --git a/Packets/MPEGDVBBundle/GREPacket.test.cc b/senf/Packets/MPEGDVBBundle/GREPacket.test.cc similarity index 100% rename from Packets/MPEGDVBBundle/GREPacket.test.cc rename to senf/Packets/MPEGDVBBundle/GREPacket.test.cc diff --git a/Packets/MPEGDVBBundle/MPEGDVBBundle.dox b/senf/Packets/MPEGDVBBundle/MPEGDVBBundle.dox similarity index 100% rename from Packets/MPEGDVBBundle/MPEGDVBBundle.dox rename to senf/Packets/MPEGDVBBundle/MPEGDVBBundle.dox diff --git a/Packets/MPEGDVBBundle/MPESection.cc b/senf/Packets/MPEGDVBBundle/MPESection.cc similarity index 100% rename from Packets/MPEGDVBBundle/MPESection.cc rename to senf/Packets/MPEGDVBBundle/MPESection.cc diff --git a/Packets/MPEGDVBBundle/MPESection.hh b/senf/Packets/MPEGDVBBundle/MPESection.hh similarity index 100% rename from Packets/MPEGDVBBundle/MPESection.hh rename to senf/Packets/MPEGDVBBundle/MPESection.hh diff --git a/Packets/MPEGDVBBundle/MPESection.test.cc b/senf/Packets/MPEGDVBBundle/MPESection.test.cc similarity index 100% rename from Packets/MPEGDVBBundle/MPESection.test.cc rename to senf/Packets/MPEGDVBBundle/MPESection.test.cc diff --git a/Packets/MPEGDVBBundle/SConscript b/senf/Packets/MPEGDVBBundle/SConscript similarity index 80% rename from Packets/MPEGDVBBundle/SConscript rename to senf/Packets/MPEGDVBBundle/SConscript index f9359ac..dc1151d 100644 --- a/Packets/MPEGDVBBundle/SConscript +++ b/senf/Packets/MPEGDVBBundle/SConscript @@ -9,7 +9,10 @@ sources, tests, includes = SENFSCons.Glob(env) objects = env.Object(sources) cobject = env.CombinedObject('MPEGDVBBundle', objects) +env.Default(cobject) env.Append(ALLOBJECTS = objects) +env.Append(PACKET_BUNDLES = cobject) env.BoostUnitTest('test', tests + cobject) +env.Install('$OBJINSTALLDIR', cobject) env.InstallSubdir('$INCLUDEINSTALLDIR', includes) diff --git a/Packets/MPEGDVBBundle/SNDUPacket.cc b/senf/Packets/MPEGDVBBundle/SNDUPacket.cc similarity index 100% rename from Packets/MPEGDVBBundle/SNDUPacket.cc rename to senf/Packets/MPEGDVBBundle/SNDUPacket.cc diff --git a/Packets/MPEGDVBBundle/SNDUPacket.hh b/senf/Packets/MPEGDVBBundle/SNDUPacket.hh similarity index 100% rename from Packets/MPEGDVBBundle/SNDUPacket.hh rename to senf/Packets/MPEGDVBBundle/SNDUPacket.hh diff --git a/Packets/MPEGDVBBundle/TransportPacket.cc b/senf/Packets/MPEGDVBBundle/TransportPacket.cc similarity index 100% rename from Packets/MPEGDVBBundle/TransportPacket.cc rename to senf/Packets/MPEGDVBBundle/TransportPacket.cc diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/senf/Packets/MPEGDVBBundle/TransportPacket.hh similarity index 100% rename from Packets/MPEGDVBBundle/TransportPacket.hh rename to senf/Packets/MPEGDVBBundle/TransportPacket.hh diff --git a/Packets/MPEGDVBBundle/TransportPacket.test.cc b/senf/Packets/MPEGDVBBundle/TransportPacket.test.cc similarity index 100% rename from Packets/MPEGDVBBundle/TransportPacket.test.cc rename to senf/Packets/MPEGDVBBundle/TransportPacket.test.cc diff --git a/Packets/MPEGDVBBundle/main.test.cc b/senf/Packets/MPEGDVBBundle/main.test.cc similarity index 100% rename from Packets/MPEGDVBBundle/main.test.cc rename to senf/Packets/MPEGDVBBundle/main.test.cc diff --git a/Packets/Mainpage.dox b/senf/Packets/Mainpage.dox similarity index 100% rename from Packets/Mainpage.dox rename to senf/Packets/Mainpage.dox diff --git a/Packets/Packet.cc b/senf/Packets/Packet.cc similarity index 100% rename from Packets/Packet.cc rename to senf/Packets/Packet.cc diff --git a/Packets/Packet.cci b/senf/Packets/Packet.cci similarity index 100% rename from Packets/Packet.cci rename to senf/Packets/Packet.cci diff --git a/Packets/Packet.ct b/senf/Packets/Packet.ct similarity index 100% rename from Packets/Packet.ct rename to senf/Packets/Packet.ct diff --git a/Packets/Packet.cti b/senf/Packets/Packet.cti similarity index 100% rename from Packets/Packet.cti rename to senf/Packets/Packet.cti diff --git a/Packets/Packet.hh b/senf/Packets/Packet.hh similarity index 100% rename from Packets/Packet.hh rename to senf/Packets/Packet.hh diff --git a/Packets/Packet.test.cc b/senf/Packets/Packet.test.cc similarity index 100% rename from Packets/Packet.test.cc rename to senf/Packets/Packet.test.cc diff --git a/Packets/PacketData.cc b/senf/Packets/PacketData.cc similarity index 100% rename from Packets/PacketData.cc rename to senf/Packets/PacketData.cc diff --git a/Packets/PacketData.cci b/senf/Packets/PacketData.cci similarity index 100% rename from Packets/PacketData.cci rename to senf/Packets/PacketData.cci diff --git a/Packets/PacketData.cti b/senf/Packets/PacketData.cti similarity index 100% rename from Packets/PacketData.cti rename to senf/Packets/PacketData.cti diff --git a/Packets/PacketData.hh b/senf/Packets/PacketData.hh similarity index 100% rename from Packets/PacketData.hh rename to senf/Packets/PacketData.hh diff --git a/Packets/PacketData.test.cc b/senf/Packets/PacketData.test.cc similarity index 100% rename from Packets/PacketData.test.cc rename to senf/Packets/PacketData.test.cc diff --git a/Packets/PacketImpl.cc b/senf/Packets/PacketImpl.cc similarity index 100% rename from Packets/PacketImpl.cc rename to senf/Packets/PacketImpl.cc diff --git a/Packets/PacketImpl.cci b/senf/Packets/PacketImpl.cci similarity index 100% rename from Packets/PacketImpl.cci rename to senf/Packets/PacketImpl.cci diff --git a/Packets/PacketImpl.cti b/senf/Packets/PacketImpl.cti similarity index 100% rename from Packets/PacketImpl.cti rename to senf/Packets/PacketImpl.cti diff --git a/Packets/PacketImpl.hh b/senf/Packets/PacketImpl.hh similarity index 100% rename from Packets/PacketImpl.hh rename to senf/Packets/PacketImpl.hh diff --git a/Packets/PacketImpl.test.cc b/senf/Packets/PacketImpl.test.cc similarity index 100% rename from Packets/PacketImpl.test.cc rename to senf/Packets/PacketImpl.test.cc diff --git a/Packets/PacketInterpreter.cc b/senf/Packets/PacketInterpreter.cc similarity index 100% rename from Packets/PacketInterpreter.cc rename to senf/Packets/PacketInterpreter.cc diff --git a/Packets/PacketInterpreter.cci b/senf/Packets/PacketInterpreter.cci similarity index 100% rename from Packets/PacketInterpreter.cci rename to senf/Packets/PacketInterpreter.cci diff --git a/Packets/PacketInterpreter.ct b/senf/Packets/PacketInterpreter.ct similarity index 100% rename from Packets/PacketInterpreter.ct rename to senf/Packets/PacketInterpreter.ct diff --git a/Packets/PacketInterpreter.cti b/senf/Packets/PacketInterpreter.cti similarity index 100% rename from Packets/PacketInterpreter.cti rename to senf/Packets/PacketInterpreter.cti diff --git a/Packets/PacketInterpreter.hh b/senf/Packets/PacketInterpreter.hh similarity index 100% rename from Packets/PacketInterpreter.hh rename to senf/Packets/PacketInterpreter.hh diff --git a/Packets/PacketInterpreter.test.cc b/senf/Packets/PacketInterpreter.test.cc similarity index 100% rename from Packets/PacketInterpreter.test.cc rename to senf/Packets/PacketInterpreter.test.cc diff --git a/Packets/PacketParser.cc b/senf/Packets/PacketParser.cc similarity index 100% rename from Packets/PacketParser.cc rename to senf/Packets/PacketParser.cc diff --git a/Packets/PacketParser.cci b/senf/Packets/PacketParser.cci similarity index 100% rename from Packets/PacketParser.cci rename to senf/Packets/PacketParser.cci diff --git a/Packets/PacketParser.ct b/senf/Packets/PacketParser.ct similarity index 100% rename from Packets/PacketParser.ct rename to senf/Packets/PacketParser.ct diff --git a/Packets/PacketParser.cti b/senf/Packets/PacketParser.cti similarity index 100% rename from Packets/PacketParser.cti rename to senf/Packets/PacketParser.cti diff --git a/Packets/PacketParser.hh b/senf/Packets/PacketParser.hh similarity index 100% rename from Packets/PacketParser.hh rename to senf/Packets/PacketParser.hh diff --git a/Packets/PacketParser.ih b/senf/Packets/PacketParser.ih similarity index 100% rename from Packets/PacketParser.ih rename to senf/Packets/PacketParser.ih diff --git a/Packets/PacketParser.test.cc b/senf/Packets/PacketParser.test.cc similarity index 100% rename from Packets/PacketParser.test.cc rename to senf/Packets/PacketParser.test.cc diff --git a/Packets/PacketRegistry.cc b/senf/Packets/PacketRegistry.cc similarity index 100% rename from Packets/PacketRegistry.cc rename to senf/Packets/PacketRegistry.cc diff --git a/Packets/PacketRegistry.cci b/senf/Packets/PacketRegistry.cci similarity index 100% rename from Packets/PacketRegistry.cci rename to senf/Packets/PacketRegistry.cci diff --git a/Packets/PacketRegistry.ct b/senf/Packets/PacketRegistry.ct similarity index 100% rename from Packets/PacketRegistry.ct rename to senf/Packets/PacketRegistry.ct diff --git a/Packets/PacketRegistry.cti b/senf/Packets/PacketRegistry.cti similarity index 100% rename from Packets/PacketRegistry.cti rename to senf/Packets/PacketRegistry.cti diff --git a/Packets/PacketRegistry.hh b/senf/Packets/PacketRegistry.hh similarity index 100% rename from Packets/PacketRegistry.hh rename to senf/Packets/PacketRegistry.hh diff --git a/Packets/PacketRegistry.ih b/senf/Packets/PacketRegistry.ih similarity index 100% rename from Packets/PacketRegistry.ih rename to senf/Packets/PacketRegistry.ih diff --git a/Packets/PacketRegistry.test.cc b/senf/Packets/PacketRegistry.test.cc similarity index 100% rename from Packets/PacketRegistry.test.cc rename to senf/Packets/PacketRegistry.test.cc diff --git a/Packets/PacketType.cci b/senf/Packets/PacketType.cci similarity index 100% rename from Packets/PacketType.cci rename to senf/Packets/PacketType.cci diff --git a/Packets/PacketType.ct b/senf/Packets/PacketType.ct similarity index 100% rename from Packets/PacketType.ct rename to senf/Packets/PacketType.ct diff --git a/Packets/PacketType.cti b/senf/Packets/PacketType.cti similarity index 100% rename from Packets/PacketType.cti rename to senf/Packets/PacketType.cti diff --git a/Packets/PacketType.hh b/senf/Packets/PacketType.hh similarity index 100% rename from Packets/PacketType.hh rename to senf/Packets/PacketType.hh diff --git a/Packets/PacketTypes.hh b/senf/Packets/PacketTypes.hh similarity index 100% rename from Packets/PacketTypes.hh rename to senf/Packets/PacketTypes.hh diff --git a/Packets/Packets.hh b/senf/Packets/Packets.hh similarity index 100% rename from Packets/Packets.hh rename to senf/Packets/Packets.hh diff --git a/Packets/ParseHelpers.dox b/senf/Packets/ParseHelpers.dox similarity index 100% rename from Packets/ParseHelpers.dox rename to senf/Packets/ParseHelpers.dox diff --git a/Packets/ParseHelpers.hh b/senf/Packets/ParseHelpers.hh similarity index 100% rename from Packets/ParseHelpers.hh rename to senf/Packets/ParseHelpers.hh diff --git a/Packets/ParseHelpers.ih b/senf/Packets/ParseHelpers.ih similarity index 100% rename from Packets/ParseHelpers.ih rename to senf/Packets/ParseHelpers.ih diff --git a/Packets/ParseHelpers.test.cc b/senf/Packets/ParseHelpers.test.cc similarity index 100% rename from Packets/ParseHelpers.test.cc rename to senf/Packets/ParseHelpers.test.cc diff --git a/Packets/SConscript b/senf/Packets/SConscript similarity index 100% rename from Packets/SConscript rename to senf/Packets/SConscript diff --git a/Packets/SafeIterator.cci b/senf/Packets/SafeIterator.cci similarity index 100% rename from Packets/SafeIterator.cci rename to senf/Packets/SafeIterator.cci diff --git a/Packets/SafeIterator.cti b/senf/Packets/SafeIterator.cti similarity index 100% rename from Packets/SafeIterator.cti rename to senf/Packets/SafeIterator.cti diff --git a/Packets/SafeIterator.hh b/senf/Packets/SafeIterator.hh similarity index 100% rename from Packets/SafeIterator.hh rename to senf/Packets/SafeIterator.hh diff --git a/Packets/SafeIterator.test.cc b/senf/Packets/SafeIterator.test.cc similarity index 100% rename from Packets/SafeIterator.test.cc rename to senf/Packets/SafeIterator.test.cc diff --git a/Packets/StringParser.cci b/senf/Packets/StringParser.cci similarity index 100% rename from Packets/StringParser.cci rename to senf/Packets/StringParser.cci diff --git a/Packets/StringParser.hh b/senf/Packets/StringParser.hh similarity index 100% rename from Packets/StringParser.hh rename to senf/Packets/StringParser.hh diff --git a/Packets/StringParser.test.cc b/senf/Packets/StringParser.test.cc similarity index 100% rename from Packets/StringParser.test.cc rename to senf/Packets/StringParser.test.cc diff --git a/Packets/VariantParser.ct b/senf/Packets/VariantParser.ct similarity index 100% rename from Packets/VariantParser.ct rename to senf/Packets/VariantParser.ct diff --git a/Packets/VariantParser.cti b/senf/Packets/VariantParser.cti similarity index 100% rename from Packets/VariantParser.cti rename to senf/Packets/VariantParser.cti diff --git a/Packets/VariantParser.hh b/senf/Packets/VariantParser.hh similarity index 100% rename from Packets/VariantParser.hh rename to senf/Packets/VariantParser.hh diff --git a/Packets/VariantParser.ih b/senf/Packets/VariantParser.ih similarity index 100% rename from Packets/VariantParser.ih rename to senf/Packets/VariantParser.ih diff --git a/Packets/VariantParser.test.cc b/senf/Packets/VariantParser.test.cc similarity index 100% rename from Packets/VariantParser.test.cc rename to senf/Packets/VariantParser.test.cc diff --git a/Packets/VectorParser.ct b/senf/Packets/VectorParser.ct similarity index 100% rename from Packets/VectorParser.ct rename to senf/Packets/VectorParser.ct diff --git a/Packets/VectorParser.cti b/senf/Packets/VectorParser.cti similarity index 100% rename from Packets/VectorParser.cti rename to senf/Packets/VectorParser.cti diff --git a/Packets/VectorParser.hh b/senf/Packets/VectorParser.hh similarity index 100% rename from Packets/VectorParser.hh rename to senf/Packets/VectorParser.hh diff --git a/Packets/VectorParser.ih b/senf/Packets/VectorParser.ih similarity index 100% rename from Packets/VectorParser.ih rename to senf/Packets/VectorParser.ih diff --git a/Packets/VectorParser.test.cc b/senf/Packets/VectorParser.test.cc similarity index 100% rename from Packets/VectorParser.test.cc rename to senf/Packets/VectorParser.test.cc diff --git a/Packets/main.test.cc b/senf/Packets/main.test.cc similarity index 100% rename from Packets/main.test.cc rename to senf/Packets/main.test.cc diff --git a/Packets/main.test.hh b/senf/Packets/main.test.hh similarity index 100% rename from Packets/main.test.hh rename to senf/Packets/main.test.hh diff --git a/Packets/parse_fixed_setup.hh b/senf/Packets/parse_fixed_setup.hh similarity index 100% rename from Packets/parse_fixed_setup.hh rename to senf/Packets/parse_fixed_setup.hh diff --git a/Packets/parse_setup.hh b/senf/Packets/parse_setup.hh similarity index 100% rename from Packets/parse_setup.hh rename to senf/Packets/parse_setup.hh diff --git a/Packets/structure.dia b/senf/Packets/structure.dia similarity index 100% rename from Packets/structure.dia rename to senf/Packets/structure.dia diff --git a/senf/SConscript b/senf/SConscript new file mode 100644 index 0000000..62838d1 --- /dev/null +++ b/senf/SConscript @@ -0,0 +1,14 @@ +# -*- python -*- + +Import('env') +import SENFSCons, glob, os + +########################################################################### + +# Create local_config.h +if not env.GetOption('clean') and not os.path.exists("local_config.hh"): + Execute(Touch("local_config.hh")) + +SConscript(glob.glob("*/SConscript")) + +env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = [ 'config.hh' ]) diff --git a/Scheduler/ClockService.cc b/senf/Scheduler/ClockService.cc similarity index 100% rename from Scheduler/ClockService.cc rename to senf/Scheduler/ClockService.cc diff --git a/Scheduler/ClockService.cci b/senf/Scheduler/ClockService.cci similarity index 100% rename from Scheduler/ClockService.cci rename to senf/Scheduler/ClockService.cci diff --git a/Scheduler/ClockService.hh b/senf/Scheduler/ClockService.hh similarity index 100% rename from Scheduler/ClockService.hh rename to senf/Scheduler/ClockService.hh diff --git a/Scheduler/ClockService.test.cc b/senf/Scheduler/ClockService.test.cc similarity index 100% rename from Scheduler/ClockService.test.cc rename to senf/Scheduler/ClockService.test.cc diff --git a/Utils/Doxyfile b/senf/Scheduler/Doxyfile similarity index 73% rename from Utils/Doxyfile rename to senf/Scheduler/Doxyfile index 9a072e2..c30d5f0 100644 --- a/Utils/Doxyfile +++ b/senf/Scheduler/Doxyfile @@ -1,4 +1,4 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = libUtils +PROJECT_NAME = Scheduler ALPHABETICAL_INDEX = NO diff --git a/Scheduler/EventHook.cc b/senf/Scheduler/EventHook.cc similarity index 100% rename from Scheduler/EventHook.cc rename to senf/Scheduler/EventHook.cc diff --git a/Scheduler/EventHook.cci b/senf/Scheduler/EventHook.cci similarity index 100% rename from Scheduler/EventHook.cci rename to senf/Scheduler/EventHook.cci diff --git a/Scheduler/EventHook.hh b/senf/Scheduler/EventHook.hh similarity index 100% rename from Scheduler/EventHook.hh rename to senf/Scheduler/EventHook.hh diff --git a/Scheduler/EventHook.ih b/senf/Scheduler/EventHook.ih similarity index 100% rename from Scheduler/EventHook.ih rename to senf/Scheduler/EventHook.ih diff --git a/Scheduler/EventManager.cc b/senf/Scheduler/EventManager.cc similarity index 100% rename from Scheduler/EventManager.cc rename to senf/Scheduler/EventManager.cc diff --git a/Scheduler/EventManager.cci b/senf/Scheduler/EventManager.cci similarity index 100% rename from Scheduler/EventManager.cci rename to senf/Scheduler/EventManager.cci diff --git a/Scheduler/EventManager.hh b/senf/Scheduler/EventManager.hh similarity index 100% rename from Scheduler/EventManager.hh rename to senf/Scheduler/EventManager.hh diff --git a/Scheduler/EventManager.test.cc b/senf/Scheduler/EventManager.test.cc similarity index 100% rename from Scheduler/EventManager.test.cc rename to senf/Scheduler/EventManager.test.cc diff --git a/Scheduler/FIFORunner.cc b/senf/Scheduler/FIFORunner.cc similarity index 100% rename from Scheduler/FIFORunner.cc rename to senf/Scheduler/FIFORunner.cc diff --git a/Scheduler/FIFORunner.cci b/senf/Scheduler/FIFORunner.cci similarity index 100% rename from Scheduler/FIFORunner.cci rename to senf/Scheduler/FIFORunner.cci diff --git a/Scheduler/FIFORunner.hh b/senf/Scheduler/FIFORunner.hh similarity index 100% rename from Scheduler/FIFORunner.hh rename to senf/Scheduler/FIFORunner.hh diff --git a/Scheduler/FdEvent.cc b/senf/Scheduler/FdEvent.cc similarity index 100% rename from Scheduler/FdEvent.cc rename to senf/Scheduler/FdEvent.cc diff --git a/Scheduler/FdEvent.cci b/senf/Scheduler/FdEvent.cci similarity index 100% rename from Scheduler/FdEvent.cci rename to senf/Scheduler/FdEvent.cci diff --git a/Scheduler/FdEvent.ct b/senf/Scheduler/FdEvent.ct similarity index 100% rename from Scheduler/FdEvent.ct rename to senf/Scheduler/FdEvent.ct diff --git a/Scheduler/FdEvent.cti b/senf/Scheduler/FdEvent.cti similarity index 100% rename from Scheduler/FdEvent.cti rename to senf/Scheduler/FdEvent.cti diff --git a/Scheduler/FdEvent.hh b/senf/Scheduler/FdEvent.hh similarity index 100% rename from Scheduler/FdEvent.hh rename to senf/Scheduler/FdEvent.hh diff --git a/Scheduler/FdEvent.ih b/senf/Scheduler/FdEvent.ih similarity index 100% rename from Scheduler/FdEvent.ih rename to senf/Scheduler/FdEvent.ih diff --git a/Scheduler/FdEvent.test.cc b/senf/Scheduler/FdEvent.test.cc similarity index 100% rename from Scheduler/FdEvent.test.cc rename to senf/Scheduler/FdEvent.test.cc diff --git a/Scheduler/FdManager.cc b/senf/Scheduler/FdManager.cc similarity index 100% rename from Scheduler/FdManager.cc rename to senf/Scheduler/FdManager.cc diff --git a/Scheduler/FdManager.cci b/senf/Scheduler/FdManager.cci similarity index 100% rename from Scheduler/FdManager.cci rename to senf/Scheduler/FdManager.cci diff --git a/Scheduler/FdManager.hh b/senf/Scheduler/FdManager.hh similarity index 100% rename from Scheduler/FdManager.hh rename to senf/Scheduler/FdManager.hh diff --git a/Scheduler/IdleEvent.cc b/senf/Scheduler/IdleEvent.cc similarity index 100% rename from Scheduler/IdleEvent.cc rename to senf/Scheduler/IdleEvent.cc diff --git a/Scheduler/IdleEvent.cci b/senf/Scheduler/IdleEvent.cci similarity index 100% rename from Scheduler/IdleEvent.cci rename to senf/Scheduler/IdleEvent.cci diff --git a/Scheduler/IdleEvent.hh b/senf/Scheduler/IdleEvent.hh similarity index 100% rename from Scheduler/IdleEvent.hh rename to senf/Scheduler/IdleEvent.hh diff --git a/Scheduler/IdleEvent.ih b/senf/Scheduler/IdleEvent.ih similarity index 100% rename from Scheduler/IdleEvent.ih rename to senf/Scheduler/IdleEvent.ih diff --git a/Scheduler/IdleEvent.test.cc b/senf/Scheduler/IdleEvent.test.cc similarity index 100% rename from Scheduler/IdleEvent.test.cc rename to senf/Scheduler/IdleEvent.test.cc diff --git a/Scheduler/Mainpage.dox b/senf/Scheduler/Mainpage.dox similarity index 100% rename from Scheduler/Mainpage.dox rename to senf/Scheduler/Mainpage.dox diff --git a/Scheduler/Poller.ct b/senf/Scheduler/Poller.ct similarity index 100% rename from Scheduler/Poller.ct rename to senf/Scheduler/Poller.ct diff --git a/Scheduler/Poller.cti b/senf/Scheduler/Poller.cti similarity index 100% rename from Scheduler/Poller.cti rename to senf/Scheduler/Poller.cti diff --git a/Scheduler/Poller.hh b/senf/Scheduler/Poller.hh similarity index 100% rename from Scheduler/Poller.hh rename to senf/Scheduler/Poller.hh diff --git a/Scheduler/Poller.test.cc b/senf/Scheduler/Poller.test.cc similarity index 100% rename from Scheduler/Poller.test.cc rename to senf/Scheduler/Poller.test.cc diff --git a/Scheduler/ReadHelper.cci b/senf/Scheduler/ReadHelper.cci similarity index 100% rename from Scheduler/ReadHelper.cci rename to senf/Scheduler/ReadHelper.cci diff --git a/Scheduler/ReadHelper.ct b/senf/Scheduler/ReadHelper.ct similarity index 100% rename from Scheduler/ReadHelper.ct rename to senf/Scheduler/ReadHelper.ct diff --git a/Scheduler/ReadHelper.cti b/senf/Scheduler/ReadHelper.cti similarity index 100% rename from Scheduler/ReadHelper.cti rename to senf/Scheduler/ReadHelper.cti diff --git a/Scheduler/ReadHelper.hh b/senf/Scheduler/ReadHelper.hh similarity index 100% rename from Scheduler/ReadHelper.hh rename to senf/Scheduler/ReadHelper.hh diff --git a/Scheduler/ReadHelper.ih b/senf/Scheduler/ReadHelper.ih similarity index 100% rename from Scheduler/ReadHelper.ih rename to senf/Scheduler/ReadHelper.ih diff --git a/Scheduler/ReadHelper.test.cc b/senf/Scheduler/ReadHelper.test.cc similarity index 100% rename from Scheduler/ReadHelper.test.cc rename to senf/Scheduler/ReadHelper.test.cc diff --git a/Scheduler/SConscript b/senf/Scheduler/SConscript similarity index 100% rename from Scheduler/SConscript rename to senf/Scheduler/SConscript diff --git a/Scheduler/Scheduler.cc b/senf/Scheduler/Scheduler.cc similarity index 100% rename from Scheduler/Scheduler.cc rename to senf/Scheduler/Scheduler.cc diff --git a/Scheduler/Scheduler.cci b/senf/Scheduler/Scheduler.cci similarity index 100% rename from Scheduler/Scheduler.cci rename to senf/Scheduler/Scheduler.cci diff --git a/Scheduler/Scheduler.hh b/senf/Scheduler/Scheduler.hh similarity index 100% rename from Scheduler/Scheduler.hh rename to senf/Scheduler/Scheduler.hh diff --git a/Scheduler/Scheduler.test.cc b/senf/Scheduler/Scheduler.test.cc similarity index 100% rename from Scheduler/Scheduler.test.cc rename to senf/Scheduler/Scheduler.test.cc diff --git a/Scheduler/SignalEvent.cc b/senf/Scheduler/SignalEvent.cc similarity index 100% rename from Scheduler/SignalEvent.cc rename to senf/Scheduler/SignalEvent.cc diff --git a/Scheduler/SignalEvent.cci b/senf/Scheduler/SignalEvent.cci similarity index 100% rename from Scheduler/SignalEvent.cci rename to senf/Scheduler/SignalEvent.cci diff --git a/Scheduler/SignalEvent.hh b/senf/Scheduler/SignalEvent.hh similarity index 100% rename from Scheduler/SignalEvent.hh rename to senf/Scheduler/SignalEvent.hh diff --git a/Scheduler/SignalEvent.ih b/senf/Scheduler/SignalEvent.ih similarity index 100% rename from Scheduler/SignalEvent.ih rename to senf/Scheduler/SignalEvent.ih diff --git a/Scheduler/SignalEvent.test.cc b/senf/Scheduler/SignalEvent.test.cc similarity index 100% rename from Scheduler/SignalEvent.test.cc rename to senf/Scheduler/SignalEvent.test.cc diff --git a/Scheduler/TimerEvent.cc b/senf/Scheduler/TimerEvent.cc similarity index 100% rename from Scheduler/TimerEvent.cc rename to senf/Scheduler/TimerEvent.cc diff --git a/Scheduler/TimerEvent.cci b/senf/Scheduler/TimerEvent.cci similarity index 100% rename from Scheduler/TimerEvent.cci rename to senf/Scheduler/TimerEvent.cci diff --git a/Scheduler/TimerEvent.hh b/senf/Scheduler/TimerEvent.hh similarity index 100% rename from Scheduler/TimerEvent.hh rename to senf/Scheduler/TimerEvent.hh diff --git a/Scheduler/TimerEvent.ih b/senf/Scheduler/TimerEvent.ih similarity index 100% rename from Scheduler/TimerEvent.ih rename to senf/Scheduler/TimerEvent.ih diff --git a/Scheduler/TimerEvent.test.cc b/senf/Scheduler/TimerEvent.test.cc similarity index 100% rename from Scheduler/TimerEvent.test.cc rename to senf/Scheduler/TimerEvent.test.cc diff --git a/Scheduler/TimerSource.cc b/senf/Scheduler/TimerSource.cc similarity index 100% rename from Scheduler/TimerSource.cc rename to senf/Scheduler/TimerSource.cc diff --git a/Scheduler/TimerSource.cci b/senf/Scheduler/TimerSource.cci similarity index 100% rename from Scheduler/TimerSource.cci rename to senf/Scheduler/TimerSource.cci diff --git a/Scheduler/TimerSource.hh b/senf/Scheduler/TimerSource.hh similarity index 100% rename from Scheduler/TimerSource.hh rename to senf/Scheduler/TimerSource.hh diff --git a/Scheduler/WriteHelper.ct b/senf/Scheduler/WriteHelper.ct similarity index 100% rename from Scheduler/WriteHelper.ct rename to senf/Scheduler/WriteHelper.ct diff --git a/Scheduler/WriteHelper.cti b/senf/Scheduler/WriteHelper.cti similarity index 100% rename from Scheduler/WriteHelper.cti rename to senf/Scheduler/WriteHelper.cti diff --git a/Scheduler/WriteHelper.hh b/senf/Scheduler/WriteHelper.hh similarity index 100% rename from Scheduler/WriteHelper.hh rename to senf/Scheduler/WriteHelper.hh diff --git a/Scheduler/WriteHelper.test.cc b/senf/Scheduler/WriteHelper.test.cc similarity index 100% rename from Scheduler/WriteHelper.test.cc rename to senf/Scheduler/WriteHelper.test.cc diff --git a/Packets/DefaultBundle/extra_tests/main.test.cc b/senf/Scheduler/main.test.cc similarity index 100% rename from Packets/DefaultBundle/extra_tests/main.test.cc rename to senf/Scheduler/main.test.cc diff --git a/include/senf/Socket.hh b/senf/Socket.hh similarity index 100% rename from include/senf/Socket.hh rename to senf/Socket.hh diff --git a/Socket/AddressingPolicy.hh b/senf/Socket/AddressingPolicy.hh similarity index 100% rename from Socket/AddressingPolicy.hh rename to senf/Socket/AddressingPolicy.hh diff --git a/Socket/ClientSocketHandle.ct b/senf/Socket/ClientSocketHandle.ct similarity index 100% rename from Socket/ClientSocketHandle.ct rename to senf/Socket/ClientSocketHandle.ct diff --git a/Socket/ClientSocketHandle.cti b/senf/Socket/ClientSocketHandle.cti similarity index 100% rename from Socket/ClientSocketHandle.cti rename to senf/Socket/ClientSocketHandle.cti diff --git a/Socket/ClientSocketHandle.hh b/senf/Socket/ClientSocketHandle.hh similarity index 100% rename from Socket/ClientSocketHandle.hh rename to senf/Socket/ClientSocketHandle.hh diff --git a/Socket/ClientSocketHandle.ih b/senf/Socket/ClientSocketHandle.ih similarity index 100% rename from Socket/ClientSocketHandle.ih rename to senf/Socket/ClientSocketHandle.ih diff --git a/Socket/ClientSocketHandle.test.cc b/senf/Socket/ClientSocketHandle.test.cc similarity index 100% rename from Socket/ClientSocketHandle.test.cc rename to senf/Socket/ClientSocketHandle.test.cc diff --git a/Socket/CommunicationPolicy.cc b/senf/Socket/CommunicationPolicy.cc similarity index 100% rename from Socket/CommunicationPolicy.cc rename to senf/Socket/CommunicationPolicy.cc diff --git a/Socket/CommunicationPolicy.cci b/senf/Socket/CommunicationPolicy.cci similarity index 100% rename from Socket/CommunicationPolicy.cci rename to senf/Socket/CommunicationPolicy.cci diff --git a/Socket/CommunicationPolicy.cti b/senf/Socket/CommunicationPolicy.cti similarity index 100% rename from Socket/CommunicationPolicy.cti rename to senf/Socket/CommunicationPolicy.cti diff --git a/Socket/CommunicationPolicy.hh b/senf/Socket/CommunicationPolicy.hh similarity index 100% rename from Socket/CommunicationPolicy.hh rename to senf/Socket/CommunicationPolicy.hh diff --git a/Socket/Doxyfile b/senf/Socket/Doxyfile similarity index 77% rename from Socket/Doxyfile rename to senf/Socket/Doxyfile index 9e64dda..e347c3a 100644 --- a/Socket/Doxyfile +++ b/senf/Socket/Doxyfile @@ -1,5 +1,5 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = libSocket +PROJECT_NAME = Socket RECURSIVE = Yes SHOW_DIRECTORIES = Yes diff --git a/Socket/FhHierarchy.dia b/senf/Socket/FhHierarchy.dia similarity index 100% rename from Socket/FhHierarchy.dia rename to senf/Socket/FhHierarchy.dia diff --git a/Socket/FileHandle.cc b/senf/Socket/FileHandle.cc similarity index 100% rename from Socket/FileHandle.cc rename to senf/Socket/FileHandle.cc diff --git a/Socket/FileHandle.cci b/senf/Socket/FileHandle.cci similarity index 100% rename from Socket/FileHandle.cci rename to senf/Socket/FileHandle.cci diff --git a/Socket/FileHandle.hh b/senf/Socket/FileHandle.hh similarity index 100% rename from Socket/FileHandle.hh rename to senf/Socket/FileHandle.hh diff --git a/Socket/FileHandle.ih b/senf/Socket/FileHandle.ih similarity index 100% rename from Socket/FileHandle.ih rename to senf/Socket/FileHandle.ih diff --git a/Socket/FileHandle.test.cc b/senf/Socket/FileHandle.test.cc similarity index 100% rename from Socket/FileHandle.test.cc rename to senf/Socket/FileHandle.test.cc diff --git a/Socket/FramingPolicy.hh b/senf/Socket/FramingPolicy.hh similarity index 100% rename from Socket/FramingPolicy.hh rename to senf/Socket/FramingPolicy.hh diff --git a/Socket/Handle.dia b/senf/Socket/Handle.dia similarity index 100% rename from Socket/Handle.dia rename to senf/Socket/Handle.dia diff --git a/Socket/Mainpage.dox b/senf/Socket/Mainpage.dox similarity index 100% rename from Socket/Mainpage.dox rename to senf/Socket/Mainpage.dox diff --git a/Socket/NetdeviceController.cc b/senf/Socket/NetdeviceController.cc similarity index 100% rename from Socket/NetdeviceController.cc rename to senf/Socket/NetdeviceController.cc diff --git a/Socket/NetdeviceController.hh b/senf/Socket/NetdeviceController.hh similarity index 100% rename from Socket/NetdeviceController.hh rename to senf/Socket/NetdeviceController.hh diff --git a/Socket/NetdeviceController.test.cc b/senf/Socket/NetdeviceController.test.cc similarity index 100% rename from Socket/NetdeviceController.test.cc rename to senf/Socket/NetdeviceController.test.cc diff --git a/Socket/ProtocolClientSocketHandle.cti b/senf/Socket/ProtocolClientSocketHandle.cti similarity index 100% rename from Socket/ProtocolClientSocketHandle.cti rename to senf/Socket/ProtocolClientSocketHandle.cti diff --git a/Socket/ProtocolClientSocketHandle.hh b/senf/Socket/ProtocolClientSocketHandle.hh similarity index 100% rename from Socket/ProtocolClientSocketHandle.hh rename to senf/Socket/ProtocolClientSocketHandle.hh diff --git a/Socket/ProtocolClientSocketHandle.mpp b/senf/Socket/ProtocolClientSocketHandle.mpp similarity index 100% rename from Socket/ProtocolClientSocketHandle.mpp rename to senf/Socket/ProtocolClientSocketHandle.mpp diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/senf/Socket/ProtocolClientSocketHandle.test.cc similarity index 100% rename from Socket/ProtocolClientSocketHandle.test.cc rename to senf/Socket/ProtocolClientSocketHandle.test.cc diff --git a/Socket/ProtocolServerSocketHandle.cti b/senf/Socket/ProtocolServerSocketHandle.cti similarity index 100% rename from Socket/ProtocolServerSocketHandle.cti rename to senf/Socket/ProtocolServerSocketHandle.cti diff --git a/Socket/ProtocolServerSocketHandle.hh b/senf/Socket/ProtocolServerSocketHandle.hh similarity index 100% rename from Socket/ProtocolServerSocketHandle.hh rename to senf/Socket/ProtocolServerSocketHandle.hh diff --git a/Socket/ProtocolServerSocketHandle.mpp b/senf/Socket/ProtocolServerSocketHandle.mpp similarity index 100% rename from Socket/ProtocolServerSocketHandle.mpp rename to senf/Socket/ProtocolServerSocketHandle.mpp diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/senf/Socket/ProtocolServerSocketHandle.test.cc similarity index 100% rename from Socket/ProtocolServerSocketHandle.test.cc rename to senf/Socket/ProtocolServerSocketHandle.test.cc diff --git a/Socket/Protocols.dia b/senf/Socket/Protocols.dia similarity index 100% rename from Socket/Protocols.dia rename to senf/Socket/Protocols.dia diff --git a/Socket/Protocols/AddressExceptions.hh b/senf/Socket/Protocols/AddressExceptions.hh similarity index 98% rename from Socket/Protocols/AddressExceptions.hh rename to senf/Socket/Protocols/AddressExceptions.hh index ea020de..9184fd4 100644 --- a/Socket/Protocols/AddressExceptions.hh +++ b/senf/Socket/Protocols/AddressExceptions.hh @@ -27,7 +27,7 @@ #define HH_SENF_Socket_Protocols_AddressExceptions_ 1 // Custom includes -#include "../Utils/Exception.hh" +#include "../../Utils/Exception.hh" //#include "AddressExceptions.mpp" ///////////////////////////////hh.p//////////////////////////////////////// diff --git a/Socket/Protocols/BSDAddressingPolicy.cc b/senf/Socket/Protocols/BSDAddressingPolicy.cc similarity index 100% rename from Socket/Protocols/BSDAddressingPolicy.cc rename to senf/Socket/Protocols/BSDAddressingPolicy.cc diff --git a/Socket/Protocols/BSDAddressingPolicy.cti b/senf/Socket/Protocols/BSDAddressingPolicy.cti similarity index 100% rename from Socket/Protocols/BSDAddressingPolicy.cti rename to senf/Socket/Protocols/BSDAddressingPolicy.cti diff --git a/Socket/Protocols/BSDAddressingPolicy.hh b/senf/Socket/Protocols/BSDAddressingPolicy.hh similarity index 100% rename from Socket/Protocols/BSDAddressingPolicy.hh rename to senf/Socket/Protocols/BSDAddressingPolicy.hh diff --git a/Socket/Protocols/BSDAddressingPolicy.test.cc b/senf/Socket/Protocols/BSDAddressingPolicy.test.cc similarity index 100% rename from Socket/Protocols/BSDAddressingPolicy.test.cc rename to senf/Socket/Protocols/BSDAddressingPolicy.test.cc diff --git a/Socket/Protocols/BSDSocketAddress.cc b/senf/Socket/Protocols/BSDSocketAddress.cc similarity index 100% rename from Socket/Protocols/BSDSocketAddress.cc rename to senf/Socket/Protocols/BSDSocketAddress.cc diff --git a/Socket/Protocols/BSDSocketAddress.cci b/senf/Socket/Protocols/BSDSocketAddress.cci similarity index 100% rename from Socket/Protocols/BSDSocketAddress.cci rename to senf/Socket/Protocols/BSDSocketAddress.cci diff --git a/Socket/Protocols/BSDSocketAddress.hh b/senf/Socket/Protocols/BSDSocketAddress.hh similarity index 100% rename from Socket/Protocols/BSDSocketAddress.hh rename to senf/Socket/Protocols/BSDSocketAddress.hh diff --git a/Socket/Protocols/BSDSocketAddress.test.cc b/senf/Socket/Protocols/BSDSocketAddress.test.cc similarity index 100% rename from Socket/Protocols/BSDSocketAddress.test.cc rename to senf/Socket/Protocols/BSDSocketAddress.test.cc diff --git a/Socket/Protocols/BSDSocketProtocol.cc b/senf/Socket/Protocols/BSDSocketProtocol.cc similarity index 100% rename from Socket/Protocols/BSDSocketProtocol.cc rename to senf/Socket/Protocols/BSDSocketProtocol.cc diff --git a/Socket/Protocols/BSDSocketProtocol.hh b/senf/Socket/Protocols/BSDSocketProtocol.hh similarity index 100% rename from Socket/Protocols/BSDSocketProtocol.hh rename to senf/Socket/Protocols/BSDSocketProtocol.hh diff --git a/Socket/Protocols/DVB.hh b/senf/Socket/Protocols/DVB.hh similarity index 100% rename from Socket/Protocols/DVB.hh rename to senf/Socket/Protocols/DVB.hh diff --git a/Socket/Protocols/DVB/DVB.hh b/senf/Socket/Protocols/DVB/DVB.hh similarity index 100% rename from Socket/Protocols/DVB/DVB.hh rename to senf/Socket/Protocols/DVB/DVB.hh diff --git a/Socket/Protocols/DVB/DVBConfigParser.cc b/senf/Socket/Protocols/DVB/DVBConfigParser.cc similarity index 100% rename from Socket/Protocols/DVB/DVBConfigParser.cc rename to senf/Socket/Protocols/DVB/DVBConfigParser.cc diff --git a/Socket/Protocols/DVB/DVBConfigParser.hh b/senf/Socket/Protocols/DVB/DVBConfigParser.hh similarity index 100% rename from Socket/Protocols/DVB/DVBConfigParser.hh rename to senf/Socket/Protocols/DVB/DVBConfigParser.hh diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.cc b/senf/Socket/Protocols/DVB/DVBDemuxHandles.cc similarity index 100% rename from Socket/Protocols/DVB/DVBDemuxHandles.cc rename to senf/Socket/Protocols/DVB/DVBDemuxHandles.cc diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.hh b/senf/Socket/Protocols/DVB/DVBDemuxHandles.hh similarity index 100% rename from Socket/Protocols/DVB/DVBDemuxHandles.hh rename to senf/Socket/Protocols/DVB/DVBDemuxHandles.hh diff --git a/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc b/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc similarity index 100% rename from Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc rename to senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc diff --git a/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh b/senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh similarity index 100% rename from Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh rename to senf/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.cc b/senf/Socket/Protocols/DVB/DVBFrontendHandle.cc similarity index 100% rename from Socket/Protocols/DVB/DVBFrontendHandle.cc rename to senf/Socket/Protocols/DVB/DVBFrontendHandle.cc diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.hh b/senf/Socket/Protocols/DVB/DVBFrontendHandle.hh similarity index 100% rename from Socket/Protocols/DVB/DVBFrontendHandle.hh rename to senf/Socket/Protocols/DVB/DVBFrontendHandle.hh diff --git a/Socket/Protocols/DVB/DVBProtocolWrapper.cc b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.cc similarity index 100% rename from Socket/Protocols/DVB/DVBProtocolWrapper.cc rename to senf/Socket/Protocols/DVB/DVBProtocolWrapper.cc diff --git a/Socket/Protocols/DVB/DVBProtocolWrapper.hh b/senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh similarity index 100% rename from Socket/Protocols/DVB/DVBProtocolWrapper.hh rename to senf/Socket/Protocols/DVB/DVBProtocolWrapper.hh diff --git a/Socket/Protocols/DVB/DVBSocketController.cc b/senf/Socket/Protocols/DVB/DVBSocketController.cc similarity index 100% rename from Socket/Protocols/DVB/DVBSocketController.cc rename to senf/Socket/Protocols/DVB/DVBSocketController.cc diff --git a/Socket/Protocols/DVB/DVBSocketController.hh b/senf/Socket/Protocols/DVB/DVBSocketController.hh similarity index 100% rename from Socket/Protocols/DVB/DVBSocketController.hh rename to senf/Socket/Protocols/DVB/DVBSocketController.hh diff --git a/Socket/Protocols/DVB/SConscript b/senf/Socket/Protocols/DVB/SConscript similarity index 100% rename from Socket/Protocols/DVB/SConscript rename to senf/Socket/Protocols/DVB/SConscript diff --git a/Socket/Protocols/DVB/main.test.cc b/senf/Socket/Protocols/DVB/main.test.cc similarity index 100% rename from Socket/Protocols/DVB/main.test.cc rename to senf/Socket/Protocols/DVB/main.test.cc diff --git a/Socket/Protocols/DatagramSocketProtocol.cc b/senf/Socket/Protocols/DatagramSocketProtocol.cc similarity index 100% rename from Socket/Protocols/DatagramSocketProtocol.cc rename to senf/Socket/Protocols/DatagramSocketProtocol.cc diff --git a/Socket/Protocols/DatagramSocketProtocol.hh b/senf/Socket/Protocols/DatagramSocketProtocol.hh similarity index 100% rename from Socket/Protocols/DatagramSocketProtocol.hh rename to senf/Socket/Protocols/DatagramSocketProtocol.hh diff --git a/Socket/Protocols/INet.hh b/senf/Socket/Protocols/INet.hh similarity index 100% rename from Socket/Protocols/INet.hh rename to senf/Socket/Protocols/INet.hh diff --git a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc similarity index 100% rename from Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc rename to senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.cc diff --git a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh similarity index 100% rename from Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh rename to senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc similarity index 100% rename from Socket/Protocols/INet/ConnectedUDPSocketHandle.cc rename to senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.cc diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh similarity index 100% rename from Socket/Protocols/INet/ConnectedUDPSocketHandle.hh rename to senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh diff --git a/Socket/Protocols/INet/INet.hh b/senf/Socket/Protocols/INet/INet.hh similarity index 100% rename from Socket/Protocols/INet/INet.hh rename to senf/Socket/Protocols/INet/INet.hh diff --git a/Socket/Protocols/INet/INet4Address.cc b/senf/Socket/Protocols/INet/INet4Address.cc similarity index 100% rename from Socket/Protocols/INet/INet4Address.cc rename to senf/Socket/Protocols/INet/INet4Address.cc diff --git a/Socket/Protocols/INet/INet4Address.cci b/senf/Socket/Protocols/INet/INet4Address.cci similarity index 100% rename from Socket/Protocols/INet/INet4Address.cci rename to senf/Socket/Protocols/INet/INet4Address.cci diff --git a/Socket/Protocols/INet/INet4Address.ct b/senf/Socket/Protocols/INet/INet4Address.ct similarity index 100% rename from Socket/Protocols/INet/INet4Address.ct rename to senf/Socket/Protocols/INet/INet4Address.ct diff --git a/Socket/Protocols/INet/INet4Address.cti b/senf/Socket/Protocols/INet/INet4Address.cti similarity index 100% rename from Socket/Protocols/INet/INet4Address.cti rename to senf/Socket/Protocols/INet/INet4Address.cti diff --git a/Socket/Protocols/INet/INet4Address.hh b/senf/Socket/Protocols/INet/INet4Address.hh similarity index 100% rename from Socket/Protocols/INet/INet4Address.hh rename to senf/Socket/Protocols/INet/INet4Address.hh diff --git a/Socket/Protocols/INet/INet4Address.test.cc b/senf/Socket/Protocols/INet/INet4Address.test.cc similarity index 100% rename from Socket/Protocols/INet/INet4Address.test.cc rename to senf/Socket/Protocols/INet/INet4Address.test.cc diff --git a/Socket/Protocols/INet/INet6Address.cc b/senf/Socket/Protocols/INet/INet6Address.cc similarity index 100% rename from Socket/Protocols/INet/INet6Address.cc rename to senf/Socket/Protocols/INet/INet6Address.cc diff --git a/Socket/Protocols/INet/INet6Address.cci b/senf/Socket/Protocols/INet/INet6Address.cci similarity index 100% rename from Socket/Protocols/INet/INet6Address.cci rename to senf/Socket/Protocols/INet/INet6Address.cci diff --git a/Socket/Protocols/INet/INet6Address.ct b/senf/Socket/Protocols/INet/INet6Address.ct similarity index 100% rename from Socket/Protocols/INet/INet6Address.ct rename to senf/Socket/Protocols/INet/INet6Address.ct diff --git a/Socket/Protocols/INet/INet6Address.cti b/senf/Socket/Protocols/INet/INet6Address.cti similarity index 100% rename from Socket/Protocols/INet/INet6Address.cti rename to senf/Socket/Protocols/INet/INet6Address.cti diff --git a/Socket/Protocols/INet/INet6Address.hh b/senf/Socket/Protocols/INet/INet6Address.hh similarity index 100% rename from Socket/Protocols/INet/INet6Address.hh rename to senf/Socket/Protocols/INet/INet6Address.hh diff --git a/Socket/Protocols/INet/INet6Address.ih b/senf/Socket/Protocols/INet/INet6Address.ih similarity index 100% rename from Socket/Protocols/INet/INet6Address.ih rename to senf/Socket/Protocols/INet/INet6Address.ih diff --git a/Socket/Protocols/INet/INet6Address.test.cc b/senf/Socket/Protocols/INet/INet6Address.test.cc similarity index 100% rename from Socket/Protocols/INet/INet6Address.test.cc rename to senf/Socket/Protocols/INet/INet6Address.test.cc diff --git a/Socket/Protocols/INet/INetAddressing.cc b/senf/Socket/Protocols/INet/INetAddressing.cc similarity index 100% rename from Socket/Protocols/INet/INetAddressing.cc rename to senf/Socket/Protocols/INet/INetAddressing.cc diff --git a/Socket/Protocols/INet/INetAddressing.cci b/senf/Socket/Protocols/INet/INetAddressing.cci similarity index 100% rename from Socket/Protocols/INet/INetAddressing.cci rename to senf/Socket/Protocols/INet/INetAddressing.cci diff --git a/Socket/Protocols/INet/INetAddressing.hh b/senf/Socket/Protocols/INet/INetAddressing.hh similarity index 100% rename from Socket/Protocols/INet/INetAddressing.hh rename to senf/Socket/Protocols/INet/INetAddressing.hh diff --git a/Socket/Protocols/INet/INetAddressing.test.cc b/senf/Socket/Protocols/INet/INetAddressing.test.cc similarity index 100% rename from Socket/Protocols/INet/INetAddressing.test.cc rename to senf/Socket/Protocols/INet/INetAddressing.test.cc diff --git a/Socket/Protocols/INet/INetSocketProtocol.cc b/senf/Socket/Protocols/INet/INetSocketProtocol.cc similarity index 100% rename from Socket/Protocols/INet/INetSocketProtocol.cc rename to senf/Socket/Protocols/INet/INetSocketProtocol.cc diff --git a/Socket/Protocols/INet/INetSocketProtocol.hh b/senf/Socket/Protocols/INet/INetSocketProtocol.hh similarity index 100% rename from Socket/Protocols/INet/INetSocketProtocol.hh rename to senf/Socket/Protocols/INet/INetSocketProtocol.hh diff --git a/Socket/Protocols/INet/MulticastSocketProtocol.cc b/senf/Socket/Protocols/INet/MulticastSocketProtocol.cc similarity index 100% rename from Socket/Protocols/INet/MulticastSocketProtocol.cc rename to senf/Socket/Protocols/INet/MulticastSocketProtocol.cc diff --git a/Socket/Protocols/INet/MulticastSocketProtocol.hh b/senf/Socket/Protocols/INet/MulticastSocketProtocol.hh similarity index 100% rename from Socket/Protocols/INet/MulticastSocketProtocol.hh rename to senf/Socket/Protocols/INet/MulticastSocketProtocol.hh diff --git a/Socket/Protocols/INet/MulticastSocketProtocol.test.cc b/senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc similarity index 100% rename from Socket/Protocols/INet/MulticastSocketProtocol.test.cc rename to senf/Socket/Protocols/INet/MulticastSocketProtocol.test.cc diff --git a/Socket/Protocols/INet/RawINetSocketHandle.cc b/senf/Socket/Protocols/INet/RawINetSocketHandle.cc similarity index 100% rename from Socket/Protocols/INet/RawINetSocketHandle.cc rename to senf/Socket/Protocols/INet/RawINetSocketHandle.cc diff --git a/Socket/Protocols/INet/RawINetSocketHandle.hh b/senf/Socket/Protocols/INet/RawINetSocketHandle.hh similarity index 100% rename from Socket/Protocols/INet/RawINetSocketHandle.hh rename to senf/Socket/Protocols/INet/RawINetSocketHandle.hh diff --git a/Socket/Protocols/INet/RawINetSocketHandle.test.cc b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc similarity index 100% rename from Socket/Protocols/INet/RawINetSocketHandle.test.cc rename to senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc diff --git a/Socket/Protocols/INet/RawINetSocketProtocol.cc b/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc similarity index 100% rename from Socket/Protocols/INet/RawINetSocketProtocol.cc rename to senf/Socket/Protocols/INet/RawINetSocketProtocol.cc diff --git a/Socket/Protocols/INet/RawINetSocketProtocol.hh b/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh similarity index 100% rename from Socket/Protocols/INet/RawINetSocketProtocol.hh rename to senf/Socket/Protocols/INet/RawINetSocketProtocol.hh diff --git a/Socket/Protocols/INet/SConscript b/senf/Socket/Protocols/INet/SConscript similarity index 100% rename from Socket/Protocols/INet/SConscript rename to senf/Socket/Protocols/INet/SConscript diff --git a/Socket/Protocols/INet/TCPSocketHandle.cc b/senf/Socket/Protocols/INet/TCPSocketHandle.cc similarity index 100% rename from Socket/Protocols/INet/TCPSocketHandle.cc rename to senf/Socket/Protocols/INet/TCPSocketHandle.cc diff --git a/Socket/Protocols/INet/TCPSocketHandle.hh b/senf/Socket/Protocols/INet/TCPSocketHandle.hh similarity index 100% rename from Socket/Protocols/INet/TCPSocketHandle.hh rename to senf/Socket/Protocols/INet/TCPSocketHandle.hh diff --git a/Socket/Protocols/INet/TCPSocketHandle.test.cc b/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc similarity index 100% rename from Socket/Protocols/INet/TCPSocketHandle.test.cc rename to senf/Socket/Protocols/INet/TCPSocketHandle.test.cc diff --git a/Socket/Protocols/INet/TCPSocketProtocol.cc b/senf/Socket/Protocols/INet/TCPSocketProtocol.cc similarity index 100% rename from Socket/Protocols/INet/TCPSocketProtocol.cc rename to senf/Socket/Protocols/INet/TCPSocketProtocol.cc diff --git a/Socket/Protocols/INet/TCPSocketProtocol.hh b/senf/Socket/Protocols/INet/TCPSocketProtocol.hh similarity index 100% rename from Socket/Protocols/INet/TCPSocketProtocol.hh rename to senf/Socket/Protocols/INet/TCPSocketProtocol.hh diff --git a/Socket/Protocols/INet/UDPSocketHandle.cc b/senf/Socket/Protocols/INet/UDPSocketHandle.cc similarity index 100% rename from Socket/Protocols/INet/UDPSocketHandle.cc rename to senf/Socket/Protocols/INet/UDPSocketHandle.cc diff --git a/Socket/Protocols/INet/UDPSocketHandle.hh b/senf/Socket/Protocols/INet/UDPSocketHandle.hh similarity index 100% rename from Socket/Protocols/INet/UDPSocketHandle.hh rename to senf/Socket/Protocols/INet/UDPSocketHandle.hh diff --git a/Socket/Protocols/INet/UDPSocketHandle.test.cc b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc similarity index 100% rename from Socket/Protocols/INet/UDPSocketHandle.test.cc rename to senf/Socket/Protocols/INet/UDPSocketHandle.test.cc diff --git a/Socket/Protocols/INet/UDPSocketProtocol.cc b/senf/Socket/Protocols/INet/UDPSocketProtocol.cc similarity index 100% rename from Socket/Protocols/INet/UDPSocketProtocol.cc rename to senf/Socket/Protocols/INet/UDPSocketProtocol.cc diff --git a/Socket/Protocols/INet/UDPSocketProtocol.hh b/senf/Socket/Protocols/INet/UDPSocketProtocol.hh similarity index 100% rename from Socket/Protocols/INet/UDPSocketProtocol.hh rename to senf/Socket/Protocols/INet/UDPSocketProtocol.hh diff --git a/Socket/Protocols/Raw/main.test.cc b/senf/Socket/Protocols/INet/main.test.cc similarity index 100% rename from Socket/Protocols/Raw/main.test.cc rename to senf/Socket/Protocols/INet/main.test.cc diff --git a/Socket/Protocols/Raw.hh b/senf/Socket/Protocols/Raw.hh similarity index 100% rename from Socket/Protocols/Raw.hh rename to senf/Socket/Protocols/Raw.hh diff --git a/Socket/Protocols/Raw/EUI64.cc b/senf/Socket/Protocols/Raw/EUI64.cc similarity index 100% rename from Socket/Protocols/Raw/EUI64.cc rename to senf/Socket/Protocols/Raw/EUI64.cc diff --git a/Socket/Protocols/Raw/EUI64.cci b/senf/Socket/Protocols/Raw/EUI64.cci similarity index 100% rename from Socket/Protocols/Raw/EUI64.cci rename to senf/Socket/Protocols/Raw/EUI64.cci diff --git a/Socket/Protocols/Raw/EUI64.cti b/senf/Socket/Protocols/Raw/EUI64.cti similarity index 100% rename from Socket/Protocols/Raw/EUI64.cti rename to senf/Socket/Protocols/Raw/EUI64.cti diff --git a/Socket/Protocols/Raw/EUI64.hh b/senf/Socket/Protocols/Raw/EUI64.hh similarity index 100% rename from Socket/Protocols/Raw/EUI64.hh rename to senf/Socket/Protocols/Raw/EUI64.hh diff --git a/Socket/Protocols/Raw/EUI64.test.cc b/senf/Socket/Protocols/Raw/EUI64.test.cc similarity index 100% rename from Socket/Protocols/Raw/EUI64.test.cc rename to senf/Socket/Protocols/Raw/EUI64.test.cc diff --git a/Socket/Protocols/Raw/LLAddressing.cc b/senf/Socket/Protocols/Raw/LLAddressing.cc similarity index 100% rename from Socket/Protocols/Raw/LLAddressing.cc rename to senf/Socket/Protocols/Raw/LLAddressing.cc diff --git a/Socket/Protocols/Raw/LLAddressing.cci b/senf/Socket/Protocols/Raw/LLAddressing.cci similarity index 100% rename from Socket/Protocols/Raw/LLAddressing.cci rename to senf/Socket/Protocols/Raw/LLAddressing.cci diff --git a/Socket/Protocols/Raw/LLAddressing.hh b/senf/Socket/Protocols/Raw/LLAddressing.hh similarity index 100% rename from Socket/Protocols/Raw/LLAddressing.hh rename to senf/Socket/Protocols/Raw/LLAddressing.hh diff --git a/Socket/Protocols/Raw/LLAddressing.test.cc b/senf/Socket/Protocols/Raw/LLAddressing.test.cc similarity index 100% rename from Socket/Protocols/Raw/LLAddressing.test.cc rename to senf/Socket/Protocols/Raw/LLAddressing.test.cc diff --git a/Socket/Protocols/Raw/MACAddress.cc b/senf/Socket/Protocols/Raw/MACAddress.cc similarity index 100% rename from Socket/Protocols/Raw/MACAddress.cc rename to senf/Socket/Protocols/Raw/MACAddress.cc diff --git a/Socket/Protocols/Raw/MACAddress.cci b/senf/Socket/Protocols/Raw/MACAddress.cci similarity index 100% rename from Socket/Protocols/Raw/MACAddress.cci rename to senf/Socket/Protocols/Raw/MACAddress.cci diff --git a/Socket/Protocols/Raw/MACAddress.ct b/senf/Socket/Protocols/Raw/MACAddress.ct similarity index 100% rename from Socket/Protocols/Raw/MACAddress.ct rename to senf/Socket/Protocols/Raw/MACAddress.ct diff --git a/Socket/Protocols/Raw/MACAddress.hh b/senf/Socket/Protocols/Raw/MACAddress.hh similarity index 100% rename from Socket/Protocols/Raw/MACAddress.hh rename to senf/Socket/Protocols/Raw/MACAddress.hh diff --git a/Socket/Protocols/Raw/MACAddress.test.cc b/senf/Socket/Protocols/Raw/MACAddress.test.cc similarity index 100% rename from Socket/Protocols/Raw/MACAddress.test.cc rename to senf/Socket/Protocols/Raw/MACAddress.test.cc diff --git a/Socket/Protocols/Raw/PacketSocketHandle.cc b/senf/Socket/Protocols/Raw/PacketSocketHandle.cc similarity index 100% rename from Socket/Protocols/Raw/PacketSocketHandle.cc rename to senf/Socket/Protocols/Raw/PacketSocketHandle.cc diff --git a/Socket/Protocols/Raw/PacketSocketHandle.hh b/senf/Socket/Protocols/Raw/PacketSocketHandle.hh similarity index 100% rename from Socket/Protocols/Raw/PacketSocketHandle.hh rename to senf/Socket/Protocols/Raw/PacketSocketHandle.hh diff --git a/Socket/Protocols/Raw/PacketSocketHandle.test.cc b/senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc similarity index 100% rename from Socket/Protocols/Raw/PacketSocketHandle.test.cc rename to senf/Socket/Protocols/Raw/PacketSocketHandle.test.cc diff --git a/Socket/Protocols/Raw/ParseString.ct b/senf/Socket/Protocols/Raw/ParseString.ct similarity index 100% rename from Socket/Protocols/Raw/ParseString.ct rename to senf/Socket/Protocols/Raw/ParseString.ct diff --git a/Socket/Protocols/Raw/ParseString.hh b/senf/Socket/Protocols/Raw/ParseString.hh similarity index 100% rename from Socket/Protocols/Raw/ParseString.hh rename to senf/Socket/Protocols/Raw/ParseString.hh diff --git a/Socket/Protocols/Raw/Raw.hh b/senf/Socket/Protocols/Raw/Raw.hh similarity index 100% rename from Socket/Protocols/Raw/Raw.hh rename to senf/Socket/Protocols/Raw/Raw.hh diff --git a/Socket/Protocols/Raw/SConscript b/senf/Socket/Protocols/Raw/SConscript similarity index 100% rename from Socket/Protocols/Raw/SConscript rename to senf/Socket/Protocols/Raw/SConscript diff --git a/Socket/Protocols/Raw/TunTapSocketHandle.cc b/senf/Socket/Protocols/Raw/TunTapSocketHandle.cc similarity index 100% rename from Socket/Protocols/Raw/TunTapSocketHandle.cc rename to senf/Socket/Protocols/Raw/TunTapSocketHandle.cc diff --git a/Socket/Protocols/Raw/TunTapSocketHandle.hh b/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh similarity index 100% rename from Socket/Protocols/Raw/TunTapSocketHandle.hh rename to senf/Socket/Protocols/Raw/TunTapSocketHandle.hh diff --git a/Socket/Protocols/Raw/TunTapSocketHandle.test.cc b/senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc similarity index 100% rename from Socket/Protocols/Raw/TunTapSocketHandle.test.cc rename to senf/Socket/Protocols/Raw/TunTapSocketHandle.test.cc diff --git a/Socket/Protocols/UN/main.test.cc b/senf/Socket/Protocols/Raw/main.test.cc similarity index 100% rename from Socket/Protocols/UN/main.test.cc rename to senf/Socket/Protocols/Raw/main.test.cc diff --git a/Socket/Protocols/SConscript b/senf/Socket/Protocols/SConscript similarity index 100% rename from Socket/Protocols/SConscript rename to senf/Socket/Protocols/SConscript diff --git a/Socket/Protocols/UN.hh b/senf/Socket/Protocols/UN.hh similarity index 100% rename from Socket/Protocols/UN.hh rename to senf/Socket/Protocols/UN.hh diff --git a/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc b/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc similarity index 100% rename from Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc rename to senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.cc diff --git a/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh b/senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh similarity index 100% rename from Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh rename to senf/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh diff --git a/Socket/Protocols/UN/SConscript b/senf/Socket/Protocols/UN/SConscript similarity index 100% rename from Socket/Protocols/UN/SConscript rename to senf/Socket/Protocols/UN/SConscript diff --git a/Socket/Protocols/UN/UN.hh b/senf/Socket/Protocols/UN/UN.hh similarity index 100% rename from Socket/Protocols/UN/UN.hh rename to senf/Socket/Protocols/UN/UN.hh diff --git a/Socket/Protocols/UN/UNAddressing.cc b/senf/Socket/Protocols/UN/UNAddressing.cc similarity index 100% rename from Socket/Protocols/UN/UNAddressing.cc rename to senf/Socket/Protocols/UN/UNAddressing.cc diff --git a/Socket/Protocols/UN/UNAddressing.cci b/senf/Socket/Protocols/UN/UNAddressing.cci similarity index 100% rename from Socket/Protocols/UN/UNAddressing.cci rename to senf/Socket/Protocols/UN/UNAddressing.cci diff --git a/Socket/Protocols/UN/UNAddressing.hh b/senf/Socket/Protocols/UN/UNAddressing.hh similarity index 100% rename from Socket/Protocols/UN/UNAddressing.hh rename to senf/Socket/Protocols/UN/UNAddressing.hh diff --git a/Socket/Protocols/UN/UNAddressing.test.cc b/senf/Socket/Protocols/UN/UNAddressing.test.cc similarity index 100% rename from Socket/Protocols/UN/UNAddressing.test.cc rename to senf/Socket/Protocols/UN/UNAddressing.test.cc diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.cc b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.cc similarity index 100% rename from Socket/Protocols/UN/UNDatagramSocketHandle.cc rename to senf/Socket/Protocols/UN/UNDatagramSocketHandle.cc diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.hh b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.hh similarity index 100% rename from Socket/Protocols/UN/UNDatagramSocketHandle.hh rename to senf/Socket/Protocols/UN/UNDatagramSocketHandle.hh diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc b/senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc similarity index 100% rename from Socket/Protocols/UN/UNDatagramSocketHandle.test.cc rename to senf/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc diff --git a/Socket/Protocols/UN/UNSocketProtocol.cc b/senf/Socket/Protocols/UN/UNSocketProtocol.cc similarity index 100% rename from Socket/Protocols/UN/UNSocketProtocol.cc rename to senf/Socket/Protocols/UN/UNSocketProtocol.cc diff --git a/Socket/Protocols/UN/UNSocketProtocol.hh b/senf/Socket/Protocols/UN/UNSocketProtocol.hh similarity index 100% rename from Socket/Protocols/UN/UNSocketProtocol.hh rename to senf/Socket/Protocols/UN/UNSocketProtocol.hh diff --git a/Socket/Protocols/UN/UNSocketProtocol.test.cc b/senf/Socket/Protocols/UN/UNSocketProtocol.test.cc similarity index 100% rename from Socket/Protocols/UN/UNSocketProtocol.test.cc rename to senf/Socket/Protocols/UN/UNSocketProtocol.test.cc diff --git a/Socket/Protocols/INet/main.test.cc b/senf/Socket/Protocols/UN/main.test.cc similarity index 100% rename from Socket/Protocols/INet/main.test.cc rename to senf/Socket/Protocols/UN/main.test.cc diff --git a/Socket/Protocols/main.test.cc b/senf/Socket/Protocols/main.test.cc similarity index 100% rename from Socket/Protocols/main.test.cc rename to senf/Socket/Protocols/main.test.cc diff --git a/Socket/ReadWritePolicy.cc b/senf/Socket/ReadWritePolicy.cc similarity index 100% rename from Socket/ReadWritePolicy.cc rename to senf/Socket/ReadWritePolicy.cc diff --git a/Socket/ReadWritePolicy.cti b/senf/Socket/ReadWritePolicy.cti similarity index 100% rename from Socket/ReadWritePolicy.cti rename to senf/Socket/ReadWritePolicy.cti diff --git a/Socket/ReadWritePolicy.hh b/senf/Socket/ReadWritePolicy.hh similarity index 100% rename from Socket/ReadWritePolicy.hh rename to senf/Socket/ReadWritePolicy.hh diff --git a/Socket/SConscript b/senf/Socket/SConscript similarity index 100% rename from Socket/SConscript rename to senf/Socket/SConscript diff --git a/Socket/ServerSocketHandle.cti b/senf/Socket/ServerSocketHandle.cti similarity index 100% rename from Socket/ServerSocketHandle.cti rename to senf/Socket/ServerSocketHandle.cti diff --git a/Socket/ServerSocketHandle.hh b/senf/Socket/ServerSocketHandle.hh similarity index 100% rename from Socket/ServerSocketHandle.hh rename to senf/Socket/ServerSocketHandle.hh diff --git a/Socket/ServerSocketHandle.test.cc b/senf/Socket/ServerSocketHandle.test.cc similarity index 100% rename from Socket/ServerSocketHandle.test.cc rename to senf/Socket/ServerSocketHandle.test.cc diff --git a/Socket/Socket.hh b/senf/Socket/Socket.hh similarity index 100% rename from Socket/Socket.hh rename to senf/Socket/Socket.hh diff --git a/Socket/SocketHandle.cc b/senf/Socket/SocketHandle.cc similarity index 100% rename from Socket/SocketHandle.cc rename to senf/Socket/SocketHandle.cc diff --git a/Socket/SocketHandle.cci b/senf/Socket/SocketHandle.cci similarity index 100% rename from Socket/SocketHandle.cci rename to senf/Socket/SocketHandle.cci diff --git a/Socket/SocketHandle.ct b/senf/Socket/SocketHandle.ct similarity index 100% rename from Socket/SocketHandle.ct rename to senf/Socket/SocketHandle.ct diff --git a/Socket/SocketHandle.cti b/senf/Socket/SocketHandle.cti similarity index 100% rename from Socket/SocketHandle.cti rename to senf/Socket/SocketHandle.cti diff --git a/Socket/SocketHandle.hh b/senf/Socket/SocketHandle.hh similarity index 100% rename from Socket/SocketHandle.hh rename to senf/Socket/SocketHandle.hh diff --git a/Socket/SocketHandle.ih b/senf/Socket/SocketHandle.ih similarity index 100% rename from Socket/SocketHandle.ih rename to senf/Socket/SocketHandle.ih diff --git a/Socket/SocketHandle.test.cc b/senf/Socket/SocketHandle.test.cc similarity index 100% rename from Socket/SocketHandle.test.cc rename to senf/Socket/SocketHandle.test.cc diff --git a/Socket/SocketLibrary-classes.dia b/senf/Socket/SocketLibrary-classes.dia similarity index 100% rename from Socket/SocketLibrary-classes.dia rename to senf/Socket/SocketLibrary-classes.dia diff --git a/Socket/SocketPolicy.cc b/senf/Socket/SocketPolicy.cc similarity index 100% rename from Socket/SocketPolicy.cc rename to senf/Socket/SocketPolicy.cc diff --git a/Socket/SocketPolicy.ct b/senf/Socket/SocketPolicy.ct similarity index 100% rename from Socket/SocketPolicy.ct rename to senf/Socket/SocketPolicy.ct diff --git a/Socket/SocketPolicy.dia b/senf/Socket/SocketPolicy.dia similarity index 100% rename from Socket/SocketPolicy.dia rename to senf/Socket/SocketPolicy.dia diff --git a/Socket/SocketPolicy.hh b/senf/Socket/SocketPolicy.hh similarity index 100% rename from Socket/SocketPolicy.hh rename to senf/Socket/SocketPolicy.hh diff --git a/Socket/SocketPolicy.ih b/senf/Socket/SocketPolicy.ih similarity index 100% rename from Socket/SocketPolicy.ih rename to senf/Socket/SocketPolicy.ih diff --git a/Socket/SocketPolicy.test.cc b/senf/Socket/SocketPolicy.test.cc similarity index 100% rename from Socket/SocketPolicy.test.cc rename to senf/Socket/SocketPolicy.test.cc diff --git a/Socket/SocketPolicy.test.hh b/senf/Socket/SocketPolicy.test.hh similarity index 100% rename from Socket/SocketPolicy.test.hh rename to senf/Socket/SocketPolicy.test.hh diff --git a/Socket/SocketProtocol.cc b/senf/Socket/SocketProtocol.cc similarity index 100% rename from Socket/SocketProtocol.cc rename to senf/Socket/SocketProtocol.cc diff --git a/Socket/SocketProtocol.cci b/senf/Socket/SocketProtocol.cci similarity index 100% rename from Socket/SocketProtocol.cci rename to senf/Socket/SocketProtocol.cci diff --git a/Socket/SocketProtocol.cti b/senf/Socket/SocketProtocol.cti similarity index 100% rename from Socket/SocketProtocol.cti rename to senf/Socket/SocketProtocol.cti diff --git a/Socket/SocketProtocol.hh b/senf/Socket/SocketProtocol.hh similarity index 100% rename from Socket/SocketProtocol.hh rename to senf/Socket/SocketProtocol.hh diff --git a/Socket/SocketProtocol.test.cc b/senf/Socket/SocketProtocol.test.cc similarity index 100% rename from Socket/SocketProtocol.test.cc rename to senf/Socket/SocketProtocol.test.cc diff --git a/Socket/SocketProtocol.test.hh b/senf/Socket/SocketProtocol.test.hh similarity index 100% rename from Socket/SocketProtocol.test.hh rename to senf/Socket/SocketProtocol.test.hh diff --git a/Scheduler/main.test.cc b/senf/Socket/main.test.cc similarity index 100% rename from Scheduler/main.test.cc rename to senf/Socket/main.test.cc diff --git a/Utils/Backtrace.cc b/senf/Utils/Backtrace.cc similarity index 100% rename from Utils/Backtrace.cc rename to senf/Utils/Backtrace.cc diff --git a/Utils/Backtrace.hh b/senf/Utils/Backtrace.hh similarity index 100% rename from Utils/Backtrace.hh rename to senf/Utils/Backtrace.hh diff --git a/Utils/Buffer.hh b/senf/Utils/Buffer.hh similarity index 100% rename from Utils/Buffer.hh rename to senf/Utils/Buffer.hh diff --git a/Utils/Buffer.test.cc b/senf/Utils/Buffer.test.cc similarity index 100% rename from Utils/Buffer.test.cc rename to senf/Utils/Buffer.test.cc diff --git a/Utils/Console/.gitignore b/senf/Utils/Console/.gitignore similarity index 100% rename from Utils/Console/.gitignore rename to senf/Utils/Console/.gitignore diff --git a/Utils/Console/Config.cc b/senf/Utils/Console/Config.cc similarity index 100% rename from Utils/Console/Config.cc rename to senf/Utils/Console/Config.cc diff --git a/Utils/Console/Config.cci b/senf/Utils/Console/Config.cci similarity index 100% rename from Utils/Console/Config.cci rename to senf/Utils/Console/Config.cci diff --git a/Utils/Console/Config.cti b/senf/Utils/Console/Config.cti similarity index 100% rename from Utils/Console/Config.cti rename to senf/Utils/Console/Config.cti diff --git a/Utils/Console/Config.hh b/senf/Utils/Console/Config.hh similarity index 100% rename from Utils/Console/Config.hh rename to senf/Utils/Console/Config.hh diff --git a/Utils/Console/Config.ih b/senf/Utils/Console/Config.ih similarity index 100% rename from Utils/Console/Config.ih rename to senf/Utils/Console/Config.ih diff --git a/Utils/Console/Config.test.cc b/senf/Utils/Console/Config.test.cc similarity index 100% rename from Utils/Console/Config.test.cc rename to senf/Utils/Console/Config.test.cc diff --git a/Utils/Console/ConfigFile.cc b/senf/Utils/Console/ConfigFile.cc similarity index 100% rename from Utils/Console/ConfigFile.cc rename to senf/Utils/Console/ConfigFile.cc diff --git a/Utils/Console/ConfigFile.cci b/senf/Utils/Console/ConfigFile.cci similarity index 100% rename from Utils/Console/ConfigFile.cci rename to senf/Utils/Console/ConfigFile.cci diff --git a/Utils/Console/ConfigFile.hh b/senf/Utils/Console/ConfigFile.hh similarity index 100% rename from Utils/Console/ConfigFile.hh rename to senf/Utils/Console/ConfigFile.hh diff --git a/Utils/Console/ConfigFile.ih b/senf/Utils/Console/ConfigFile.ih similarity index 100% rename from Utils/Console/ConfigFile.ih rename to senf/Utils/Console/ConfigFile.ih diff --git a/Utils/Console/ConfigFile.test.cc b/senf/Utils/Console/ConfigFile.test.cc similarity index 100% rename from Utils/Console/ConfigFile.test.cc rename to senf/Utils/Console/ConfigFile.test.cc diff --git a/Utils/Console/Console.hh b/senf/Utils/Console/Console.hh similarity index 100% rename from Utils/Console/Console.hh rename to senf/Utils/Console/Console.hh diff --git a/Utils/Console/Doxyfile b/senf/Utils/Console/Doxyfile similarity index 75% rename from Utils/Console/Doxyfile rename to senf/Utils/Console/Doxyfile index c76aad6..818d42b 100644 --- a/Utils/Console/Doxyfile +++ b/senf/Utils/Console/Doxyfile @@ -1,5 +1,5 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = libConsole +PROJECT_NAME = Utils_Console EXAMPLE_PATH = . EXCLUDE = testServer.cc diff --git a/Utils/Console/Example.dox b/senf/Utils/Console/Example.dox similarity index 100% rename from Utils/Console/Example.dox rename to senf/Utils/Console/Example.dox diff --git a/Utils/Console/Executor.cc b/senf/Utils/Console/Executor.cc similarity index 100% rename from Utils/Console/Executor.cc rename to senf/Utils/Console/Executor.cc diff --git a/Utils/Console/Executor.cci b/senf/Utils/Console/Executor.cci similarity index 100% rename from Utils/Console/Executor.cci rename to senf/Utils/Console/Executor.cci diff --git a/Utils/Console/Executor.hh b/senf/Utils/Console/Executor.hh similarity index 100% rename from Utils/Console/Executor.hh rename to senf/Utils/Console/Executor.hh diff --git a/Utils/Console/Executor.test.cc b/senf/Utils/Console/Executor.test.cc similarity index 100% rename from Utils/Console/Executor.test.cc rename to senf/Utils/Console/Executor.test.cc diff --git a/Utils/Console/FancyReader.hh b/senf/Utils/Console/FancyReader.hh similarity index 100% rename from Utils/Console/FancyReader.hh rename to senf/Utils/Console/FancyReader.hh diff --git a/Utils/Console/LazyDirectory.cc b/senf/Utils/Console/LazyDirectory.cc similarity index 100% rename from Utils/Console/LazyDirectory.cc rename to senf/Utils/Console/LazyDirectory.cc diff --git a/Utils/Console/LazyDirectory.hh b/senf/Utils/Console/LazyDirectory.hh similarity index 100% rename from Utils/Console/LazyDirectory.hh rename to senf/Utils/Console/LazyDirectory.hh diff --git a/Utils/Console/LineEditor.cc b/senf/Utils/Console/LineEditor.cc similarity index 100% rename from Utils/Console/LineEditor.cc rename to senf/Utils/Console/LineEditor.cc diff --git a/Utils/Console/LineEditor.hh b/senf/Utils/Console/LineEditor.hh similarity index 100% rename from Utils/Console/LineEditor.hh rename to senf/Utils/Console/LineEditor.hh diff --git a/Utils/Console/Mainpage.dox b/senf/Utils/Console/Mainpage.dox similarity index 100% rename from Utils/Console/Mainpage.dox rename to senf/Utils/Console/Mainpage.dox diff --git a/Utils/Console/Node.cc b/senf/Utils/Console/Node.cc similarity index 100% rename from Utils/Console/Node.cc rename to senf/Utils/Console/Node.cc diff --git a/Utils/Console/Node.cci b/senf/Utils/Console/Node.cci similarity index 100% rename from Utils/Console/Node.cci rename to senf/Utils/Console/Node.cci diff --git a/Utils/Console/Node.cti b/senf/Utils/Console/Node.cti similarity index 100% rename from Utils/Console/Node.cti rename to senf/Utils/Console/Node.cti diff --git a/Utils/Console/Node.hh b/senf/Utils/Console/Node.hh similarity index 100% rename from Utils/Console/Node.hh rename to senf/Utils/Console/Node.hh diff --git a/Utils/Console/Node.ih b/senf/Utils/Console/Node.ih similarity index 100% rename from Utils/Console/Node.ih rename to senf/Utils/Console/Node.ih diff --git a/Utils/Console/Node.test.cc b/senf/Utils/Console/Node.test.cc similarity index 100% rename from Utils/Console/Node.test.cc rename to senf/Utils/Console/Node.test.cc diff --git a/Utils/Console/OverloadedCommand.cc b/senf/Utils/Console/OverloadedCommand.cc similarity index 100% rename from Utils/Console/OverloadedCommand.cc rename to senf/Utils/Console/OverloadedCommand.cc diff --git a/Utils/Console/OverloadedCommand.cci b/senf/Utils/Console/OverloadedCommand.cci similarity index 100% rename from Utils/Console/OverloadedCommand.cci rename to senf/Utils/Console/OverloadedCommand.cci diff --git a/Utils/Console/OverloadedCommand.cti b/senf/Utils/Console/OverloadedCommand.cti similarity index 100% rename from Utils/Console/OverloadedCommand.cti rename to senf/Utils/Console/OverloadedCommand.cti diff --git a/Utils/Console/OverloadedCommand.hh b/senf/Utils/Console/OverloadedCommand.hh similarity index 100% rename from Utils/Console/OverloadedCommand.hh rename to senf/Utils/Console/OverloadedCommand.hh diff --git a/Utils/Console/OverloadedCommand.test.cc b/senf/Utils/Console/OverloadedCommand.test.cc similarity index 100% rename from Utils/Console/OverloadedCommand.test.cc rename to senf/Utils/Console/OverloadedCommand.test.cc diff --git a/Utils/Console/Parse.cc b/senf/Utils/Console/Parse.cc similarity index 100% rename from Utils/Console/Parse.cc rename to senf/Utils/Console/Parse.cc diff --git a/Utils/Console/Parse.cci b/senf/Utils/Console/Parse.cci similarity index 100% rename from Utils/Console/Parse.cci rename to senf/Utils/Console/Parse.cci diff --git a/Utils/Console/Parse.hh b/senf/Utils/Console/Parse.hh similarity index 100% rename from Utils/Console/Parse.hh rename to senf/Utils/Console/Parse.hh diff --git a/Utils/Console/Parse.ih b/senf/Utils/Console/Parse.ih similarity index 100% rename from Utils/Console/Parse.ih rename to senf/Utils/Console/Parse.ih diff --git a/Utils/Console/Parse.test.cc b/senf/Utils/Console/Parse.test.cc similarity index 100% rename from Utils/Console/Parse.test.cc rename to senf/Utils/Console/Parse.test.cc diff --git a/Utils/Console/ParsedCommand.cc b/senf/Utils/Console/ParsedCommand.cc similarity index 100% rename from Utils/Console/ParsedCommand.cc rename to senf/Utils/Console/ParsedCommand.cc diff --git a/Utils/Console/ParsedCommand.cci b/senf/Utils/Console/ParsedCommand.cci similarity index 100% rename from Utils/Console/ParsedCommand.cci rename to senf/Utils/Console/ParsedCommand.cci diff --git a/Utils/Console/ParsedCommand.ct b/senf/Utils/Console/ParsedCommand.ct similarity index 100% rename from Utils/Console/ParsedCommand.ct rename to senf/Utils/Console/ParsedCommand.ct diff --git a/Utils/Console/ParsedCommand.cti b/senf/Utils/Console/ParsedCommand.cti similarity index 100% rename from Utils/Console/ParsedCommand.cti rename to senf/Utils/Console/ParsedCommand.cti diff --git a/Utils/Console/ParsedCommand.hh b/senf/Utils/Console/ParsedCommand.hh similarity index 100% rename from Utils/Console/ParsedCommand.hh rename to senf/Utils/Console/ParsedCommand.hh diff --git a/Utils/Console/ParsedCommand.ih b/senf/Utils/Console/ParsedCommand.ih similarity index 100% rename from Utils/Console/ParsedCommand.ih rename to senf/Utils/Console/ParsedCommand.ih diff --git a/Utils/Console/ParsedCommand.mpp b/senf/Utils/Console/ParsedCommand.mpp similarity index 100% rename from Utils/Console/ParsedCommand.mpp rename to senf/Utils/Console/ParsedCommand.mpp diff --git a/Utils/Console/ParsedCommand.test.cc b/senf/Utils/Console/ParsedCommand.test.cc similarity index 100% rename from Utils/Console/ParsedCommand.test.cc rename to senf/Utils/Console/ParsedCommand.test.cc diff --git a/Utils/Console/ProgramOptions.cc b/senf/Utils/Console/ProgramOptions.cc similarity index 100% rename from Utils/Console/ProgramOptions.cc rename to senf/Utils/Console/ProgramOptions.cc diff --git a/Utils/Console/ProgramOptions.cci b/senf/Utils/Console/ProgramOptions.cci similarity index 100% rename from Utils/Console/ProgramOptions.cci rename to senf/Utils/Console/ProgramOptions.cci diff --git a/Utils/Console/ProgramOptions.cti b/senf/Utils/Console/ProgramOptions.cti similarity index 100% rename from Utils/Console/ProgramOptions.cti rename to senf/Utils/Console/ProgramOptions.cti diff --git a/Utils/Console/ProgramOptions.hh b/senf/Utils/Console/ProgramOptions.hh similarity index 100% rename from Utils/Console/ProgramOptions.hh rename to senf/Utils/Console/ProgramOptions.hh diff --git a/Utils/Console/ProgramOptions.ih b/senf/Utils/Console/ProgramOptions.ih similarity index 100% rename from Utils/Console/ProgramOptions.ih rename to senf/Utils/Console/ProgramOptions.ih diff --git a/Utils/Console/ProgramOptions.test.cc b/senf/Utils/Console/ProgramOptions.test.cc similarity index 100% rename from Utils/Console/ProgramOptions.test.cc rename to senf/Utils/Console/ProgramOptions.test.cc diff --git a/Utils/Console/SConscript b/senf/Utils/Console/SConscript similarity index 100% rename from Utils/Console/SConscript rename to senf/Utils/Console/SConscript diff --git a/Utils/Console/STLSupport.ct b/senf/Utils/Console/STLSupport.ct similarity index 100% rename from Utils/Console/STLSupport.ct rename to senf/Utils/Console/STLSupport.ct diff --git a/Utils/Console/STLSupport.hh b/senf/Utils/Console/STLSupport.hh similarity index 100% rename from Utils/Console/STLSupport.hh rename to senf/Utils/Console/STLSupport.hh diff --git a/Utils/Console/STLSupport.test.cc b/senf/Utils/Console/STLSupport.test.cc similarity index 100% rename from Utils/Console/STLSupport.test.cc rename to senf/Utils/Console/STLSupport.test.cc diff --git a/Utils/Console/ScopedDirectory.cci b/senf/Utils/Console/ScopedDirectory.cci similarity index 100% rename from Utils/Console/ScopedDirectory.cci rename to senf/Utils/Console/ScopedDirectory.cci diff --git a/Utils/Console/ScopedDirectory.cti b/senf/Utils/Console/ScopedDirectory.cti similarity index 100% rename from Utils/Console/ScopedDirectory.cti rename to senf/Utils/Console/ScopedDirectory.cti diff --git a/Utils/Console/ScopedDirectory.hh b/senf/Utils/Console/ScopedDirectory.hh similarity index 100% rename from Utils/Console/ScopedDirectory.hh rename to senf/Utils/Console/ScopedDirectory.hh diff --git a/Utils/Console/ScopedDirectory.test.cc b/senf/Utils/Console/ScopedDirectory.test.cc similarity index 100% rename from Utils/Console/ScopedDirectory.test.cc rename to senf/Utils/Console/ScopedDirectory.test.cc diff --git a/Utils/Console/Server.cc b/senf/Utils/Console/Server.cc similarity index 100% rename from Utils/Console/Server.cc rename to senf/Utils/Console/Server.cc diff --git a/Utils/Console/Server.cci b/senf/Utils/Console/Server.cci similarity index 100% rename from Utils/Console/Server.cci rename to senf/Utils/Console/Server.cci diff --git a/Utils/Console/Server.hh b/senf/Utils/Console/Server.hh similarity index 100% rename from Utils/Console/Server.hh rename to senf/Utils/Console/Server.hh diff --git a/Utils/Console/Server.ih b/senf/Utils/Console/Server.ih similarity index 100% rename from Utils/Console/Server.ih rename to senf/Utils/Console/Server.ih diff --git a/Utils/Console/Server.test.cc b/senf/Utils/Console/Server.test.cc similarity index 100% rename from Utils/Console/Server.test.cc rename to senf/Utils/Console/Server.test.cc diff --git a/Utils/Console/Sysdir.cci b/senf/Utils/Console/Sysdir.cci similarity index 100% rename from Utils/Console/Sysdir.cci rename to senf/Utils/Console/Sysdir.cci diff --git a/Utils/Console/Sysdir.hh b/senf/Utils/Console/Sysdir.hh similarity index 100% rename from Utils/Console/Sysdir.hh rename to senf/Utils/Console/Sysdir.hh diff --git a/Utils/Console/Sysdir.ih b/senf/Utils/Console/Sysdir.ih similarity index 100% rename from Utils/Console/Sysdir.ih rename to senf/Utils/Console/Sysdir.ih diff --git a/Utils/Console/Traits.cc b/senf/Utils/Console/Traits.cc similarity index 100% rename from Utils/Console/Traits.cc rename to senf/Utils/Console/Traits.cc diff --git a/Utils/Console/Traits.cci b/senf/Utils/Console/Traits.cci similarity index 100% rename from Utils/Console/Traits.cci rename to senf/Utils/Console/Traits.cci diff --git a/Utils/Console/Traits.ct b/senf/Utils/Console/Traits.ct similarity index 100% rename from Utils/Console/Traits.ct rename to senf/Utils/Console/Traits.ct diff --git a/Utils/Console/Traits.cti b/senf/Utils/Console/Traits.cti similarity index 100% rename from Utils/Console/Traits.cti rename to senf/Utils/Console/Traits.cti diff --git a/Utils/Console/Traits.hh b/senf/Utils/Console/Traits.hh similarity index 100% rename from Utils/Console/Traits.hh rename to senf/Utils/Console/Traits.hh diff --git a/Utils/Console/Traits.ih b/senf/Utils/Console/Traits.ih similarity index 100% rename from Utils/Console/Traits.ih rename to senf/Utils/Console/Traits.ih diff --git a/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc similarity index 100% rename from Utils/Console/Traits.test.cc rename to senf/Utils/Console/Traits.test.cc diff --git a/Utils/Console/UDPServer.cc b/senf/Utils/Console/UDPServer.cc similarity index 100% rename from Utils/Console/UDPServer.cc rename to senf/Utils/Console/UDPServer.cc diff --git a/Utils/Console/UDPServer.hh b/senf/Utils/Console/UDPServer.hh similarity index 100% rename from Utils/Console/UDPServer.hh rename to senf/Utils/Console/UDPServer.hh diff --git a/Utils/Console/UDPServer.test.cc b/senf/Utils/Console/UDPServer.test.cc similarity index 100% rename from Utils/Console/UDPServer.test.cc rename to senf/Utils/Console/UDPServer.test.cc diff --git a/Utils/Console/Utility.ct b/senf/Utils/Console/Utility.ct similarity index 100% rename from Utils/Console/Utility.ct rename to senf/Utils/Console/Utility.ct diff --git a/Utils/Console/Utility.hh b/senf/Utils/Console/Utility.hh similarity index 100% rename from Utils/Console/Utility.hh rename to senf/Utils/Console/Utility.hh diff --git a/Utils/Console/Variables.cti b/senf/Utils/Console/Variables.cti similarity index 100% rename from Utils/Console/Variables.cti rename to senf/Utils/Console/Variables.cti diff --git a/Utils/Console/Variables.hh b/senf/Utils/Console/Variables.hh similarity index 100% rename from Utils/Console/Variables.hh rename to senf/Utils/Console/Variables.hh diff --git a/Utils/Console/Variables.ih b/senf/Utils/Console/Variables.ih similarity index 100% rename from Utils/Console/Variables.ih rename to senf/Utils/Console/Variables.ih diff --git a/Utils/Console/Variables.test.cc b/senf/Utils/Console/Variables.test.cc similarity index 100% rename from Utils/Console/Variables.test.cc rename to senf/Utils/Console/Variables.test.cc diff --git a/Utils/Console/main.test.cc b/senf/Utils/Console/main.test.cc similarity index 100% rename from Utils/Console/main.test.cc rename to senf/Utils/Console/main.test.cc diff --git a/Utils/Console/testServer.cc b/senf/Utils/Console/testServer.cc similarity index 100% rename from Utils/Console/testServer.cc rename to senf/Utils/Console/testServer.cc diff --git a/Utils/Daemon.hh b/senf/Utils/Daemon.hh similarity index 100% rename from Utils/Daemon.hh rename to senf/Utils/Daemon.hh diff --git a/Utils/Daemon/Daemon.cc b/senf/Utils/Daemon/Daemon.cc similarity index 100% rename from Utils/Daemon/Daemon.cc rename to senf/Utils/Daemon/Daemon.cc diff --git a/Utils/Daemon/Daemon.cci b/senf/Utils/Daemon/Daemon.cci similarity index 100% rename from Utils/Daemon/Daemon.cci rename to senf/Utils/Daemon/Daemon.cci diff --git a/Utils/Daemon/Daemon.hh b/senf/Utils/Daemon/Daemon.hh similarity index 100% rename from Utils/Daemon/Daemon.hh rename to senf/Utils/Daemon/Daemon.hh diff --git a/Utils/Daemon/Daemon.ih b/senf/Utils/Daemon/Daemon.ih similarity index 100% rename from Utils/Daemon/Daemon.ih rename to senf/Utils/Daemon/Daemon.ih diff --git a/Utils/Daemon/Daemon.test.cc b/senf/Utils/Daemon/Daemon.test.cc similarity index 100% rename from Utils/Daemon/Daemon.test.cc rename to senf/Utils/Daemon/Daemon.test.cc diff --git a/Scheduler/Doxyfile b/senf/Utils/Daemon/Doxyfile similarity index 71% rename from Scheduler/Doxyfile rename to senf/Utils/Daemon/Doxyfile index 8b55f9d..5f1b4f9 100644 --- a/Scheduler/Doxyfile +++ b/senf/Utils/Daemon/Doxyfile @@ -1,4 +1,4 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = libScheduler +PROJECT_NAME = Utils_Daemon ALPHABETICAL_INDEX = NO diff --git a/Utils/Daemon/Mainpage.dox b/senf/Utils/Daemon/Mainpage.dox similarity index 100% rename from Utils/Daemon/Mainpage.dox rename to senf/Utils/Daemon/Mainpage.dox diff --git a/Utils/Daemon/SConscript b/senf/Utils/Daemon/SConscript similarity index 100% rename from Utils/Daemon/SConscript rename to senf/Utils/Daemon/SConscript diff --git a/Utils/Daemon/main.test.cc b/senf/Utils/Daemon/main.test.cc similarity index 100% rename from Utils/Daemon/main.test.cc rename to senf/Utils/Daemon/main.test.cc diff --git a/Utils/DiscardStream.cci b/senf/Utils/DiscardStream.cci similarity index 100% rename from Utils/DiscardStream.cci rename to senf/Utils/DiscardStream.cci diff --git a/Utils/DiscardStream.hh b/senf/Utils/DiscardStream.hh similarity index 100% rename from Utils/DiscardStream.hh rename to senf/Utils/DiscardStream.hh diff --git a/Utils/DiscardStream.test.cc b/senf/Utils/DiscardStream.test.cc similarity index 100% rename from Utils/DiscardStream.test.cc rename to senf/Utils/DiscardStream.test.cc diff --git a/Utils/Daemon/Doxyfile b/senf/Utils/Doxyfile similarity index 76% rename from Utils/Daemon/Doxyfile rename to senf/Utils/Doxyfile index f3e5315..df9d25a 100644 --- a/Utils/Daemon/Doxyfile +++ b/senf/Utils/Doxyfile @@ -1,4 +1,4 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = Daemon +PROJECT_NAME = Utils ALPHABETICAL_INDEX = NO diff --git a/Utils/Exception.cc b/senf/Utils/Exception.cc similarity index 100% rename from Utils/Exception.cc rename to senf/Utils/Exception.cc diff --git a/Utils/Exception.cci b/senf/Utils/Exception.cci similarity index 100% rename from Utils/Exception.cci rename to senf/Utils/Exception.cci diff --git a/Utils/Exception.cti b/senf/Utils/Exception.cti similarity index 100% rename from Utils/Exception.cti rename to senf/Utils/Exception.cti diff --git a/Utils/Exception.hh b/senf/Utils/Exception.hh similarity index 100% rename from Utils/Exception.hh rename to senf/Utils/Exception.hh diff --git a/Utils/Exception.test.cc b/senf/Utils/Exception.test.cc similarity index 100% rename from Utils/Exception.test.cc rename to senf/Utils/Exception.test.cc diff --git a/Utils/Externals.dox b/senf/Utils/Externals.dox similarity index 100% rename from Utils/Externals.dox rename to senf/Utils/Externals.dox diff --git a/Utils/IpChecksum.cci b/senf/Utils/IpChecksum.cci similarity index 100% rename from Utils/IpChecksum.cci rename to senf/Utils/IpChecksum.cci diff --git a/Utils/IpChecksum.cti b/senf/Utils/IpChecksum.cti similarity index 100% rename from Utils/IpChecksum.cti rename to senf/Utils/IpChecksum.cti diff --git a/Utils/IpChecksum.hh b/senf/Utils/IpChecksum.hh similarity index 100% rename from Utils/IpChecksum.hh rename to senf/Utils/IpChecksum.hh diff --git a/Utils/IpChecksum.test.cc b/senf/Utils/IpChecksum.test.cc similarity index 100% rename from Utils/IpChecksum.test.cc rename to senf/Utils/IpChecksum.test.cc diff --git a/Utils/IteratorTraits.cti b/senf/Utils/IteratorTraits.cti similarity index 100% rename from Utils/IteratorTraits.cti rename to senf/Utils/IteratorTraits.cti diff --git a/Utils/IteratorTraits.hh b/senf/Utils/IteratorTraits.hh similarity index 100% rename from Utils/IteratorTraits.hh rename to senf/Utils/IteratorTraits.hh diff --git a/Utils/IteratorTraits.ih b/senf/Utils/IteratorTraits.ih similarity index 100% rename from Utils/IteratorTraits.ih rename to senf/Utils/IteratorTraits.ih diff --git a/Utils/IteratorTraits.test.cc b/senf/Utils/IteratorTraits.test.cc similarity index 100% rename from Utils/IteratorTraits.test.cc rename to senf/Utils/IteratorTraits.test.cc diff --git a/Utils/Logger.hh b/senf/Utils/Logger.hh similarity index 100% rename from Utils/Logger.hh rename to senf/Utils/Logger.hh diff --git a/Utils/Logger/AreaRegistry.cc b/senf/Utils/Logger/AreaRegistry.cc similarity index 100% rename from Utils/Logger/AreaRegistry.cc rename to senf/Utils/Logger/AreaRegistry.cc diff --git a/Utils/Logger/AreaRegistry.cci b/senf/Utils/Logger/AreaRegistry.cci similarity index 100% rename from Utils/Logger/AreaRegistry.cci rename to senf/Utils/Logger/AreaRegistry.cci diff --git a/Utils/Logger/AreaRegistry.hh b/senf/Utils/Logger/AreaRegistry.hh similarity index 100% rename from Utils/Logger/AreaRegistry.hh rename to senf/Utils/Logger/AreaRegistry.hh diff --git a/Utils/Logger/AreaRegistry.ih b/senf/Utils/Logger/AreaRegistry.ih similarity index 100% rename from Utils/Logger/AreaRegistry.ih rename to senf/Utils/Logger/AreaRegistry.ih diff --git a/Utils/Logger/AreaRegistry.test.cc b/senf/Utils/Logger/AreaRegistry.test.cc similarity index 100% rename from Utils/Logger/AreaRegistry.test.cc rename to senf/Utils/Logger/AreaRegistry.test.cc diff --git a/Utils/Logger/Config.hh b/senf/Utils/Logger/Config.hh similarity index 100% rename from Utils/Logger/Config.hh rename to senf/Utils/Logger/Config.hh diff --git a/Utils/Logger/Config.ih b/senf/Utils/Logger/Config.ih similarity index 100% rename from Utils/Logger/Config.ih rename to senf/Utils/Logger/Config.ih diff --git a/Utils/Logger/Config.test.cc b/senf/Utils/Logger/Config.test.cc similarity index 100% rename from Utils/Logger/Config.test.cc rename to senf/Utils/Logger/Config.test.cc diff --git a/Utils/Logger/ConsoleTarget.cci b/senf/Utils/Logger/ConsoleTarget.cci similarity index 100% rename from Utils/Logger/ConsoleTarget.cci rename to senf/Utils/Logger/ConsoleTarget.cci diff --git a/Utils/Logger/ConsoleTarget.hh b/senf/Utils/Logger/ConsoleTarget.hh similarity index 100% rename from Utils/Logger/ConsoleTarget.hh rename to senf/Utils/Logger/ConsoleTarget.hh diff --git a/Utils/Logger/Definitions.hh b/senf/Utils/Logger/Definitions.hh similarity index 100% rename from Utils/Logger/Definitions.hh rename to senf/Utils/Logger/Definitions.hh diff --git a/Utils/Logger/Definitions.ih b/senf/Utils/Logger/Definitions.ih similarity index 100% rename from Utils/Logger/Definitions.ih rename to senf/Utils/Logger/Definitions.ih diff --git a/Utils/Logger/Doxyfile b/senf/Utils/Logger/Doxyfile similarity index 71% rename from Utils/Logger/Doxyfile rename to senf/Utils/Logger/Doxyfile index a9dd3f2..ea24e2a 100644 --- a/Utils/Logger/Doxyfile +++ b/senf/Utils/Logger/Doxyfile @@ -1,4 +1,4 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = Logger +PROJECT_NAME = Utils_Logger ALPHABETICAL_INDEX = NO diff --git a/Utils/Logger/FileTarget.cc b/senf/Utils/Logger/FileTarget.cc similarity index 100% rename from Utils/Logger/FileTarget.cc rename to senf/Utils/Logger/FileTarget.cc diff --git a/Utils/Logger/FileTarget.hh b/senf/Utils/Logger/FileTarget.hh similarity index 100% rename from Utils/Logger/FileTarget.hh rename to senf/Utils/Logger/FileTarget.hh diff --git a/Utils/Logger/FileTarget.test.cc b/senf/Utils/Logger/FileTarget.test.cc similarity index 100% rename from Utils/Logger/FileTarget.test.cc rename to senf/Utils/Logger/FileTarget.test.cc diff --git a/Utils/Logger/IOStreamTarget.cc b/senf/Utils/Logger/IOStreamTarget.cc similarity index 100% rename from Utils/Logger/IOStreamTarget.cc rename to senf/Utils/Logger/IOStreamTarget.cc diff --git a/Utils/Logger/IOStreamTarget.cci b/senf/Utils/Logger/IOStreamTarget.cci similarity index 100% rename from Utils/Logger/IOStreamTarget.cci rename to senf/Utils/Logger/IOStreamTarget.cci diff --git a/Utils/Logger/IOStreamTarget.hh b/senf/Utils/Logger/IOStreamTarget.hh similarity index 100% rename from Utils/Logger/IOStreamTarget.hh rename to senf/Utils/Logger/IOStreamTarget.hh diff --git a/Utils/Logger/Levels.hh b/senf/Utils/Logger/Levels.hh similarity index 100% rename from Utils/Logger/Levels.hh rename to senf/Utils/Logger/Levels.hh diff --git a/Utils/Logger/Levels.ih b/senf/Utils/Logger/Levels.ih similarity index 100% rename from Utils/Logger/Levels.ih rename to senf/Utils/Logger/Levels.ih diff --git a/Utils/Logger/Log.hh b/senf/Utils/Logger/Log.hh similarity index 100% rename from Utils/Logger/Log.hh rename to senf/Utils/Logger/Log.hh diff --git a/Utils/Logger/Log.ih b/senf/Utils/Logger/Log.ih similarity index 100% rename from Utils/Logger/Log.ih rename to senf/Utils/Logger/Log.ih diff --git a/Utils/Logger/Log.test.cc b/senf/Utils/Logger/Log.test.cc similarity index 100% rename from Utils/Logger/Log.test.cc rename to senf/Utils/Logger/Log.test.cc diff --git a/Utils/Logger/LogFormat.cc b/senf/Utils/Logger/LogFormat.cc similarity index 99% rename from Utils/Logger/LogFormat.cc rename to senf/Utils/Logger/LogFormat.cc index 7b816a3..7901090 100644 --- a/Utils/Logger/LogFormat.cc +++ b/senf/Utils/Logger/LogFormat.cc @@ -31,7 +31,7 @@ #include #include #include -#include "../Scheduler/ClockService.hh" +#include "../../Scheduler/ClockService.hh" #include "../Console/Console.hh" //#include "LogFormat.mpp" diff --git a/Utils/Logger/LogFormat.cci b/senf/Utils/Logger/LogFormat.cci similarity index 100% rename from Utils/Logger/LogFormat.cci rename to senf/Utils/Logger/LogFormat.cci diff --git a/Utils/Logger/LogFormat.hh b/senf/Utils/Logger/LogFormat.hh similarity index 100% rename from Utils/Logger/LogFormat.hh rename to senf/Utils/Logger/LogFormat.hh diff --git a/Utils/Logger/Logger.hh b/senf/Utils/Logger/Logger.hh similarity index 100% rename from Utils/Logger/Logger.hh rename to senf/Utils/Logger/Logger.hh diff --git a/Utils/Logger/Mainpage.dox b/senf/Utils/Logger/Mainpage.dox similarity index 100% rename from Utils/Logger/Mainpage.dox rename to senf/Utils/Logger/Mainpage.dox diff --git a/Utils/Logger/Parameters.hh b/senf/Utils/Logger/Parameters.hh similarity index 100% rename from Utils/Logger/Parameters.hh rename to senf/Utils/Logger/Parameters.hh diff --git a/Utils/Logger/Parameters.ih b/senf/Utils/Logger/Parameters.ih similarity index 100% rename from Utils/Logger/Parameters.ih rename to senf/Utils/Logger/Parameters.ih diff --git a/Utils/Logger/Parameters.test.cc b/senf/Utils/Logger/Parameters.test.cc similarity index 100% rename from Utils/Logger/Parameters.test.cc rename to senf/Utils/Logger/Parameters.test.cc diff --git a/Utils/Logger/SConscript b/senf/Utils/Logger/SConscript similarity index 100% rename from Utils/Logger/SConscript rename to senf/Utils/Logger/SConscript diff --git a/Utils/Logger/SenfLog.hh b/senf/Utils/Logger/SenfLog.hh similarity index 100% rename from Utils/Logger/SenfLog.hh rename to senf/Utils/Logger/SenfLog.hh diff --git a/Utils/Logger/StreamRegistry.cc b/senf/Utils/Logger/StreamRegistry.cc similarity index 100% rename from Utils/Logger/StreamRegistry.cc rename to senf/Utils/Logger/StreamRegistry.cc diff --git a/Utils/Logger/StreamRegistry.cci b/senf/Utils/Logger/StreamRegistry.cci similarity index 100% rename from Utils/Logger/StreamRegistry.cci rename to senf/Utils/Logger/StreamRegistry.cci diff --git a/Utils/Logger/StreamRegistry.hh b/senf/Utils/Logger/StreamRegistry.hh similarity index 100% rename from Utils/Logger/StreamRegistry.hh rename to senf/Utils/Logger/StreamRegistry.hh diff --git a/Utils/Logger/StreamRegistry.ih b/senf/Utils/Logger/StreamRegistry.ih similarity index 100% rename from Utils/Logger/StreamRegistry.ih rename to senf/Utils/Logger/StreamRegistry.ih diff --git a/Utils/Logger/StreamRegistry.test.cc b/senf/Utils/Logger/StreamRegistry.test.cc similarity index 100% rename from Utils/Logger/StreamRegistry.test.cc rename to senf/Utils/Logger/StreamRegistry.test.cc diff --git a/Utils/Logger/StringTarget.cti b/senf/Utils/Logger/StringTarget.cti similarity index 100% rename from Utils/Logger/StringTarget.cti rename to senf/Utils/Logger/StringTarget.cti diff --git a/Utils/Logger/StringTarget.hh b/senf/Utils/Logger/StringTarget.hh similarity index 100% rename from Utils/Logger/StringTarget.hh rename to senf/Utils/Logger/StringTarget.hh diff --git a/Utils/Logger/SyslogTarget.cc b/senf/Utils/Logger/SyslogTarget.cc similarity index 100% rename from Utils/Logger/SyslogTarget.cc rename to senf/Utils/Logger/SyslogTarget.cc diff --git a/Utils/Logger/SyslogTarget.cci b/senf/Utils/Logger/SyslogTarget.cci similarity index 100% rename from Utils/Logger/SyslogTarget.cci rename to senf/Utils/Logger/SyslogTarget.cci diff --git a/Utils/Logger/SyslogTarget.hh b/senf/Utils/Logger/SyslogTarget.hh similarity index 100% rename from Utils/Logger/SyslogTarget.hh rename to senf/Utils/Logger/SyslogTarget.hh diff --git a/Utils/Logger/SyslogTarget.test.cc b/senf/Utils/Logger/SyslogTarget.test.cc similarity index 100% rename from Utils/Logger/SyslogTarget.test.cc rename to senf/Utils/Logger/SyslogTarget.test.cc diff --git a/Utils/Logger/SyslogUDPTarget.cc b/senf/Utils/Logger/SyslogUDPTarget.cc similarity index 100% rename from Utils/Logger/SyslogUDPTarget.cc rename to senf/Utils/Logger/SyslogUDPTarget.cc diff --git a/Utils/Logger/SyslogUDPTarget.cci b/senf/Utils/Logger/SyslogUDPTarget.cci similarity index 100% rename from Utils/Logger/SyslogUDPTarget.cci rename to senf/Utils/Logger/SyslogUDPTarget.cci diff --git a/Utils/Logger/SyslogUDPTarget.hh b/senf/Utils/Logger/SyslogUDPTarget.hh similarity index 100% rename from Utils/Logger/SyslogUDPTarget.hh rename to senf/Utils/Logger/SyslogUDPTarget.hh diff --git a/Utils/Logger/SyslogUDPTarget.test.cc b/senf/Utils/Logger/SyslogUDPTarget.test.cc similarity index 100% rename from Utils/Logger/SyslogUDPTarget.test.cc rename to senf/Utils/Logger/SyslogUDPTarget.test.cc diff --git a/Utils/Logger/Target.cc b/senf/Utils/Logger/Target.cc similarity index 100% rename from Utils/Logger/Target.cc rename to senf/Utils/Logger/Target.cc diff --git a/Utils/Logger/Target.cci b/senf/Utils/Logger/Target.cci similarity index 100% rename from Utils/Logger/Target.cci rename to senf/Utils/Logger/Target.cci diff --git a/Utils/Logger/Target.cti b/senf/Utils/Logger/Target.cti similarity index 100% rename from Utils/Logger/Target.cti rename to senf/Utils/Logger/Target.cti diff --git a/Utils/Logger/Target.hh b/senf/Utils/Logger/Target.hh similarity index 100% rename from Utils/Logger/Target.hh rename to senf/Utils/Logger/Target.hh diff --git a/Utils/Logger/Target.ih b/senf/Utils/Logger/Target.ih similarity index 100% rename from Utils/Logger/Target.ih rename to senf/Utils/Logger/Target.ih diff --git a/Utils/Logger/Target.test.cc b/senf/Utils/Logger/Target.test.cc similarity index 100% rename from Utils/Logger/Target.test.cc rename to senf/Utils/Logger/Target.test.cc diff --git a/Utils/Logger/TimeSource.cc b/senf/Utils/Logger/TimeSource.cc similarity index 100% rename from Utils/Logger/TimeSource.cc rename to senf/Utils/Logger/TimeSource.cc diff --git a/Utils/Logger/TimeSource.cci b/senf/Utils/Logger/TimeSource.cci similarity index 100% rename from Utils/Logger/TimeSource.cci rename to senf/Utils/Logger/TimeSource.cci diff --git a/Utils/Logger/TimeSource.cti b/senf/Utils/Logger/TimeSource.cti similarity index 100% rename from Utils/Logger/TimeSource.cti rename to senf/Utils/Logger/TimeSource.cti diff --git a/Utils/Logger/TimeSource.hh b/senf/Utils/Logger/TimeSource.hh similarity index 100% rename from Utils/Logger/TimeSource.hh rename to senf/Utils/Logger/TimeSource.hh diff --git a/Utils/Logger/TimeSource.ih b/senf/Utils/Logger/TimeSource.ih similarity index 100% rename from Utils/Logger/TimeSource.ih rename to senf/Utils/Logger/TimeSource.ih diff --git a/Utils/Logger/main.test.cc b/senf/Utils/Logger/main.test.cc similarity index 100% rename from Utils/Logger/main.test.cc rename to senf/Utils/Logger/main.test.cc diff --git a/Utils/Logger/main.test.hh b/senf/Utils/Logger/main.test.hh similarity index 100% rename from Utils/Logger/main.test.hh rename to senf/Utils/Logger/main.test.hh diff --git a/Utils/Mainpage.dox b/senf/Utils/Mainpage.dox similarity index 100% rename from Utils/Mainpage.dox rename to senf/Utils/Mainpage.dox diff --git a/Utils/Phoenix.hh b/senf/Utils/Phoenix.hh similarity index 100% rename from Utils/Phoenix.hh rename to senf/Utils/Phoenix.hh diff --git a/Utils/Phoenix.ih b/senf/Utils/Phoenix.ih similarity index 100% rename from Utils/Phoenix.ih rename to senf/Utils/Phoenix.ih diff --git a/Utils/Range.cti b/senf/Utils/Range.cti similarity index 100% rename from Utils/Range.cti rename to senf/Utils/Range.cti diff --git a/Utils/Range.hh b/senf/Utils/Range.hh similarity index 100% rename from Utils/Range.hh rename to senf/Utils/Range.hh diff --git a/Utils/SConscript b/senf/Utils/SConscript similarity index 100% rename from Utils/SConscript rename to senf/Utils/SConscript diff --git a/Utils/ScopeExit.cci b/senf/Utils/ScopeExit.cci similarity index 100% rename from Utils/ScopeExit.cci rename to senf/Utils/ScopeExit.cci diff --git a/Utils/ScopeExit.hh b/senf/Utils/ScopeExit.hh similarity index 100% rename from Utils/ScopeExit.hh rename to senf/Utils/ScopeExit.hh diff --git a/Utils/Statistics.cc b/senf/Utils/Statistics.cc similarity index 100% rename from Utils/Statistics.cc rename to senf/Utils/Statistics.cc diff --git a/Utils/Statistics.cci b/senf/Utils/Statistics.cci similarity index 100% rename from Utils/Statistics.cci rename to senf/Utils/Statistics.cci diff --git a/Utils/Statistics.cti b/senf/Utils/Statistics.cti similarity index 100% rename from Utils/Statistics.cti rename to senf/Utils/Statistics.cti diff --git a/Utils/Statistics.hh b/senf/Utils/Statistics.hh similarity index 100% rename from Utils/Statistics.hh rename to senf/Utils/Statistics.hh diff --git a/Utils/Statistics.test.cc b/senf/Utils/Statistics.test.cc similarity index 100% rename from Utils/Statistics.test.cc rename to senf/Utils/Statistics.test.cc diff --git a/Utils/StatisticsTargets.cc b/senf/Utils/StatisticsTargets.cc similarity index 100% rename from Utils/StatisticsTargets.cc rename to senf/Utils/StatisticsTargets.cc diff --git a/Utils/StatisticsTargets.cci b/senf/Utils/StatisticsTargets.cci similarity index 100% rename from Utils/StatisticsTargets.cci rename to senf/Utils/StatisticsTargets.cci diff --git a/Utils/StatisticsTargets.ct b/senf/Utils/StatisticsTargets.ct similarity index 100% rename from Utils/StatisticsTargets.ct rename to senf/Utils/StatisticsTargets.ct diff --git a/Utils/StatisticsTargets.cti b/senf/Utils/StatisticsTargets.cti similarity index 100% rename from Utils/StatisticsTargets.cti rename to senf/Utils/StatisticsTargets.cti diff --git a/Utils/StatisticsTargets.hh b/senf/Utils/StatisticsTargets.hh similarity index 100% rename from Utils/StatisticsTargets.hh rename to senf/Utils/StatisticsTargets.hh diff --git a/Utils/StatisticsTargets.ih b/senf/Utils/StatisticsTargets.ih similarity index 100% rename from Utils/StatisticsTargets.ih rename to senf/Utils/StatisticsTargets.ih diff --git a/Utils/String.ct b/senf/Utils/String.ct similarity index 100% rename from Utils/String.ct rename to senf/Utils/String.ct diff --git a/Utils/String.cti b/senf/Utils/String.cti similarity index 100% rename from Utils/String.cti rename to senf/Utils/String.cti diff --git a/Utils/String.hh b/senf/Utils/String.hh similarity index 100% rename from Utils/String.hh rename to senf/Utils/String.hh diff --git a/Utils/String.test.cc b/senf/Utils/String.test.cc similarity index 100% rename from Utils/String.test.cc rename to senf/Utils/String.test.cc diff --git a/Utils/Tags.hh b/senf/Utils/Tags.hh similarity index 100% rename from Utils/Tags.hh rename to senf/Utils/Tags.hh diff --git a/Utils/Tags.test.cc b/senf/Utils/Tags.test.cc similarity index 100% rename from Utils/Tags.test.cc rename to senf/Utils/Tags.test.cc diff --git a/Utils/Termlib/.gitignore b/senf/Utils/Termlib/.gitignore similarity index 100% rename from Utils/Termlib/.gitignore rename to senf/Utils/Termlib/.gitignore diff --git a/Utils/Termlib/AbstractTerminal.hh b/senf/Utils/Termlib/AbstractTerminal.hh similarity index 100% rename from Utils/Termlib/AbstractTerminal.hh rename to senf/Utils/Termlib/AbstractTerminal.hh diff --git a/Utils/Termlib/Doxyfile b/senf/Utils/Termlib/Doxyfile similarity index 79% rename from Utils/Termlib/Doxyfile rename to senf/Utils/Termlib/Doxyfile index 0c6a51b..15cfae7 100644 --- a/Utils/Termlib/Doxyfile +++ b/senf/Utils/Termlib/Doxyfile @@ -1,6 +1,6 @@ @INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" -PROJECT_NAME = libTermlib +PROJECT_NAME = Utils_Termlib EXAMPLE_PATH = . EXCLUDE = telnetServer.cc ALPHABETICAL_INDEX = NO diff --git a/Utils/Termlib/Editor.cc b/senf/Utils/Termlib/Editor.cc similarity index 100% rename from Utils/Termlib/Editor.cc rename to senf/Utils/Termlib/Editor.cc diff --git a/Utils/Termlib/Editor.hh b/senf/Utils/Termlib/Editor.hh similarity index 100% rename from Utils/Termlib/Editor.hh rename to senf/Utils/Termlib/Editor.hh diff --git a/Utils/Termlib/Mainpage.dox b/senf/Utils/Termlib/Mainpage.dox similarity index 100% rename from Utils/Termlib/Mainpage.dox rename to senf/Utils/Termlib/Mainpage.dox diff --git a/Utils/Termlib/SConscript b/senf/Utils/Termlib/SConscript similarity index 100% rename from Utils/Termlib/SConscript rename to senf/Utils/Termlib/SConscript diff --git a/Utils/Termlib/Telnet.cc b/senf/Utils/Termlib/Telnet.cc similarity index 100% rename from Utils/Termlib/Telnet.cc rename to senf/Utils/Termlib/Telnet.cc diff --git a/Utils/Termlib/Telnet.cci b/senf/Utils/Termlib/Telnet.cci similarity index 100% rename from Utils/Termlib/Telnet.cci rename to senf/Utils/Termlib/Telnet.cci diff --git a/Utils/Termlib/Telnet.cti b/senf/Utils/Termlib/Telnet.cti similarity index 100% rename from Utils/Termlib/Telnet.cti rename to senf/Utils/Termlib/Telnet.cti diff --git a/Utils/Termlib/Telnet.hh b/senf/Utils/Termlib/Telnet.hh similarity index 100% rename from Utils/Termlib/Telnet.hh rename to senf/Utils/Termlib/Telnet.hh diff --git a/Utils/Termlib/Telnet.test.cc b/senf/Utils/Termlib/Telnet.test.cc similarity index 100% rename from Utils/Termlib/Telnet.test.cc rename to senf/Utils/Termlib/Telnet.test.cc diff --git a/Utils/Termlib/TelnetTerminal.cc b/senf/Utils/Termlib/TelnetTerminal.cc similarity index 100% rename from Utils/Termlib/TelnetTerminal.cc rename to senf/Utils/Termlib/TelnetTerminal.cc diff --git a/Utils/Termlib/TelnetTerminal.hh b/senf/Utils/Termlib/TelnetTerminal.hh similarity index 100% rename from Utils/Termlib/TelnetTerminal.hh rename to senf/Utils/Termlib/TelnetTerminal.hh diff --git a/Utils/Termlib/Terminfo.cc b/senf/Utils/Termlib/Terminfo.cc similarity index 100% rename from Utils/Termlib/Terminfo.cc rename to senf/Utils/Termlib/Terminfo.cc diff --git a/Utils/Termlib/Terminfo.hh b/senf/Utils/Termlib/Terminfo.hh similarity index 100% rename from Utils/Termlib/Terminfo.hh rename to senf/Utils/Termlib/Terminfo.hh diff --git a/Utils/Termlib/Terminfo.test.cc b/senf/Utils/Termlib/Terminfo.test.cc similarity index 100% rename from Utils/Termlib/Terminfo.test.cc rename to senf/Utils/Termlib/Terminfo.test.cc diff --git a/Utils/Termlib/main.test.cc b/senf/Utils/Termlib/main.test.cc similarity index 100% rename from Utils/Termlib/main.test.cc rename to senf/Utils/Termlib/main.test.cc diff --git a/Utils/Termlib/telnetServer.cc b/senf/Utils/Termlib/telnetServer.cc similarity index 100% rename from Utils/Termlib/telnetServer.cc rename to senf/Utils/Termlib/telnetServer.cc diff --git a/Utils/TypeIdValue.cc b/senf/Utils/TypeIdValue.cc similarity index 100% rename from Utils/TypeIdValue.cc rename to senf/Utils/TypeIdValue.cc diff --git a/Utils/TypeIdValue.cci b/senf/Utils/TypeIdValue.cci similarity index 100% rename from Utils/TypeIdValue.cci rename to senf/Utils/TypeIdValue.cci diff --git a/Utils/TypeIdValue.cti b/senf/Utils/TypeIdValue.cti similarity index 100% rename from Utils/TypeIdValue.cti rename to senf/Utils/TypeIdValue.cti diff --git a/Utils/TypeIdValue.hh b/senf/Utils/TypeIdValue.hh similarity index 100% rename from Utils/TypeIdValue.hh rename to senf/Utils/TypeIdValue.hh diff --git a/Utils/TypeIdValue.test.cc b/senf/Utils/TypeIdValue.test.cc similarity index 100% rename from Utils/TypeIdValue.test.cc rename to senf/Utils/TypeIdValue.test.cc diff --git a/Utils/TypeInfo.cc b/senf/Utils/TypeInfo.cc similarity index 100% rename from Utils/TypeInfo.cc rename to senf/Utils/TypeInfo.cc diff --git a/Utils/TypeInfo.hh b/senf/Utils/TypeInfo.hh similarity index 100% rename from Utils/TypeInfo.hh rename to senf/Utils/TypeInfo.hh diff --git a/Utils/TypeInfo.test.cc b/senf/Utils/TypeInfo.test.cc similarity index 100% rename from Utils/TypeInfo.test.cc rename to senf/Utils/TypeInfo.test.cc diff --git a/Utils/auto_unit_test.hh b/senf/Utils/auto_unit_test.hh similarity index 100% rename from Utils/auto_unit_test.hh rename to senf/Utils/auto_unit_test.hh diff --git a/Utils/hexdump.cc b/senf/Utils/hexdump.cc similarity index 100% rename from Utils/hexdump.cc rename to senf/Utils/hexdump.cc diff --git a/Utils/hexdump.cci b/senf/Utils/hexdump.cci similarity index 100% rename from Utils/hexdump.cci rename to senf/Utils/hexdump.cci diff --git a/Utils/hexdump.ct b/senf/Utils/hexdump.ct similarity index 100% rename from Utils/hexdump.ct rename to senf/Utils/hexdump.ct diff --git a/Utils/hexdump.hh b/senf/Utils/hexdump.hh similarity index 100% rename from Utils/hexdump.hh rename to senf/Utils/hexdump.hh diff --git a/Utils/hexdump.ih b/senf/Utils/hexdump.ih similarity index 100% rename from Utils/hexdump.ih rename to senf/Utils/hexdump.ih diff --git a/Utils/hexdump.test.cc b/senf/Utils/hexdump.test.cc similarity index 100% rename from Utils/hexdump.test.cc rename to senf/Utils/hexdump.test.cc diff --git a/Utils/impl/membind.hh b/senf/Utils/impl/membind.hh similarity index 100% rename from Utils/impl/membind.hh rename to senf/Utils/impl/membind.hh diff --git a/Utils/intrusive_refcount.cc b/senf/Utils/intrusive_refcount.cc similarity index 100% rename from Utils/intrusive_refcount.cc rename to senf/Utils/intrusive_refcount.cc diff --git a/Utils/intrusive_refcount.cci b/senf/Utils/intrusive_refcount.cci similarity index 100% rename from Utils/intrusive_refcount.cci rename to senf/Utils/intrusive_refcount.cci diff --git a/Utils/intrusive_refcount.cti b/senf/Utils/intrusive_refcount.cti similarity index 100% rename from Utils/intrusive_refcount.cti rename to senf/Utils/intrusive_refcount.cti diff --git a/Utils/intrusive_refcount.hh b/senf/Utils/intrusive_refcount.hh similarity index 100% rename from Utils/intrusive_refcount.hh rename to senf/Utils/intrusive_refcount.hh diff --git a/Utils/intrusive_refcount.test.cc b/senf/Utils/intrusive_refcount.test.cc similarity index 100% rename from Utils/intrusive_refcount.test.cc rename to senf/Utils/intrusive_refcount.test.cc diff --git a/Socket/main.test.cc b/senf/Utils/main.test.cc similarity index 100% rename from Socket/main.test.cc rename to senf/Utils/main.test.cc diff --git a/Utils/membind.hh b/senf/Utils/membind.hh similarity index 100% rename from Utils/membind.hh rename to senf/Utils/membind.hh diff --git a/Utils/membind.test.cc b/senf/Utils/membind.test.cc similarity index 100% rename from Utils/membind.test.cc rename to senf/Utils/membind.test.cc diff --git a/Utils/mpl.hh b/senf/Utils/mpl.hh similarity index 100% rename from Utils/mpl.hh rename to senf/Utils/mpl.hh diff --git a/Utils/mpl.ih b/senf/Utils/mpl.ih similarity index 100% rename from Utils/mpl.ih rename to senf/Utils/mpl.ih diff --git a/Utils/mpl.test.cc b/senf/Utils/mpl.test.cc similarity index 100% rename from Utils/mpl.test.cc rename to senf/Utils/mpl.test.cc diff --git a/Utils/parameter.hh b/senf/Utils/parameter.hh similarity index 100% rename from Utils/parameter.hh rename to senf/Utils/parameter.hh diff --git a/Utils/parameter.test.cc b/senf/Utils/parameter.test.cc similarity index 100% rename from Utils/parameter.test.cc rename to senf/Utils/parameter.test.cc diff --git a/Utils/pool_alloc_mixin.cti b/senf/Utils/pool_alloc_mixin.cti similarity index 100% rename from Utils/pool_alloc_mixin.cti rename to senf/Utils/pool_alloc_mixin.cti diff --git a/Utils/pool_alloc_mixin.hh b/senf/Utils/pool_alloc_mixin.hh similarity index 100% rename from Utils/pool_alloc_mixin.hh rename to senf/Utils/pool_alloc_mixin.hh diff --git a/Utils/pool_alloc_mixin.test.cc b/senf/Utils/pool_alloc_mixin.test.cc similarity index 100% rename from Utils/pool_alloc_mixin.test.cc rename to senf/Utils/pool_alloc_mixin.test.cc diff --git a/Utils/preprocessor.hh b/senf/Utils/preprocessor.hh similarity index 100% rename from Utils/preprocessor.hh rename to senf/Utils/preprocessor.hh diff --git a/Utils/preprocessor.test.cc b/senf/Utils/preprocessor.test.cc similarity index 100% rename from Utils/preprocessor.test.cc rename to senf/Utils/preprocessor.test.cc diff --git a/Utils/range.cti b/senf/Utils/range.cti similarity index 100% rename from Utils/range.cti rename to senf/Utils/range.cti diff --git a/Utils/range.hh b/senf/Utils/range.hh similarity index 100% rename from Utils/range.hh rename to senf/Utils/range.hh diff --git a/Utils/safe_bool.cci b/senf/Utils/safe_bool.cci similarity index 100% rename from Utils/safe_bool.cci rename to senf/Utils/safe_bool.cci diff --git a/Utils/safe_bool.cti b/senf/Utils/safe_bool.cti similarity index 100% rename from Utils/safe_bool.cti rename to senf/Utils/safe_bool.cti diff --git a/Utils/safe_bool.hh b/senf/Utils/safe_bool.hh similarity index 100% rename from Utils/safe_bool.hh rename to senf/Utils/safe_bool.hh diff --git a/Utils/safe_bool.test.cc b/senf/Utils/safe_bool.test.cc similarity index 100% rename from Utils/safe_bool.test.cc rename to senf/Utils/safe_bool.test.cc diff --git a/Utils/senfassert.hh b/senf/Utils/senfassert.hh similarity index 100% rename from Utils/senfassert.hh rename to senf/Utils/senfassert.hh diff --git a/Utils/signalnames.cc b/senf/Utils/signalnames.cc similarity index 100% rename from Utils/signalnames.cc rename to senf/Utils/signalnames.cc diff --git a/Utils/signalnames.hh b/senf/Utils/signalnames.hh similarity index 100% rename from Utils/signalnames.hh rename to senf/Utils/signalnames.hh diff --git a/Utils/singleton.cti b/senf/Utils/singleton.cti similarity index 100% rename from Utils/singleton.cti rename to senf/Utils/singleton.cti diff --git a/Utils/singleton.hh b/senf/Utils/singleton.hh similarity index 100% rename from Utils/singleton.hh rename to senf/Utils/singleton.hh diff --git a/Utils/singleton.test.cc b/senf/Utils/singleton.test.cc similarity index 100% rename from Utils/singleton.test.cc rename to senf/Utils/singleton.test.cc diff --git a/Utils/type_traits.hh b/senf/Utils/type_traits.hh similarity index 100% rename from Utils/type_traits.hh rename to senf/Utils/type_traits.hh diff --git a/Utils/type_traits.mpp b/senf/Utils/type_traits.mpp similarity index 100% rename from Utils/type_traits.mpp rename to senf/Utils/type_traits.mpp diff --git a/Utils/type_traits.test.cc b/senf/Utils/type_traits.test.cc similarity index 100% rename from Utils/type_traits.test.cc rename to senf/Utils/type_traits.test.cc diff --git a/config.hh b/senf/config.hh similarity index 100% rename from config.hh rename to senf/config.hh diff --git a/site_scons/Doxyfile b/site_scons/Doxyfile deleted file mode 100644 index f76c709..0000000 --- a/site_scons/Doxyfile +++ /dev/null @@ -1,8 +0,0 @@ -@INCLUDE = "$(TOPDIR)/doclib/Doxyfile.global" - -PROJECT_NAME = SENFSCons -BUILTIN_STL_SUPPORT = NO -FILE_PATTERNS = *.dox *.py -EXCLUDE_PATTERNS += __init__.py -OPTIMIZE_OUTPUT_JAVA = YES -ALPHABETICAL_INDEX = NO diff --git a/site_scons/Mainpage.dox b/site_scons/Mainpage.dox deleted file mode 100644 index 85ea790..0000000 --- a/site_scons/Mainpage.dox +++ /dev/null @@ -1,241 +0,0 @@ -// $Id$ -// -// Copyright (C) 2007 -// Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund -// -// 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., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -namespace senfscons { - -/** \mainpage The Senf Build Environment - - The Senf Build Environment is based on the SCons software - construction tool. SCons is a python based replacement for - \c make. SENFScons consists of several SCons builders as well as some global configuration and - build utilities. SENFScons tightly integrates the Boost.Test unit testing framework. It - also incorporates a very flexible infrastructure to build software documentation using Doxygen. This infrastructure uses quite a bit - of pre- and postprocessing (which is integrated with the provided Doxygen builder) to fix some - doxygen problems and generate a (IMHO) more readable layout. - - \autotoc - - \section senfutil_overview Building Projects using SENF - - When building projects using senf, SENFSCons has a very simple helper module \ref senfutil to - make the building of libraries utilizing senf simpler: - \code - import sys - sys.path.extend(('senf/senfscons','/usr/lib/senf/senfscons')) - import os.path, glob, senfutil - - env = Environment() - - senfutil.SetupForSENF( env ) - - env.Append( - - LIBS = [ ], - CXXFLAGS = [ '-Wall', '-Woverloaded-virtual' ], - LINKFLAGS = [ ], - - CXXFLAGS_debug = [ ], - LINKFLAGS_debug = [ ], - LOGLEVELS_debug = [ 'senf::log::Debug||VERBOSE' ], - - CXXFLAGS_final = [ '-O3' ], - LINKFLAGS_final = [ ], - LOGLEVELS_final = [ ], - - SENF_BUILDOPTS = [ ], - - ) - - env.Default( - env.Program( target = 'udpforward', - source = glob.glob('*.cc') ) - ) - - env.Clean(DEFAULT_TARGETS, [ 'udpforward.log', 'udpforward.pid' ]) - \endcode - - This example builds a simple binary from a number of source files (all '.cc' files). It links - against the SENF library and automatically sets all the correct compiler options using - senfutil.SetupForSENF( env ). - - This script automatically uses a SENF installation either symlinked or imported into the current - project in directory 'senf' or, if this directory does not exist, a globaly installed SENF. A - locally installed SENF is automatically recompiled if needed. Parallel building is also - supported. - - This script automatically supports the \c final and \c LOGLEVELS command line parameters. The - LOGLEVELS parameter uses a much more readable syntax than SENF_LOG_CONF: - 
    -    $ scons -j2 final=1 \
-          LOGLEVELS='senf::log::Debug||IMPORTANT myapp::Transactions|mytrans::Area|VERBOSE'
-
    - - \section senfscons_intro Introduction to the SENFSCons build system - - Here we give an overview on how SENF itself is built. The SENFSCons system aims to be quite - flexible at separates SENF specific tasks from generic tasks to facilitate reuse. - - \subsection senfscons_layout The Project Layout - - The SENFSCons infrastructure will always use a consistent directory layout. The top-level - directory will contain one subdirectory for every module. The main target will often be - considered to be just another module using the facilities provided by library modules. - - The top-level project directory must contain the SENFSCons module in 'senfscons'. - - The top-level \c SConstruct file will set up the global project configuration (which libraries - are used etc) and will then automatically load all module \c SConscript files. - - Documentation is generated per module. This simplifies reusing modules in other projects. The - framework however semi-automatically creates the necessary cross-reference information to - cross-link the different module documentations. The unit-tests as well are run on a per-module - basis. - - \subsection senfscons_buildconf Standard Build Configuration - - When the \c SConsctruct and \c SConscript files are build using the default SENFSCons helpers, - by default all libraries and binaries are built. Some additional targets are - -
    scons all_tests
    Build all unit tests
    - -
    scons all_docs
    Build documentation of all modules
    - -
    scons all
    Build all targets including binaries, libraries, documentation, - tests and possible further targets
    - -
    scons -u doc
    Run from within a module directory will build the - documentation of that module
    - -
    scons -u test
    Run from within a module directory will build and run the - unit test of that module
    - - To clean any of the targets use the SCons \c -c parameter. - - The build environment can be configured \e locally using \ref sconfig in the project root - directory. - - \see - \ref sconstruct \n - \ref sconscript \n - \ref sconfig \n - \ref builder - */ - -/** \page sconstruct The Top-Level 'SConstruct' File - - The top-level \c SConstruct file sets up the build, configures used libraries and parameters and - invokes the module \c SConscript files. To simplify the configuration, the SENFScons python - package is provided. This package has helper utilities to simplify standard tasks. - - In \c senfscons/SConstruct.template you may find an example SConstruct file. Copy this to the - project root (under the name \c SConstruct) to start a new project. You can then modify and - configure it to your wishes. - - The general structure of the \c SConstruct file is - \li make the \c senfscons directory accessible - \li tell the SENFScons infrastructure, which frameworks you intend to use and let SENFScons - built a construction environment for you - \li configure the construction environment - \li load module sconscript file - \li specify global build targets - - The first part, making the \c senfscons directory accessible will always stay the - same. See the template file for how this is done. - - Simplifying the use of more complex frameworks is one of the most important things why - SENFScons exists. If you only use very simple libraries, the configuration is quite - simple. However for more complex frameworks the configuration can get quite complicated. This is - simplified using the SENFScons framework statements. They all reside in the \c SENFSCons package - and have a prefix of \c Use. See \ref use. - - After all frameworks are configured, you can use SEFNScons.MakeEnvironment() to create a - correctly configured construction environment. - - To configure the construction environment you can set Variables in the construction - environment. See the SCons manpage for a list of supported variables. Some additional variables - are available with the new builders introduced with SENFSCons. Those are documented with the - builder module documentation. - - Loading the module \c SConscript files will normally always be performed the same way - using \c glob.glob() to automatically include any subdirectory module. - - You may then specify global build targets. You can use standard SCons targets or use all - the target helpers provided with SENFSCons. Two standard helpers should always be included: - SENFSCons.StandardTargets() and SENFSCons.GlobalTargets(). You can find more target helpers at - \ref target - - The SConstruct file is an ordinary python file. It is loaded by SCons prior to building the - software. Just remember, you can use all of python and all of SCons here. SENFScons just - provides some additional helpers to make things simpler and more concise. - - \see - \ref use \n - \ref target - */ - -/** \page sconscript The Module 'SConscript' Files - - Every module (that is subdirectory) is built by that modules \c SConscript file. In \c - SConscript.template you can find a template of such a file. - - Every \c SConscript file starts by importing the construction environment. The \c SConscript - file is an ordinary \c SConscript file as used by SCons. You may use any of the SCons facilities - to define targets. However, you will mostly use the \ref target. - - Every \c SConscript file should call \c SENFSCons.StandardTargets() to initialize the standard - targets of every module. - - \see - \ref target - */ - -/** \page sconfig The 'SConfig' File - - To configure the build environment to the local environment, a \c SConfig file may be created in - the projects root directory. The supported parameters are - -
    -
    \c CXX
    -
    C++ compiler to use
    -
    \c EXTRA_DEFINES
    -
    preprocessor symbols to be defined locally
    -
    \c EXTRA_LIBS
    -
    additional libraries needed for a local build
    -
    - - Additionally, the \ref use define additional configuration variables which may be set here. - */ - -} - - -// Local Variables: -// mode: c++ -// fill-column: 100 -// c-file-style: "senf" -// indent-tabs-mode: nil -// ispell-local-dictionary: "american" -// mode: flyspell -// mode: auto-fill -// End: diff --git a/site_scons/SConscript b/site_scons/SConscript deleted file mode 100644 index d4cc4aa..0000000 --- a/site_scons/SConscript +++ /dev/null @@ -1,6 +0,0 @@ -Import('env') -import SENFSCons - -########################################################################### - -SENFSCons.Doxygen(env)