site_scons: added fix for SCons 0.97 compatibility; export BOOST_VERSION to env

[senf.git] / site_scons / senfconf.py

diff --git a/site_scons/senfconf.py b/site_scons/senfconf.py
index bf32926..89ef0c2 100644 (file)
--- a/site_scons/senfconf.py
+++ b/site_scons/senfconf.py
@@ -1,7 +1,27 @@
-from __future__ import with_statement
+# from __future__ import with_statement
 
 _configTests = {}
 
+# Fix for SCons 0.97 compatibility
+import SCons.SConf
+try: SCons.SConf.SConfBase.Define
+except AttributeError:
+    import string
+    def Define(self, name, value = None, comment = None):
+        lines = []
+        if comment:
+            comment_str = "/* %s */" % comment
+            lines.append(comment_str)
+        if value is not None:
+            define_str = "#define %s %s" % (name, value)
+        else:
+            define_str = "#define %s" % name
+        lines.append(define_str)
+        lines.append('')
+        self.config_h_text = self.config_h_text + string.join(lines, '\n')
+    SCons.SConf.SConfBase.Define = Define
+
+
 def Tests():
     global _configTests
     return _configTests
@@ -9,18 +29,19 @@ def Tests():
 def Test(func):
     global _configTests
     _configTests[func.__name__] = func
+    return func
 
-class TemporaryContext:
-    def __init__(self, context):
-        self._context = context
-        self._env = self._context.env.Clone()
+# class TemporaryContext:
+#     def __init__(self, context):
+#         self._context = context
+#         self._env = self._context.env.Clone()
 
-    def __enter__(self):
-        return None
+#     def __enter__(self):
+#         return None
 
-    def __exit__(self,*args):
-        self._context.env.Replace(**self._env.Dictionary())
-        return False
+#     def __exit__(self,*args):
+#         self._context.env.Replace(**self._env.Dictionary())
+#         return False
 
 @Test
 def CheckBoostVersion(context):
@@ -28,18 +49,22 @@ def CheckBoostVersion(context):
     ret = context.TryRun("#include <boost/version.hpp>\n"
                          "#include <iostream>\n"
                          "int main(int, char **) { std::cout << BOOST_LIB_VERSION << std::endl; }",
-                         ".cc")[1].strip()
+                         ".cc")[-1].strip()
     if not ret:
         context.Result("no boost includes found")
+        context.env.Replace( BOOST_VERSION = '' )
         return None
     else:
         context.Result(ret)
+        context.env.Replace( BOOST_VERSION = ret )
         return ret
 
 @Test
 def CheckBoostVariants(context, *variants):
     useVariant = None
-    with TemporaryContext(context):
+#    with TemporaryContext(context):
+    try:
+        _env = context.env.Clone()
         for variant in variants:
             if variant : variantStr = "'%s'" % variant
             else       : variantStr = "default"
@@ -54,7 +79,10 @@ def CheckBoostVariants(context, *variants):
             context.Result( ret )
             if ret and useVariant is None:
                 useVariant = variant
+    finally:
+        context.env.Replace(**_env.Dictionary())
     if useVariant is not None and not context.env.GetOption('no_progress'):
         print  "Using %s boost variant." % (
             useVariant and "'%s'" % useVariant or "default")
+    context.env.Replace( BOOST_VARIANT = useVariant )
     return useVariant