[scons] Small updates/fixes

Cantera · Jul 4, 2020 · 199c2d2 · 199c2d2
1 parent f1273f4
commit 199c2d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/SConstruct b/SConstruct
@@ -30,6 +30,8 @@ Basic usage:
 
     'scons samples' - Compile the C++ and Fortran samples.
 
+    'scons check-examples' - Run all Python examples
+
     'scons msi' - Build a Windows installer (.msi) for Cantera.
 
     'scons sphinx' - Build the Sphinx documentation
@@ -1790,15 +1792,18 @@ def postInstallMessage(target, source, env):
         """.format(**env_dict))
 
     if os.name != 'nt':
+        env['setup_cantera'] = pjoin(env['ct_bindir'], 'setup_cantera')
+        env['setup_cantera_csh'] = pjoin(env['ct_bindir'], 'setup_cantera.csh')
         install_message += textwrap.dedent("""
+
             Setup scripts to configure the environment for Cantera are at:
 
-              setup script (bash)         {ct_bindir!s}/setup_cantera
-              setup script (csh/tcsh)     {ct_bindir!s}/setup_cantera.csh
+              setup script (bash)         {setup_cantera!s}
+              setup script (csh/tcsh)     {setup_cantera_csh!s}
 
             It is recommended that you run the script for your shell by typing:
 
-              source {ct_bindir!s}/setup_cantera
+              source {setup_cantera!s}
 
             before using Cantera, or else include its contents in your shell login script.
         """.format(**env_dict))

diff --git a/interfaces/cython/SConscript b/interfaces/cython/SConscript
@@ -83,14 +83,13 @@ localenv.Depends(ext, localenv['cantera_staticlib'])
 
 for f in (mglob(localenv, 'cantera', 'py') +
           mglob(localenv, 'cantera/test', 'py') +
-          mglob(localenv, 'cantera/examples/tutorial', 'py') +
-          mglob(localenv, 'cantera/examples/equilibrium', 'py') +
           mglob(localenv, 'cantera/examples/kinetics', 'py') +
-          mglob(localenv, 'cantera/examples/transport', 'py') +
-          mglob(localenv, 'cantera/examples/reactors', 'py') +
+          mglob(localenv, 'cantera/examples/multiphase', 'py') +
           mglob(localenv, 'cantera/examples/onedim', 'py') +
+          mglob(localenv, 'cantera/examples/reactors', 'py') +
           mglob(localenv, 'cantera/examples/surface_chemistry', 'py') +
-          mglob(localenv, 'cantera/examples/misc', 'py')):
+          mglob(localenv, 'cantera/examples/thermo', 'py') +
+          mglob(localenv, 'cantera/examples/transport', 'py')):
     localenv.Depends(mod, f)
 
 # Determine installation path and install the Python module