Should now build on Linux, Windows problems tbd

git-svn-id: https://ipvs.informatik.uni-stuttgart.de/SGpp/repos/trunk@5276 4eea3252-f0fb-4393-894d-40516dce545b
SGpp · Nov 25, 2015 · 9d49203 · 9d49203
1 parent ddaed0c
commit 9d49203
Show file tree

Hide file tree

Showing 12 changed files with 2,373 additions and 31 deletions.
diff --git a/SConstruct b/SConstruct
@@ -62,8 +62,10 @@ vars.Add(BoolVariable('OPT', "Sets optimization on and off", False))
 # for compiling on LRZ without errors: omit unit tests
 vars.Add(BoolVariable('NO_UNIT_TESTS', 'Omit UnitTests if set to True', False))
 vars.Add(BoolVariable('SG_PYTHON', 'Build with python Support', 'SG_PYTHON' in languageSupportNames))
+vars.Add(BoolVariable('PYDOC', 'Build python wrapper with comments', 'SG_PYTHON' in languageSupportNames))
 vars.Add(BoolVariable('SG_JAVA', 'Build with java Support', 'SG_JAVA' in languageSupportNames))
 
+
 for moduleName in moduleNames:
   vars.Add(BoolVariable(moduleName, 'Build the module ' + moduleName, True))
 
@@ -206,11 +208,13 @@ installTargetList = []
 testTargetList = []
 boostTestTargetList = []
 exampleTargetList = []
+pydocTargetList = []
 env.Export('libraryTargetList')
 env.Export('installTargetList')
 env.Export('testTargetList')
 env.Export('boostTestTargetList')
 env.Export('exampleTargetList')
+env.Export('pydocTargetList')
 
 # compile selected modules
 flattenedDependencyGraph = []
@@ -229,6 +233,24 @@ for moduleFolder in moduleFolders:
 
 Export('flattenedDependencyGraph')
 
+if env['PYDOC']:
+  with open('moduleDoxy', 'r') as template:
+    data = template.read()
+    for module in moduleFolders:
+      print module
+      with open(os.path.join(module, 'Doxyfile'), 'w') as doxyFile:
+        doxyFile.write(data.replace('$modname', module))
+
+      doxy_env = env.Clone()
+
+      doxygen = doxy_env.Command(os.path.join(module, 'doc/xml/index.xml'), '', 'doxygen ' + os.path.join(module, 'Doxyfile'))
+      doxy2swig = doxy_env.Command(os.path.join(module, 'doc/doc.i'), doxygen, "python pysgpp/doxy2swig.py -o -c $SOURCE $TARGET")
+      for root, dirs, files in os.walk(os.path.join(module, 'src')):
+        for file in files:
+          doxy_env.Depends(doxygen, os.path.join(root, file))
+          doxy_env.Depends(doxy2swig, os.path.join(root, file))
+      pydocTargetList.append(doxy2swig)
+
 if env['SG_PYTHON']:
   env.SConscript('#/pysgpp/SConscript', {'env': env, 'moduleName': "pysgpp"})
 

diff --git a/combigrid/SConscript b/combigrid/SConscript
@@ -1,6 +1,6 @@
 # Copyright (C) 2008-today The SG++ Project
 # This file is part of the SG++ project. For conditions of distribution and
-# use, please see the copyright notice provided with SG++ or at 
+# use, please see the copyright notice provided with SG++ or at
 # sgpp.sparsegrids.org
 
 import os
@@ -48,7 +48,7 @@ else:
                             source=objs,
                             LIBPATH=BUILD_DIR,
                             LIBS=moduleDependencies)
-                        
+
 for lib_str in moduleDependencies:
     if lib_str.startswith("sgpp"):
         env.Depends(lib, os.path.join("#", BUILD_DIR.path,
@@ -60,8 +60,8 @@ libInstall = env.Install(BUILD_DIR, lib)
 
 if not env['NO_UNIT_TESTS'] and env['SG_PYTHON']:
   Import('testTargetList')
-  moduleTest = env.Test(os.path.join('tests', 'test_%s.py' % moduleName))
-  env.Requires(moduleTest, libInstall)
+  py_test_env = env.Clone()
+  moduleTest = py_test_env.Test(os.path.join('tests', 'test_%s.py' % moduleName))
   testTargetList.append(moduleTest)
 
 for fileName in os.listdir("examples"):

diff --git a/datadriven/SConscript b/datadriven/SConscript
@@ -91,7 +91,7 @@ else:
                                 LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
         env.Depends(cmd, objs)
         env.Depends(lib, cmd)
-    else:    
+    else:
         lib = env.SharedLibrary(target=libname,
                                 source=objs,
                                 LIBPATH=BUILD_DIR,
@@ -108,8 +108,8 @@ libInstall = env.Install(BUILD_DIR, lib)
 
 if not env['NO_UNIT_TESTS'] and env['SG_PYTHON']:
   Import('testTargetList')
-  moduleTest = env.Test(os.path.join('tests', 'test_%s.py' % moduleName))
-  env.Requires(moduleTest, libInstall)
+  py_test_env = env.Clone()
+  moduleTest = py_test_env.Test(os.path.join('tests', 'test_%s.py' % moduleName))
   testTargetList.append(moduleTest)
 
 example_env = env.Clone()

diff --git a/finance/SConscript b/finance/SConscript
@@ -1,6 +1,6 @@
 # Copyright (C) 2008-today The SG++ project
 # This file is part of the SG++ project. For conditions of distribution and
-# use, please see the copyright notice provided with SG++ or at 
+# use, please see the copyright notice provided with SG++ or at
 # sgpp.sparsegrids.org
 
 import os
@@ -68,7 +68,7 @@ else:
                                 LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
         env.Depends(cmd, objs)
         env.Depends(lib, cmd)
-    else:    
+    else:
         lib = env.SharedLibrary(target=libname,
                                 source=objs,
                                 LIBPATH=BUILD_DIR,
@@ -85,8 +85,8 @@ libInstall = env.Install(BUILD_DIR, lib)
 
 if not env['NO_UNIT_TESTS'] and env['SG_PYTHON']:
   Import('testTargetList')
-  moduleTest = env.Test(os.path.join('tests', 'test_%s.py' % moduleName))
-  env.Requires(moduleTest, libInstall)
+  py_test_env = env.Clone()
+  moduleTest = py_test_env.Test(os.path.join('tests', 'test_%s.py' % moduleName))
   testTargetList.append(moduleTest)
 
 for fileName in os.listdir("examples"):

diff --git a/misc/SConscript b/misc/SConscript
@@ -1,6 +1,6 @@
 # Copyright (C) 2008-today The SG++ project
 # This file is part of the SG++ project. For conditions of distribution and
-# use, please see the copyright notice provided with SG++ or at 
+# use, please see the copyright notice provided with SG++ or at
 # sgpp.sparsegrids.org
 
 import os
@@ -66,7 +66,7 @@ else:
                                 LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
         env.Depends(cmd, objs)
         env.Depends(lib, cmd)
-    else:    
+    else:
         lib = env.SharedLibrary(target=libname,
                                 source=objs,
                                 LIBPATH=BUILD_DIR,