research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4557 commits 2 branches 16 tags 37 MiB
Commit graph

181 commits

Author SHA1 Message Date
Ray Speth
c625d8327e [SCons] Fix an issue when using virtualenv 
Virtualenv substitutes an old version of site.py that may not have the
getusersitepackages function. However, it appears that USER_SITE is set
correctly in these cases.
 2013-06-24 15:21:28 +00:00
Ray Speth
d19d18dd77 [SCons] Print options read from cantera.conf 
This prevents surprises when an unexpected option value is saved in
cantera.conf.
 2013-06-17 14:19:50 +00:00
Ray Speth
97ff4fa2a5 [SCons] Fix handling of blas_lapack_dir and boost_lib_dir 
These need to be added to LIBPATH as entries in a list, otherwise
LIBPATH ends up concatenating the strings for each as a single entry.
 2013-06-14 23:06:29 +00:00
Ray Speth
1e02732140 [SCons] Deprecate the 'legacy_headers' option 2013-06-13 22:49:58 +00:00
Ray Speth
56d481785c Deprecate HTML log files 2013-06-05 17:09:39 +00:00
Ray Speth
fa27015468 [SCons] Include Boost import libraries in Windows installations 2013-06-05 03:08:51 +00:00
Ray Speth
49dc79c3ed [SCons] Get boost version string 
This will be used when choosing files to install on Windows
 2013-06-03 22:17:33 +00:00
Ray Speth
463c481cb0 Make 'scons clean' more thorough for Matlab and Python packages 2013-06-03 22:17:27 +00:00
Ray Speth
3305698b6a Add support for Visual Studio 2012 2013-06-03 22:17:23 +00:00
Ray Speth
f8ac8ea7c3 Remove the DEPRECATED macro 
This macro was not a reliable way of marking deprecated features. Future
deprecation warnings will be issued at runtime using the warn_deprecated
function.
 2013-05-31 15:56:11 +00:00
Ray Speth
c084148b0e [SCons] Python module can be installed to user's site-packages directory 
Setting the scons options 'python_prefix=USER' or 'python3_prefix=USER' will
pass the '--user' flag to setup.py, causing the Python module to be installed to
a platform-specific directory on the user's module path.
 2013-03-04 17:31:08 +00:00
Ray Speth
f41af50461 [SCons] Refactored installation directory configuration 2013-03-04 17:31:05 +00:00
Ray Speth
999231e177 [SCons] Updated post-install message to show Cython module location 
Also fixed path separators to be correct on Windows
 2013-03-04 17:31:03 +00:00
Ray Speth
1856a060c9 [SCons] Made installation of gtest optional 
The default is to not install it, since most users do not need it.
 2013-02-15 17:32:31 +00:00
Harry Moffat
287de5e1fb Added gtest to Cantera's application environment. 2013-02-05 00:32:05 +00:00
Ray Speth
9d6ac785d5 [SCons] Detect invalid command line arguments 2013-01-30 22:05:14 +00:00
Ray Speth
b277818347 [Cython] Added infrastructure for installing examples 
This includes automatic conversion of the samples from Python 3 syntax to Python
2 syntax when building the Python 2 version of the module and the "3to2" script
is available.
 2012-12-18 00:03:03 +00:00
Ray Speth
04fb86b1ea Added a new SCons configuration variable 'warning_flags' 
This allows use of more extensive warning settings for the code that's actually
part of Cantera without generating excessive warnings on code automatically
generated code (e.g. f2c) or code that isn't part of Cantera proper (e.g. gtest,
libexecstream).
 2012-11-14 21:07:03 +00:00
Harry Moffat
6e7b14c468 Added a verbose option. 2012-11-07 23:48:55 +00:00
Ray Speth
845b73405e Merge bug fixes from 2.0 maintenance branch 2012-10-30 15:46:10 +00:00
Ray Speth
71156434f8 Fixed handling of the SCons construction variable "FRAMEWORKS" 
This variable is only needed on OS X, but for simplicity, we expect it
to be defined (but empty) on other platforms.
 2012-10-30 15:30:33 +00:00
Ray Speth
985e83f261 Workaround for platform.python_compiler() to support EPD on Windows 2012-09-06 19:59:50 +00:00
Ray Speth
208b8edad8 SCons installs the new Python module 2012-09-06 19:58:26 +00:00
Ray Speth
a0fdaa9f8a SCons builds the new Python module with Python 2 and Python 3 simultaneously 2012-09-06 19:58:22 +00:00
Ray Speth
0c904bebfa Added infrastructure for using Sphinx to document the new Python module 
This includes adding the sphinx_cmd option to SCons, which can be set to the
Python 3 version of sphinx-build as necessary.
 2012-09-06 19:58:13 +00:00
Ray Speth
11fd72c26f SCons now builds the Cython-based Python 3 package 2012-09-06 19:58:03 +00:00
Ray Speth
3a838018fc Use SCons to generate a customized setup.py for the new Python module 2012-09-06 19:55:34 +00:00
Ray Speth
021f66c755 Merge bug fixes from the 2.0 maintenance branch 2012-08-15 15:36:34 +00:00
Ray Speth
a79428f894 Fixed some issues with paths in Cantera.mak and cantera.pc 2012-08-13 20:14:14 +00:00
Ray Speth
9d9a22f16b Fixed compilation of Fortran samples with user-specified compiler 
cherry-pick of r1635 from 2.0 maintenance branch
 2012-08-13 20:14:07 +00:00
Ray Speth
c77539e577 Fixed generated SConstruct files to work with MSVC 
cherry-pick of r1634 from 2.0 maintenance branch
 2012-08-13 20:14:04 +00:00
Ray Speth
ee3e48b024 Fixed issues linking to libgfortran on OS X 2012-08-12 22:59:40 +00:00
Ray Speth
c092bbaede Fixed the order of include and library directories when compiling 
Include directories in the Cantera source tree should be listed first so that
they take precedence over headers from other installed copies of Cantera that
might end up on the include search path. This was potentially a problem when
Cantera was installed in the same location (e.g. /usr/local) as one of its
dependencies (e.g. Sundials).

The same logic applies to directories on the library link path.
 2012-08-10 21:03:06 +00:00
Ray Speth
deea83d68b Merge bug fixes from the 2.0 maintenance branch 2012-08-02 16:07:35 +00:00
Ray Speth
bcb79d9cd3 Convert .cti files in data/inputs to .xml as part of the buld process 
The full set of .cti and .xml files to be installed is placed in build/data (for
use by the test suite) and copied to the CANTERA_DATA folder on installation.
 2012-08-02 15:47:45 +00:00
Ray Speth
88bb6fe679 Removed obsolete C++ Chemkin mechanism converter 2012-07-26 20:49:50 +00:00
Ray Speth
0ff0dad483 Removed obsolete HAS_SSTREAM option 2012-07-23 22:33:41 +00:00
Ray Speth
9c89a8e0a2 On Unix-like systems, $python_prefix defaults to $prefix 2012-07-14 21:18:03 +00:00
Ray Speth
0a460a975f SCons now propagates the LD_LIBRARY_PATH environment variable by default 2012-07-14 21:18:00 +00:00
Ray Speth
5bb6edb133 Bump version number of development version (trunk) 2012-07-10 16:25:39 +00:00
Ray Speth
b83a3b7e96 Fixed compilation of Fortran samples with user-specified compiler 2012-07-10 16:23:29 +00:00
Ray Speth
0e672ed92a Fixed generated SConstruct files to work with MSVC 2012-07-10 16:23:25 +00:00
Ray Speth
58c202395c Bump version to 2.0.0 (final) 2012-07-10 16:23:12 +00:00
Ray Speth
8b3f9c2c1c Fix compilation in some cases where no Fortran compiler is present 2012-06-14 21:06:15 +00:00
Ray Speth
ae572058e0 Python module files are also uninstalled with 'scons uninstall' 2012-06-12 22:49:05 +00:00
Ray Speth
35f694a681 File extension on executable Python scripts is now OS-dependent 2012-06-12 22:49:02 +00:00
Ray Speth
103a1d0e4e Added support for different installation layouts 2012-06-12 22:49:00 +00:00
Ray Speth
89f47a1965 Added an 'uninstall' target to SCons 2012-06-12 22:48:57 +00:00
Ray Speth
5a2e2567f5 Miscellaneous cleanup 2012-06-12 22:48:28 +00:00
Ray Speth
1fb14fc86a Skip building/installing some targets when layout=debian 
Do not build the shared library.
Do not build csvdiff.
Do not install install_tsc
Do not install man pages (handled by debhelper)

Skip csvdiff for Debian package

More things not installed with Debian
 2012-06-05 19:56:34 +00:00