Skip to content
Snippets Groups Projects
Commit 5b4fabb2 authored by g0dil's avatar g0dil
Browse files

Completely refactor install targets

parent 1b6f9016
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 168 deletions
Examples/MCSniffer/SConscript
+ 1
− 2
View file @ 5b4fabb2
......@@ -3,6 +3,5 @@ import SENFSCons
###########################################################################
SENFSCons.Binary(env, 'mcsniffer', SENFSCons.GlobSources(),
LIBS = [ 'Scheduler', 'Packets', 'Socket', 'Utils' ],
SENFSCons.Binary(env, 'mcsniffer', SENFSCons.GlobSources(env),
OBJECTS = [ '#/Packets/DefaultBundle/DefaultBundle.o' ]);
Examples/MultiMCLoop/SConscript
+ 1
− 2
View file @ 5b4fabb2
......@@ -3,5 +3,4 @@ import SENFSCons
###########################################################################
SENFSCons.Binary(env, 'multimcloop', [ 'MultiMCLoop.cc' ],
LIBS = [ 'Scheduler', 'Socket', 'Utils' ])
SENFSCons.Binary(env, 'multimcloop', [ 'MultiMCLoop.cc' ])
Examples/RateStuffer/SConscript
+ 1
− 3
View file @ 5b4fabb2
......@@ -3,9 +3,7 @@ import SENFSCons
###########################################################################
SENFSCons.Binary( env, 'ratestuffer', SENFSCons.GlobSources(),
LIBS = [ 'PPI', 'Scheduler', 'Packets', 'Socket', 'Utils' ] );
SENFSCons.Binary(env, 'ratestuffer', SENFSCons.GlobSources(env));
SENFSCons.Doxygen(env, extra_sources=[
env.Dia2Png('ratestuffer.dia')
])
Examples/Sniffer/SConscript
+ 1
− 4
View file @ 5b4fabb2
......@@ -3,8 +3,5 @@ import SENFSCons
###########################################################################
SENFSCons.Binary(env, 'sniffer', SENFSCons.GlobSources(), LIBS = [
'Packets_DefaultBundle', 'Packets_MPEGDVBBundle',
'Scheduler', 'Packets', 'Socket', 'Utils' ])
SENFSCons.Binary(env, 'sniffer', SENFSCons.GlobSources(env))
SENFSCons.Doxygen(env)
Examples/TCPClientServer/SConscript
+ 2
− 5
View file @ 5b4fabb2
......@@ -3,8 +3,5 @@ import SENFSCons
###########################################################################
SENFSCons.Binary(env, 'client', 'client.cc',
LIBS = [ 'Packets', 'Socket', 'Scheduler', 'Utils' ]);
SENFSCons.Binary(env, 'server', 'server.cc',
LIBS = [ 'Scheduler', 'Packets', 'Socket', 'Scheduler', 'Utils' ]);
SENFSCons.Binary(env, 'client', 'client.cc');
SENFSCons.Binary(env, 'server', 'server.cc');
Examples/UDPClientServer/SConscript
+ 2
− 6
View file @ 5b4fabb2
......@@ -3,10 +3,6 @@ import SENFSCons
###########################################################################
SENFSCons.Binary(env, 'udpClient', 'udpClient.cc',
LIBS = [ 'Packets', 'Socket', 'Scheduler', 'Utils' ]);
SENFSCons.Binary(env, 'udpServer', 'udpServer.cc',
LIBS = [ 'Scheduler', 'Packets', 'Socket', 'Scheduler', 'Utils' ]);
SENFSCons.Binary(env, 'udpClient', 'udpClient.cc');
SENFSCons.Binary(env, 'udpServer', 'udpServer.cc',);
SENFSCons.Doxygen(env)
PPI/SConscript
+ 6
− 12
View file @ 5b4fabb2
......@@ -3,24 +3,18 @@ import SENFSCons, glob
###########################################################################
SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
if f not in ('all_includes.hh','PPI.hh') and not f.endswith('.test.hh') ])
SConscript(glob.glob("*/SConscript"))
sources = SENFSCons.GlobSources(subdirs=[ 'detail' ])
SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
if f not in ('all_includes.hh','PPI.hh') \
and not f.endswith('.test.hh') ])
sources, includes = SENFSCons.Glob(env, subdirs=[ 'detail' ])
SENFSCons.StandardTargets(env)
SENFSCons.Lib(env,
library = 'PPI',
sources = sources,
LIBS = [ 'Scheduler', 'Packets', 'Logger', 'Console', 'Socket', 'Utils' ])
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env, extra_sources=[
env.Dia2Png('scenario.dia'),
env.Dia2Png('classes.dia'),
env.Dia2Png('ratestuffer.dia'),
])
SENFSCons.InstallIncludeFiles(env, [ 'PPI.hh', 'all_includes.hh' ])
SENFSCons.InstallIncludeFiles(env, includes)
Packets/80211Bundle/SConscript
+ 4
− 11
View file @ 5b4fabb2
......@@ -5,18 +5,11 @@ import SENFSCons, glob
###########################################################################
sources = SENFSCons.GlobSources()
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)
SENFSCons.Object(env,
target = '80211Bundle',
sources=sources,
LIBS = ['Packets', 'Socket', 'Utils'])
SENFSCons.Lib(env,
library = 'Packets_80211Bundle',
sources = sources[0],
no_includes = 1)
SConscript(glob.glob("*/SConscript"))
Packets/DefaultBundle/SConscript
+ 4
− 12
View file @ 5b4fabb2
......@@ -5,18 +5,10 @@ import SENFSCons, glob
###########################################################################
sources = SENFSCons.GlobSources()
sources, includes = SENFSCons.Glob(env)
SENFSCons.StandardTargets(env)
SENFSCons.Object(env, target='DefaultBundle', sources=sources)
SENFSCons.Lib(env, sources[0])
SENFSCons.InstallIncludeFiles(env, includes)
SENFSCons.Object(env,
target = 'DefaultBundle',
sources=sources,
LIBS = ['Packets', 'Socket', 'Utils'])
SENFSCons.Lib(env,
library = 'Packets_DefaultBundle',
sources = sources[0],
no_includes = 1)
SConscript(glob.glob("*/SConscript"))
Packets/DefaultBundle/extra_tests/SConscript
+ 1
− 2
View file @ 5b4fabb2
......@@ -5,5 +5,4 @@ import SENFSCons, glob
###########################################################################
SENFSCons.Test(env, sources = glob.glob("*.test.cc"),
LIBS = [ 'Packets_DefaultBundle', 'Packets', 'Socket', 'Utils' ])
SENFSCons.Test(env, sources = glob.glob("*.test.cc"))
Packets/MPEGDVBBundle/SConscript
+ 4
− 11
View file @ 5b4fabb2
......@@ -5,16 +5,9 @@ import SENFSCons, glob
###########################################################################
sources = SENFSCons.GlobSources()
sources, includes = SENFSCons.Glob(env)
SENFSCons.StandardTargets(env)
SENFSCons.Object(env,
target = 'MPEGDVBBundle',
sources = sources,
LIBS = ['Packets_DefaultBundle', 'Packets', 'Socket', 'Utils'])
SENFSCons.Lib(env,
library = 'Packets_MPEGDVBBundle',
sources = sources[0],
no_includes = 1)
SENFSCons.Object(env, target='MPEGDVBBundle', sources=sources)
SENFSCons.Lib(env, sources[0])
SENFSCons.InstallIncludeFiles(env, includes)
Packets/SConscript
+ 3
− 7
View file @ 5b4fabb2
......@@ -5,19 +5,15 @@ import SENFSCons, glob
###########################################################################
#SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
# if 'defined(HH_Packets__decls_)' in file(f).read() ])
sources, includes = SENFSCons.Glob(env)
SENFSCons.StandardTargets(env)
SENFSCons.Lib(env,
library = 'Packets',
sources = SENFSCons.GlobSources(),
LIBS = [ 'Logger', 'Scheduler', 'Socket', 'Utils' ])
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env, extra_sources = [
env.Dia2Png("structure.dia"),
env.Dia2Png("MPEGDVBBundle/TLV.dia")
])
SENFSCons.InstallIncludeFiles(env, includes)
SConscript(glob.glob("*/SConscript"))
SENFSCons.InstallIncludeFiles(env, [ 'parse_fixed_setup.hh' , 'parse_setup.hh' ])
Scheduler/SConscript
+ 4
− 7
View file @ 5b4fabb2
......@@ -5,12 +5,9 @@ import SENFSCons
###########################################################################
sources = SENFSCons.GlobSources()
SENFSCons.StandardTargets(env)
SENFSCons.Lib(env,
library = 'Scheduler',
sources = sources,
LIBS = [ 'Logger', 'Scheduler', 'Console', 'Utils' ])
sources, includes = SENFSCons.Glob(env)
SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
Socket/Protocols/DVB/SConscript
+ 5
− 13
View file @ 5b4fabb2
......@@ -5,20 +5,12 @@ import SENFSCons, glob
###########################################################################
SConscript(glob.glob("*/SConscript"))
SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
if f not in ('all_includes.hh','DVB.hh') and not f.endswith('.test.hh') ])
sources = SENFSCons.GlobSources()
allob = []
allob.extend(
SENFSCons.Objects( env, sources = sources, LIBS = [ 'Socket', 'Scheduler', 'Utils' ] ) )
for sc in glob.glob("*/SConscript"):
ob = SConscript(sc)
if ob : allob.extend(ob)
SENFSCons.InstallIncludeFiles(env, [ 'DVB.hh', 'all_includes.hh' ])
sources, includes = SENFSCons.Glob(env)
Return('allob')
SENFSCons.Lib(env, sources)
SENFSCons.InstallIncludeFiles(env, includes)
Socket/Protocols/INet/SConscript
+ 5
− 13
View file @ 5b4fabb2
......@@ -5,20 +5,12 @@ import SENFSCons, glob
###########################################################################
SConscript(glob.glob("*/SConscript"))
SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
if f not in ('all_includes.hh','INet.hh') and not f.endswith('.test.hh') ])
sources = SENFSCons.GlobSources()
allob = []
allob.extend(
SENFSCons.Objects( env, sources = sources, LIBS = [ 'Socket', 'Scheduler', 'Utils' ] ) )
for sc in glob.glob("*/SConscript"):
ob = SConscript(sc)
if ob : allob.extend(ob)
SENFSCons.InstallIncludeFiles(env, [ 'INet.hh', 'all_includes.hh' ])
sources, includes = SENFSCons.Glob(env)
Return('allob')
SENFSCons.Lib(env, sources)
SENFSCons.InstallIncludeFiles(env, includes)
Socket/Protocols/Raw/SConscript
+ 5
− 13
View file @ 5b4fabb2
......@@ -5,20 +5,12 @@ import SENFSCons, glob
###########################################################################
SConscript(glob.glob("*/SConscript"))
SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
if f not in ('all_includes.hh','Raw.hh') and not f.endswith('.test.hh') ])
sources = SENFSCons.GlobSources()
allob = []
allob.extend(
SENFSCons.Objects( env, sources = sources, LIBS = [ 'Socket', 'Scheduler', 'Utils' ] ) )
for sc in glob.glob("*/SConscript"):
ob = SConscript(sc)
if ob : allob.extend(ob)
SENFSCons.InstallIncludeFiles(env, [ 'Raw.hh', 'all_includes.hh' ])
sources, includes = SENFSCons.Glob(env)
Return('allob')
SENFSCons.Lib(env, sources)
SENFSCons.InstallIncludeFiles(env, includes)
Socket/Protocols/SConscript
+ 5
− 10
View file @ 5b4fabb2
......@@ -5,15 +5,10 @@ import SENFSCons, glob
###########################################################################
SENFSCons.StandardTargets(env)
sources = SENFSCons.GlobSources()
objects = SENFSCons.Objects( env, sources = sources, LIBS = [ 'Socket', 'Scheduler', 'Utils' ] )
SConscript(glob.glob("*/SConscript"))
for sc in glob.glob("*/SConscript"):
ob = SConscript(sc)
if ob : objects.extend(ob)
SENFSCons.InstallIncludeFiles(env, [ 'INet.hh', 'Raw.hh', 'DVB.hh', 'UN.hh' ])
SENFSCons.StandardTargets(env)
Return('objects')
sources, includes = SENFSCons.Glob(env)
SENFSCons.Lib(env, sources)
SENFSCons.InstallIncludeFiles(env, includes)
Socket/Protocols/UN/SConscript
+ 5
− 13
View file @ 5b4fabb2
......@@ -5,20 +5,12 @@ import SENFSCons, glob
###########################################################################
SConscript(glob.glob("*/SConscript"))
SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
if f not in ('all_includes.hh','UN.hh') and not f.endswith('.test.hh') ])
sources = SENFSCons.GlobSources()
allob = []
allob.extend(
SENFSCons.Objects( env, sources = sources, LIBS = [ 'Socket', 'Scheduler', 'Utils' ] ) )
for sc in glob.glob("*/SConscript"):
ob = SConscript(sc)
if ob : allob.extend(ob)
SENFSCons.InstallIncludeFiles(env, [ 'UN.hh', 'all_includes.hh' ])
sources, includes = SENFSCons.Glob(env)
Return('allob')
SENFSCons.Lib( env, sources)
SENFSCons.InstallIncludeFiles(env, includes)
Socket/SConscript
+ 5
− 15
View file @ 5b4fabb2
......@@ -5,24 +5,15 @@ import SENFSCons, glob
###########################################################################
SConscript(glob.glob("*/SConscript"))
SENFSCons.AllIncludesHH(env, [ f for f in glob.glob("*.hh")
if f not in ('all_includes.hh','Socket.hh') and not f.endswith('.test.hh') ])
sources, testSources = SENFSCons.GlobSources()
sources, includes = SENFSCons.Glob(env)
SENFSCons.StandardTargets(env)
subob = []
for sc in glob.glob("*/SConscript"):
ob = SConscript(sc)
if ob : subob.extend(ob)
SENFSCons.Lib(env,
library = 'Socket',
sources = sources + subob,
testSources = testSources,
LIBS = [ 'Utils' ])
SENFSCons.Lib(env, sources = sources)
SENFSCons.Doxygen(env, extra_sources = [
env.Dia2Png('SocketLibrary-classes.dia'),
env.Dia2Png('FhHierarchy.dia'),
......@@ -30,5 +21,4 @@ SENFSCons.Doxygen(env, extra_sources = [
env.Dia2Png('Protocols.dia'),
env.Dia2Png('Handle.dia'),
])
SENFSCons.InstallIncludeFiles(env, [ 'Socket.hh', 'all_includes.hh' ])
SENFSCons.InstallIncludeFiles(env, includes)
Utils/Console/SConscript
+ 4
− 7
View file @ 5b4fabb2
......@@ -5,12 +5,9 @@ import SENFSCons
###########################################################################
sources = SENFSCons.GlobSources(exclude=['testServer.cc'])
SENFSCons.StandardTargets(env)
SENFSCons.Lib(env,
library = 'Console',
sources = sources,
LIBS = [ 'Socket', 'Scheduler', 'Utils' ])
sources, includes = SENFSCons.Glob(env, exclude=['testServer.cc'])
SENFSCons.StandardTargets(env)
SENFSCons.Lib(env, sources)
SENFSCons.Doxygen(env)
SENFSCons.InstallIncludeFiles(env, includes)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Datenschutz und Impressum