Move all build env settings from SENFSCons to SConstruct

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 2340272..cca03b8 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -8,9 +8,17 @@ import SENFSCons, senfutil
 ###########################################################################
 # Load utilities and setup libraries and configure build
 
-SENFSCons.UseBoost()
-SENFSCons.UseSTLPort()
-env = SENFSCons.MakeEnvironment()
+env = Environment()
+
+# Load all the local SCons tools
+env.Tool('Doxygen', [ 'senfscons' ])
+env.Tool('Dia2Png', [ 'senfscons' ])
+env.Tool('PkgDraw', [ 'senfscons' ])
+env.Tool('CopyToDir', [ 'senfscons' ])
+env.Tool('ProgramNoScan', [ 'senfscons' ])
+env.Tool('CompileCheck', [ 'senfscons' ])
+env.Tool('Boost', [ 'senfscons' ])
+env.Tool('BoostUnitTests', [ 'senfscons' ])
 
 env.Help("""
 Additional top-level build targets:
@@ -28,32 +36,77 @@ fixlinks     Fix broken links in doxygen documentation
 valgrind     Run all tests under valgrind/memcheck
 """)
 
+# Compile options
+
 # Options used to debug inlining:
 #
-# INLINE_OPTS = [ '-finline-limit=20000', '--param','large-function-growth=10000',
-#                 '--param', 'large-function-insns=10000', '--param','inline-unit-growth=10000',
-#                 '-fvisibility-inlines-hidden', '-fno-inline-functions', '-Winline' ]
-#
 # BEWARE: You need lots of ram to compile with these settings (approx 1G)
 
-INLINE_OPTS = [ '-finline-limit=5000' ]
+class BuildTypeOptions:
+    def __init__(self, var):
+        self._var = var
+
+    def __call__(self, source, target, env, for_signature):
+        type = env['final'] and "final" or env['debug'] and "debug" or "normal"
+        return env[self._var + "_" + type]
 
 env.Append(
-   CPPPATH         = [ '#/include' ],
-   CXXFLAGS        = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long' ] + INLINE_OPTS,
-   LIBS            = [ 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
-                       '$BOOSTFSLIB' ],
-   TEST_EXTRA_LIBS = [ ],
-   ENV             = { 'PATH' : os.environ.get('PATH') },
-   CLEAN_PATTERNS  = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ],
+   ENV                    = { 'PATH' : os.environ.get('PATH') },
+   CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ],
+
+   CPPPATH                = [ '#/include' ],
+   LOCALLIBDIR            = '#',
+   LIBPATH                = [ '$LOCALLIBDIR' ],
+   LIBS                   = [ 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
+                              '$BOOSTFSLIB' ], 
+   TEST_EXTRA_LIBS        = [ ],
+
+   PREFIX                 = '/usr/local',
+   LIBINSTALLDIR          = '$PREFIX/lib',
+   BININSTALLDIR          = '$PREFIX/bin',
+   INCLUDEINSTALLDIR      = '$PREFIX/include',
+   OBJINSTALLDIR          = '$LIBINSTALLDIR',
+   DOCINSTALLDIR          = '$PREFIX/doc',
+   CPP_INCLUDE_EXTENSIONS = [ '.h', '.hh', '.ih', '.mpp', '.cci', '.ct', '.cti' ],
+   CPP_EXCLUDE_EXTENSIONS = [ '.test.hh' ],
+
+   # These options are insane. Only useful for inline debugging. Need at least 1G free RAM
+   INLINE_OPTS_DEBUG      = [ '-finline-limit=20000', '-fvisibility-inlines-hidden', 
+                              '-fno-inline-functions', '-Winline' 
+                              '--param','large-function-growth=10000',
+                              '--param', 'large-function-insns=10000', 
+                              '--param','inline-unit-growth=10000' ],
+   INLINE_OPTS_NORMAL     = [ '-finline-limit=5000' ],
+   INLINE_OPTS            = [ '$INLINE_OPTS_NORMAL' ],
+   CXXFLAGS               = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long', '$INLINE_OPTS',
+                              '$CXXFLAGS_' ],
+   CXXFLAGS_              = BuildTypeOptions('CXXFLAGS'),
+   CXXFLAGS_final         = [ '-O3' ],
+   CXXFLAGS_normal        = [ '-O0', '-g' ],
+   CXXFLAGS_debug         = [ '$CXXFLAGS_normal' ],
+
+   CPPDEFINES             = [ '$expandLogOption', '$CPPDEFINES_' ],
+   expandLogOption        = senfutil.expandLogOption,
+   CPPDEFINES_            = BuildTypeOptions('CPPDEFINES'),
+   CPPDEFINES_final       = [ ],
+   CPPDEFINES_normal      = [ 'SENF_DEBUG' ],
+   CPPDEFINES_debug       = [ '$CPPDEFINES_normal' ],
+
+   LINKFLAGS              = [ '-rdynamic', '$LINKFLAGS_' ],
+   LINKFLAGS_             = BuildTypeOptions('LINKFLAGS'),
+   LINKFLAGS_final        = [ ],
+   LINKFLAGS_normal       = [ '-Wl,-S' ],
+   LINKFLAGS_debug        = [ ],
 )
 
 env.SetDefault(
-    LIBSENF = "senf"
+    LIBSENF = "senf",
+    final   = 0,
+    debug   = 0,
 )
 
-# Parse the log option command line parameter into the SENF_LOG_CONF macro
-senfutil.setLogOption(env)
+# Set variables from command line
+env.Replace(**ARGUMENTS)
 
 Export('env')
 
@@ -71,17 +124,25 @@ if not env.GetOption('clean') and not os.path.exists("local_config.hh"):
 
 # Before defining any targets, check wether this is the first build in
 # pristine directory tree. If so, call 'scons prepare' so the dependencies
-# created later are correct
+# created later are correct (yes, this is a hack :-( )
 
 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" ])
 env.Clean('all', '.prepare-stamp')
 
-# Load SConscripts. Need to load debian and doclib first (they change the global environment)
-SConscript("debian/SConscript")
-SConscript("doclib/SConscript")
-SConscript(list(set(glob.glob("*/SConscript")) - set(("debian/SConscript", "doclib/SConscript"))))
+# Load SConscripts. Need to load some first (they change the global environment)
+initSConscripts = [ 
+    "debian/SConscript",
+    "doclib/SConscript",
+]
+
+SConscript(initSConscripts)
+
+if os.path.exists('SConscript.local'):
+    SConscript('SConscript.local')
+
+SConscript(list(set(glob.glob("*/SConscript")) - set(initSConscripts)))
 
 # Define the main targets
 SENFSCons.StandardTargets(env)