From 4591159cd9c29d76aeea9e19e869af011eb80138 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Fri, 21 Jun 2013 20:59:00 +0000
Subject: [PATCH] [SCons] Install script for running MixMaster with new Python
 module

---
 interfaces/cython/.gitignore              |  2 ++
 interfaces/cython/SConscript              | 24 +++++++++--------------
 interfaces/cython/scripts/mixmaster.py.in |  4 ++++
 interfaces/cython/setup.py.in             |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 interfaces/cython/scripts/mixmaster.py.in

diff --git a/interfaces/cython/.gitignore b/interfaces/cython/.gitignore
index 65213e9be..f7c65ce0e 100644
--- a/interfaces/cython/.gitignore
+++ b/interfaces/cython/.gitignore
@@ -15,5 +15,7 @@ scripts/ctml_writer
 cantera/ck2cti.py
 scripts/ck2cti.py
 scripts/ck2cti
+scripts/mixmaster
+scripts/mixmaster.py
 Cantera.egg-info
 dist
diff --git a/interfaces/cython/SConscript b/interfaces/cython/SConscript
index 7df54247f..5b60ca571 100644
--- a/interfaces/cython/SConscript
+++ b/interfaces/cython/SConscript
@@ -42,14 +42,10 @@ def add_dependencies(mod, ext):
               mglob(localenv, 'cantera/examples/misc', 'py')):
         localenv.Depends(mod, f)
 
-if os.name == 'nt':
-  script_ext = '.py'
-  localenv['py_ctml_writer'] = repr('scripts/ctml_writer.py')
-  localenv['py_ck2cti'] = repr('scripts/ck2cti.py')
-else:
-  script_ext = ''
-  localenv['py_ctml_writer'] = repr('scripts/ctml_writer')
-  localenv['py_ck2cti'] = repr('scripts/ck2cti')
+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)
 
 # The actual ctml_writer and ck2cti scripts
 build(env.Command('cantera/ctml_writer.py',
@@ -59,13 +55,11 @@ build(env.Command('cantera/ck2cti.py',
                   '#interfaces/python/ck2cti.py',
                   Copy('$TARGET', '$SOURCE')))
 
-# thin wrapper
-build(env.Command('scripts/ctml_writer%s' % script_ext,
-                  'scripts/ctml_writer.py.in',
-                  Copy('$TARGET', '$SOURCE')))
-build(env.Command('scripts/ck2cti%s' % script_ext,
-                  'scripts/ck2cti.py.in',
-                  Copy('$TARGET', '$SOURCE')))
+# thin wrappers
+for script in mglob(env, 'scripts', 'py.in'):
+  base_name = script.name.split('.')[0]
+  build(env.Command('scripts/%s%s' % (base_name, script_ext), script,
+                    Copy('$TARGET', '$SOURCE')))
 
 def install_module(prefix, python_version):
     if prefix == 'USER':
diff --git a/interfaces/cython/scripts/mixmaster.py.in b/interfaces/cython/scripts/mixmaster.py.in
new file mode 100644
index 000000000..1df984cd6
--- /dev/null
+++ b/interfaces/cython/scripts/mixmaster.py.in
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+from cantera.mixmaster.main import MixMaster
+MixMaster()
diff --git a/interfaces/cython/setup.py.in b/interfaces/cython/setup.py.in
index 46fbb4d84..1241a7929 100644
--- a/interfaces/cython/setup.py.in
+++ b/interfaces/cython/setup.py.in
@@ -26,7 +26,8 @@ setup(name="Cantera",
                   'cantera.mixmaster.Units',
                   'cantera.examples'],
       scripts=[@py_ctml_writer@,
-               @py_ck2cti@],
+               @py_ck2cti@,
+               @py_mixmaster@],
       ext_modules = exts,
       package_data = {'cantera.data': ['*.*'],
                       'cantera.test.data': ['*.*'],