From 925277a052708c10b62a5d2c7a9dc215aca7a257 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 25 Jun 2014 20:36:58 +0000 Subject: [PATCH] [Deb] Avoid packaging conflicts with ck2cti and ctml_writer --- interfaces/cython/SConscript | 9 ++++++--- interfaces/cython/setup.py.in | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/interfaces/cython/SConscript b/interfaces/cython/SConscript index 193b02099..fa6bc4ea8 100644 --- a/interfaces/cython/SConscript +++ b/interfaces/cython/SConscript @@ -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', diff --git a/interfaces/cython/setup.py.in b/interfaces/cython/setup.py.in index e83b9f6f3..69386b057 100644 --- a/interfaces/cython/setup.py.in +++ b/interfaces/cython/setup.py.in @@ -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': ['*.*'],