diff --git a/Packets/SConscript b/Packets/SConscript index d4a304a5ca5e0967aaa1ffb68fc8aa71317016f8..9db975b9269bfb6d725788133db7beec34f8f1fb 100644 --- a/Packets/SConscript +++ b/Packets/SConscript @@ -1,13 +1,13 @@ # -*- python -*- Import('env') -import SatSCons +import SENFSCons ########################################################################### -sources = SatSCons.GlobSources() -SatSCons.StandardTargets(env) -SatSCons.Lib(env, 'Packets', sources, ) -SatSCons.Doxygen(env, extra_sources = [ +sources = SENFSCons.GlobSources() +SENFSCons.StandardTargets(env) +SENFSCons.Lib(env, 'Packets', sources, ) +SENFSCons.Doxygen(env, extra_sources = [ env.Dia2Png("structure.dia") ]) diff --git a/SConstruct b/SConstruct index cb087e72100abecede9dd5604090ab599fe88e5d..3b389040c53f0ea59dabb94f1c91a58c85b21fe0 100644 --- a/SConstruct +++ b/SConstruct @@ -2,13 +2,13 @@ import sys, glob, os.path sys.path.append('senfscons') -import SatSCons +import SENFSCons ########################################################################### -SatSCons.UseBoost() -SatSCons.UseSTLPort() -env = SatSCons.MakeEnvironment() +SENFSCons.UseBoost() +SENFSCons.UseSTLPort() +env = SENFSCons.MakeEnvironment() env.Append( CPPPATH = [ '#' ], @@ -21,8 +21,8 @@ Export('env') SConscript(glob.glob("*/SConscript")) -SatSCons.StandardTargets(env) -SatSCons.GlobalTargets(env) -SatSCons.Doxygen(env) +SENFSCons.StandardTargets(env) +SENFSCons.GlobalTargets(env) +SENFSCons.Doxygen(env) if not os.path.exists("Doxyfile.local") : Execute(Touch("Doxyfile.local")) diff --git a/Scheduler/SConscript b/Scheduler/SConscript index cbdb925968c1e6deb51d1f28507c29ae58f985d2..ef26f802626a0d9f88a4f66615b6295b4e76131b 100644 --- a/Scheduler/SConscript +++ b/Scheduler/SConscript @@ -1,14 +1,14 @@ # -*- python -*- Import('env') -import SatSCons +import SENFSCons ########################################################################### -sources = SatSCons.GlobSources() -SatSCons.StandardTargets(env) -SatSCons.Lib(env, +sources = SENFSCons.GlobSources() +SENFSCons.StandardTargets(env) +SENFSCons.Lib(env, library = 'Scheduler', sources = sources, LIBS = [ 'Socket', 'Utils' ]) -SatSCons.Doxygen(env) +SENFSCons.Doxygen(env) diff --git a/Sniffer/SConscript b/Sniffer/SConscript index 6862abeeb34d9f22767196473c6f2e78fe95546f..de8f21bf32bba3f61f8956ce1267a97e20b96eab 100644 --- a/Sniffer/SConscript +++ b/Sniffer/SConscript @@ -1,7 +1,7 @@ Import('env') -import SatSCons +import SENFSCons ########################################################################### -SatSCons.Binary(env, 'sniffer', SatSCons.GlobSources(), +SENFSCons.Binary(env, 'sniffer', SENFSCons.GlobSources(), LIBS = [ 'Packets', 'Socket', 'Utils' ]); diff --git a/Socket/SConscript b/Socket/SConscript index 27cb277ed974ed0abf8f4030786d6c19e291a9d6..8925f1fa5756c11cfd867ebeebbf3d5f7c08e7d2 100644 --- a/Socket/SConscript +++ b/Socket/SConscript @@ -1,19 +1,19 @@ # -*- python -*- Import('env') -import SatSCons +import SENFSCons ########################################################################### -sources = SatSCons.GlobSources() +sources = SENFSCons.GlobSources() -SatSCons.StandardTargets(env) +SENFSCons.StandardTargets(env) -SatSCons.Lib(env, +SENFSCons.Lib(env, library = 'Socket', sources = sources, LIBS = [ 'Utils' ]) -SatSCons.Doxygen(env, extra_sources = [ +SENFSCons.Doxygen(env, extra_sources = [ env.Dia2Png('SocketLibrary-classes.dia') ]) diff --git a/Utils/SConscript b/Utils/SConscript index c679e5f1d8962c102db446767f897f464dcbbecd..baa117a22748ff116e0499fd2270a1e13542c0b3 100644 --- a/Utils/SConscript +++ b/Utils/SConscript @@ -1,11 +1,11 @@ # -*- python -*- Import('env') -import SatSCons +import SENFSCons ########################################################################### -sources = SatSCons.GlobSources() -SatSCons.StandardTargets(env) -SatSCons.Lib(env, 'Utils', sources) -SatSCons.Doxygen(env) +sources = SENFSCons.GlobSources() +SENFSCons.StandardTargets(env) +SENFSCons.Lib(env, 'Utils', sources) +SENFSCons.Doxygen(env) diff --git a/senfscons/SConscript b/senfscons/SConscript index 7c154a03e987ca6b69ea999f6b172913e10e5af4..d63adf46f90118195652b6e6acc8d829637acb5b 100644 --- a/senfscons/SConscript +++ b/senfscons/SConscript @@ -1,7 +1,7 @@ Import('env') -import SatSCons +import SENFSCons ########################################################################### -SatSCons.StandardTargets(env) -SatSCons.Doxygen(env) +SENFSCons.StandardTargets(env) +SENFSCons.Doxygen(env) diff --git a/senfscons/SConscript.template b/senfscons/SConscript.template index fc1c095c2a0c3e2eb9d7750f54fc5fb2dc5ba0fa..1914d2ed32879006e66af40b0726197f071dfe69 100644 --- a/senfscons/SConscript.template +++ b/senfscons/SConscript.template @@ -1,10 +1,10 @@ Import('env') -import SatSCons +import SENFSCons ########################################################################### -SatSCons.StandardTargets(env) +SENFSCons.StandardTargets(env) -# SatSCons.Lib(env, +# SENFSCons.Lib(env, # library = 'Test', -# sources = SatSCons.GlobSources()) +# sources = SENFSCons.GlobSources()) diff --git a/senfscons/SConstruct.template b/senfscons/SConstruct.template index 68034794bd88edd5aaae050b4a676408b1cd7ecb..ae815e66de5361bdc857a0c1d10aab220204a74b 100644 --- a/senfscons/SConstruct.template +++ b/senfscons/SConstruct.template @@ -1,12 +1,12 @@ import sys, glob sys.path.append('senfscons') -import SatSCons +import SENFSCons ########################################################################### -SatSCons.UseBoost(); -SatSCons.UseSTLPort(); -env = SatSCons.MakeEnvironment(); +SENFSCons.UseBoost(); +SENFSCons.UseSTLPort(); +env = SENFSCons.MakeEnvironment(); env.Append( CPPPATH = [ '#' ] @@ -16,5 +16,5 @@ Export('env') SConscript(glob.glob("*/SConscript")) -SatSCons.StandardTargets(env) -SatSCons.GlobalTargets(env) +SENFSCons.StandardTargets(env) +SENFSCons.GlobalTargets(env) diff --git a/senfscons/SatSCons.py b/senfscons/SENFSCons.py similarity index 100% rename from senfscons/SatSCons.py rename to senfscons/SENFSCons.py