Skip to content

Commit

Permalink
[scons] Fix formatting / update Python example folders
Browse files Browse the repository at this point in the history
- Make path separators consistent on Windows post-install message
- Update list of Python example folders
  • Loading branch information
ischoegl committed Jul 11, 2020
1 parent 673ce1c commit d5d2916
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
9 changes: 6 additions & 3 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -1781,15 +1781,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))
Expand Down
9 changes: 4 additions & 5 deletions interfaces/cython/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d5d2916

Please sign in to comment.