research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Deb] Avoid packaging conflicts with ck2cti and ctml_writer

Browse source
This commit is contained in:
Ray Speth 2014-06-25 20:36:58 +00:00
parent c917291921
commit 925277a052
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interfaces/cython/SConscript
View file

@ -44,9 +44,12 @@ def add_dependencies(mod, ext):
localenv.Depends(mod, f)
script_ext = '.py' if os.name == 'nt' else ''
localenv['py_ctml_writer'] = repr('scripts/ctml_writer%s' % script_ext)
localenv['py_ck2cti'] = repr('scripts/ck2cti%s' % script_ext)
localenv['py_mixmaster'] = repr('scripts/mixmaster%s' % script_ext)
setup_scripts = [repr('scripts/mixmaster%s' % script_ext)]
if env['layout'] != 'debian':
# Debian package uses full versions installed with cantera-common
setup_scripts.append(repr('scripts/ctml_writer%s' % script_ext))
setup_scripts.append(repr('scripts/ck2cti%s' % script_ext))
localenv['py_scripts'] = ', '.join(s for s in setup_scripts)
# The actual ctml_writer and ck2cti scripts
build(env.Command('cantera/ctml_writer.py',

4
interfaces/cython/setup.py.in
View file

@ -55,9 +55,7 @@ setup(name="Cantera",
'cantera.mixmaster',
'cantera.mixmaster.Units',
'cantera.examples'],
scripts=[@py_ctml_writer@,
@py_ck2cti@,
@py_mixmaster@],
scripts=[@py_scripts@],
ext_modules = exts,
package_data = {'cantera.data': ['*.*'],
'cantera.test.data': ['*.*'],