[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-174-g5b14c47

Alexander Dreyer adreyer at gmx.de
Mon Jan 28 22:00:48 UTC 2013


The following commit has been merged in the master branch:
commit 287afd7a09fe119cc21a6eb030c6ccb4c28010f6
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Mon Jan 28 02:01:29 2013 +0100

    Developer's version of pyroot/polybori/dynamic uses version specific settigns

diff --git a/SConstruct b/SConstruct
index 87af090..fe50e9a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1317,19 +1317,38 @@ if HAVE_PYTHON_EXTENSION:
         init_py_in = """# File: %(target)s
 # Automatically generated by PolyBoRi
 # This file is just for developing, it should not be installed.
+def _location():
+    import os
+    import sys
+    from distutils.sysconfig import get_python_version
+    sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+    _tmp = __import__("initpy" + get_python_version().replace('.', ''))
+    return _tmp.location
+
 import imp
-imp.load_dynamic("polybori.dynamic.PyPolyBoRi", "%(source)s")
+imp.load_dynamic("polybori.dynamic.PyPolyBoRi", _location())
 """
-
         init_py = file(target[0].path, "w")
         init_py.write(init_py_in  % dict(target = target[0].path, 
                                    source = source[0].abspath))
         init_py.close()
-        
+        init_py = file(target[1].path, "w")
+        init_py_in = """# File: %(target)s
+# Automatically generated by PolyBoRi
+# This file is just for developing, it should not be installed.
+location = "%(source)s"
+"""
+        init_py.write(init_py_in % dict(target = target[1].path, 
+                                        source = source[0].abspath))
+        init_py.close()
     def init_message(target, *args):
         return target[0].path + " building..."
         
-    dynamic_init_py = env.Command(PyRootPath('polybori/dynamic/__init__.py'), 
+    dynamic_init_py = env.Command([PyRootPath('polybori/dynamic', elt) for elt\
+                                       in ['__init__.py', 
+                                           'initpy' + \
+                                               pyconf.version.replace('.','') +\
+                                               '.py']], 
                                   pypb, 
                                   action = env.Action(init_build, init_message))
 

-- 
polybori: Polynomials over Boolean Rings



More information about the debian-science-commits mailing list