[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 fd95f18840fbabe28bade3e95fe9a236e6ed1486
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Sat Jan 26 01:33:01 2013 +0100

    Generate doc/python* only if necessary
    ---
     SConstruct |   14 ++++++++------
     1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index 40534db..87af090 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1903,11 +1903,12 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
     htmlpatterns = Split("*.html *.css *.png *gif *.jpg")
 
     # Copy python documentation
-    pydocuinst = env.CopyPyDoc(env.Dir(InstDocPath(docpybase)),
-                               env.Dir(DocPyPath()))
+    if have_pydoc and HAVE_PYTHON_EXTENSION:
+        pydocuinst = env.CopyPyDoc(env.Dir(InstDocPath(docpybase)),
+                                   env.Dir(DocPyPath()))
 
-    env.Depends(pydocuinst, pydocu)
-    env.Clean(pydocuinst, pydocuinst)
+        env.Depends(pydocuinst, pydocu)
+        env.Clean(pydocuinst, pydocuinst)
 
     # Copy Cudd documentation
     #CopyAll(InstDocPath('cudd'), 'Cudd/cudd/doc', env) 
@@ -1925,8 +1926,9 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
          
         
     # Generate html master
-    instdocumastersubdirs = ["tutorial", "c++"] +  [
-        path.basename(elt) for elt in glob("doc/python*")]
+    instdocumastersubdirs = ["tutorial", "c++"]
+    if have_pydoc and HAVE_PYTHON_EXTENSION:
+        instdocumastersubdirs +=  [path.basename(elt) for elt in glob("doc/python*")]
 
     if ('install' in COMMAND_LINE_TARGETS) and \
            (docpybase not in instdocumastersubdirs):

-- 
polybori: Polynomials over Boolean Rings



More information about the debian-science-commits mailing list