From c5590b9133fbf071b4500680d1d7b325005b6dae Mon Sep 17 00:00:00 2001 From: Max Liu Date: Mon, 7 May 2018 13:52:57 -0400 Subject: [PATCH] Update build scripts for conda recipe Remove make QM command which no longer exists Do not recompile extension modules during install --- bld.bat | 4 ++-- build.sh | 4 +++- setup.py | 4 ---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bld.bat b/bld.bat index a46a9b3a19..64d18a30c2 100644 --- a/bld.bat +++ b/bld.bat @@ -1,7 +1,7 @@ - +:: Compile RMG mingw32-make -j%CPU_COUNT% -mingw32-make QM +:: Install RMG %PYTHON% setup.py install :: lazy "install" of everything in our 'external' folder. diff --git a/build.sh b/build.sh index 9617ea9a17..8c7ab05e56 100644 --- a/build.sh +++ b/build.sh @@ -1,5 +1,7 @@ +# Compile RMG make -j${CPU_COUNT} -make QM + +# Install RMG $PYTHON setup.py install # lazy "install" of everything in our 'external' folder. diff --git a/setup.py b/setup.py index 61a8dd271e..d591d03641 100644 --- a/setup.py +++ b/setup.py @@ -157,10 +157,6 @@ def getCanthermExtensionModules(): ################################################################################ ext_modules = [] -if 'install' in sys.argv: - # This is so users can still do simply `python setup.py install` - ext_modules.extend(getMainExtensionModules()) - ext_modules.extend(getSolverExtensionModules()) if 'main' in sys.argv: # This is for `python setup.py build_ext main` sys.argv.remove('main')