From 6964bb9a7127d4601f9d9779006b38b78c793396 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Thu, 20 Aug 2009 08:27:10 +0000
Subject: [PATCH] Remove SENFSCons.StandardTargets and SENFSCons.GlobalTargets
---
PPI/SConscript | 2 +-
Packets/80211Bundle/SConscript | 1 -
Packets/80221Bundle/SConscript | 1 -
Packets/DefaultBundle/SConscript | 2 +-
Packets/MPEGDVBBundle/SConscript | 1 -
Packets/SConscript | 1 -
SConstruct | 13 +++----------
Scheduler/SConscript | 1 -
Socket/Protocols/SConscript | 2 --
Socket/SConscript | 1 -
Utils/Console/SConscript | 1 -
Utils/Daemon/SConscript | 1 -
Utils/Logger/SConscript | 1 -
Utils/SConscript | 1 -
Utils/Termlib/SConscript | 1 -
senfscons/SConscript | 1 -
senfscons/SENFSCons.py | 22 ----------------------
17 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/PPI/SConscript b/PPI/SConscript
index de2d369b0..b7ee214c8 100644
--- a/PPI/SConscript
+++ b/PPI/SConscript
@@ -10,7 +10,7 @@ SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
and not f.endswith('.test.hh') ])
sources, includes = SENFSCons.Glob(env, subdirs=[ 'detail' ])
-SENFSCons.StandardTargets(env)
+
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env, extra_sources=[
env.Dia2Png('scenario.dia'),
diff --git a/Packets/80211Bundle/SConscript b/Packets/80211Bundle/SConscript
index 2f25bc2d4..ac3152232 100644
--- a/Packets/80211Bundle/SConscript
+++ b/Packets/80211Bundle/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Object(env, target='80211Bundle', sources=sources)
SENFSCons.Lib(env, sources=sources[0])
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Packets/80221Bundle/SConscript b/Packets/80221Bundle/SConscript
index e8ad4486e..c065a7b1e 100644
--- a/Packets/80221Bundle/SConscript
+++ b/Packets/80221Bundle/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Object(env, target = '80221Bundle', sources=sources)
SENFSCons.Lib(env, sources[0])
diff --git a/Packets/DefaultBundle/SConscript b/Packets/DefaultBundle/SConscript
index 1f703127a..47b7a1132 100644
--- a/Packets/DefaultBundle/SConscript
+++ b/Packets/DefaultBundle/SConscript
@@ -6,7 +6,7 @@ import SENFSCons, glob
###########################################################################
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
+
SENFSCons.Object(env, target='DefaultBundle', sources=sources)
SENFSCons.Lib(env, sources[0])
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Packets/MPEGDVBBundle/SConscript b/Packets/MPEGDVBBundle/SConscript
index b998615cd..654bbe52c 100644
--- a/Packets/MPEGDVBBundle/SConscript
+++ b/Packets/MPEGDVBBundle/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Object(env, target='MPEGDVBBundle', sources=sources)
SENFSCons.Lib(env, sources[0])
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Packets/SConscript b/Packets/SConscript
index 64482f213..55bf07c5b 100644
--- a/Packets/SConscript
+++ b/Packets/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env, extra_sources = [
env.Dia2Png("structure.dia"),
diff --git a/SConstruct b/SConstruct
index cca03b8a6..df9190b55 100644
--- a/SConstruct
+++ b/SConstruct
@@ -36,12 +36,6 @@ fixlinks Fix broken links in doxygen documentation
valgrind Run all tests under valgrind/memcheck
""")
-# Compile options
-
-# Options used to debug inlining:
-#
-# BEWARE: You need lots of ram to compile with these settings (approx 1G)
-
class BuildTypeOptions:
def __init__(self, var):
self._var = var
@@ -52,7 +46,7 @@ class BuildTypeOptions:
env.Append(
ENV = { 'PATH' : os.environ.get('PATH') },
- CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ],
+ CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*', '.sconsign' ],
CPPPATH = [ '#/include' ],
LOCALLIBDIR = '#',
@@ -145,10 +139,9 @@ if os.path.exists('SConscript.local'):
SConscript(list(set(glob.glob("*/SConscript")) - set(initSConscripts)))
# Define the main targets
-SENFSCons.StandardTargets(env)
-SENFSCons.GlobalTargets(env)
+env.Alias('all', [ 'default', 'all_tests', 'all_docs' ])
-env.Depends( SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION']) )
+env.Depends(SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION']))
libsenf = env.Library(env.subst("$LIBSENF$LIBADDSUFFIX"), env['ALLOBJECTS'])
env.Default(libsenf)
diff --git a/Scheduler/SConscript b/Scheduler/SConscript
index fe44ea8d5..73103906d 100644
--- a/Scheduler/SConscript
+++ b/Scheduler/SConscript
@@ -7,7 +7,6 @@ import SENFSCons
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Socket/Protocols/SConscript b/Socket/Protocols/SConscript
index 6e76b2540..dee839eb5 100644
--- a/Socket/Protocols/SConscript
+++ b/Socket/Protocols/SConscript
@@ -7,8 +7,6 @@ import SENFSCons, glob
SConscript(glob.glob("*/SConscript"))
-SENFSCons.StandardTargets(env)
-
sources, includes = SENFSCons.Glob(env)
SENFSCons.Lib(env, sources)
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Socket/SConscript b/Socket/SConscript
index 9b0870f9a..0e7b440dd 100644
--- a/Socket/SConscript
+++ b/Socket/SConscript
@@ -12,7 +12,6 @@ SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources = sources)
SENFSCons.Doxygen(env, extra_sources = [
env.Dia2Png('SocketLibrary-classes.dia'),
diff --git a/Utils/Console/SConscript b/Utils/Console/SConscript
index c54f55c99..026e3c26e 100644
--- a/Utils/Console/SConscript
+++ b/Utils/Console/SConscript
@@ -7,7 +7,6 @@ import SENFSCons
sources, includes = SENFSCons.Glob(env, exclude=['testServer.cc'])
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/Daemon/SConscript b/Utils/Daemon/SConscript
index a3ece3dcb..1b7e8febe 100644
--- a/Utils/Daemon/SConscript
+++ b/Utils/Daemon/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/Logger/SConscript b/Utils/Logger/SConscript
index a25eedeea..a3803c6f8 100644
--- a/Utils/Logger/SConscript
+++ b/Utils/Logger/SConscript
@@ -11,7 +11,6 @@ SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
sources, includes = SENFSCons.Glob(env)
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/SConscript b/Utils/SConscript
index e07dec065..a39548afc 100644
--- a/Utils/SConscript
+++ b/Utils/SConscript
@@ -7,7 +7,6 @@ import SENFSCons, glob, os.path
sources, includes = SENFSCons.Glob(env, subdirs=[ 'impl' ])
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/Utils/Termlib/SConscript b/Utils/Termlib/SConscript
index 7fe6526a2..ffacf97fa 100644
--- a/Utils/Termlib/SConscript
+++ b/Utils/Termlib/SConscript
@@ -7,7 +7,6 @@ import SENFSCons
sources, includes = SENFSCons.Glob(env, exclude=[ 'telnetServer.cc'])
-SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
diff --git a/senfscons/SConscript b/senfscons/SConscript
index d63adf46f..d4cc4aab0 100644
--- a/senfscons/SConscript
+++ b/senfscons/SConscript
@@ -3,5 +3,4 @@ import SENFSCons
###########################################################################
-SENFSCons.StandardTargets(env)
SENFSCons.Doxygen(env)
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 176b8ea67..767c03106 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -78,28 +78,6 @@ def Glob(env, exclude=[], subdirs=[]):
return ( GlobSources(env, exclude, subdirs),
GlobIncludes(env, exclude, subdirs) )
-## \brief Add generic standard targets for every module
-#
-# This target helper should be called in the top-level \c SConstruct file
-# as well as in every module \c SConscipt file. It adds general
-# targets. Right now, these are
-# \li clean up \c .sconsign, \c .sconf_temp and \c config.log on
-# <tt>scons -c all</tt>
-#
-# \ingroup target
-def StandardTargets(env):
- env.Clean(env.Alias('all'), [ '.sconsign', '.sconf_temp', 'config.log' ])
-
-## \brief Add generic global targets
-#
-# This target helper should be called in the top-level \c SConstruct
-# file. It adds general global targets. Right now theese are
-# \li Make <tt>scons all</tt> build all targets.
-#
-# \ingroup target
-def GlobalTargets(env):
- env.Alias('all', [ 'default', 'all_tests', 'all_docs' ])
-
## \brief Return path of a built library within $LOCALLIBDIR
# \internal
def LibPath(lib): return '${LOCALLIBDIR}/${LIBPREFIX}%s${LIBADDSUFFIX}${LIBSUFFIX}' % lib
--
GitLab