Commit graph

208 commits

Author SHA1 Message Date
Ray Speth
6b68564245 Bump trunk version to 2.2a 2013-12-09 01:33:58 +00:00
Ray Speth
bbaf0ff7a0 Fix CXX flags for VS2012
Resolves Issue 184.
2013-11-12 23:44:42 +00:00
Ray Speth
e1074722c5 [SCons] Restore 'single_library' build option
The 'single_library=y' build option must be retained in order to support
compilation on Windows and OS X.
2013-10-04 16:22:55 +00:00
Harry Moffat
cfa4493b51 Worked on fixing errors in the code that caused problems with downstream code.
Took out single_species compilation option

took out some deprecated warnings

Fixed an error in copy constructors for thermo.

Still an error with PYTHONPATH and the test suite

 -- more to come.
2013-09-02 00:58:28 +00:00
Ray Speth
957c88fcff Bump version to 2.1.0 2013-10-24 02:40:14 +00:00
Ray Speth
be1573e85e [SCons] Fix undefined build variable when building MSI 2013-10-24 02:40:12 +00:00
Ray Speth
f871dd8cf0 [SCons] Add 'python_compiler' option for Cython module compilation 2013-10-15 14:59:31 +00:00
Ray Speth
584392d856 [SCons] Fix linking boost_thread in more places 2013-09-30 16:02:39 +00:00
Ray Speth
721f0266be [SCons] Fix some dependency issues for building "ctpath.m" 2013-09-06 20:34:18 +00:00
Ray Speth
7683677cac Bump version to 2.1.0b3 2013-09-01 00:33:55 +00:00
Ray Speth
b0635fe748 [SCons] Fix compilation of Python 3 module when PYTHONHOME is set 2013-09-01 00:33:49 +00:00
Ray Speth
fc878f09fd [SCons] Include Sundials library and header files in Windows installer 2013-09-01 00:33:37 +00:00
Ray Speth
1969a4d399 [SCons] Add configuration option for specifying required Boost libraries.
The set of Boost libraries which are required by Cantera, through the use of
Boost.Thread, depends on the Boost version. The static libraries are needed
when compiling anything that links to Cantera, so these libraries are copied
to the Cantera installation directory on Windows, where compiling Boost from
source is a burden.
2013-09-01 00:33:32 +00:00
Ray Speth
32ea4fd924 [SCons] Fix to skip Python startup messages
This fixes an issue when the Python interpreter prints startup messages that
appear before the expected output lines. Known to be a problem with the Anaconda
Python distribution.
2013-08-16 17:25:04 +00:00
Ray Speth
6126521ff3 [SCons] Eliminate spurious warnings about environment variables 2013-08-09 15:35:07 +00:00
Ray Speth
4d88fa8e34 Bump version to 2.1.0b2 2013-08-02 23:31:36 +00:00
Ray Speth
988f300e6b [SCons] Add PYTHONPATH to list of default environment variables
Simplifies compilation when Python packages needed for compilation (e.g. Cython)
are not installed in system-wide locations.
2013-08-02 23:17:42 +00:00
Ray Speth
f320290c51 [SCons] Fix Python module path in setup_cantera and post-install message
In particular, this fixes paths for Linux distros that put Python modules in
'lib64/pythonX.Y/site-packages'.

Also fixes the reported installation path for the Python module on Windows.
2013-07-29 01:37:57 +00:00
Ray Speth
e65cd38214 Bump version to 2.1.0b1 2013-07-23 15:53:31 +00:00
Ray Speth
c846d8237e [SCons] Check Cython version for Python 3.x 2013-07-18 22:39:23 +00:00
Ray Speth
c575bf6fb2 [SCons] Check Cython version for Python 2.x 2013-07-18 22:39:21 +00:00
Ray Speth
e1fe14a9b0 [SCons] Make the new Python package the default 2013-06-26 00:23:18 +00:00
Ray Speth
029e2c5d2e [SCons] single_library defaults to True
Also, using single_library=n is deprecated.
2013-06-26 00:23:14 +00:00
Ray Speth
1ac855ae9b [SCons] Mention config.log in relevant error messages 2013-06-26 00:23:11 +00:00
Ray Speth
5213393c1e [SCons] Fix 'HAS_NO_PYTHON' to account for the Python 3 package 2013-06-24 15:22:55 +00:00
Ray Speth
73c43a3a26 [SCons] Keep default values of compiler flags out of cantera.conf 2013-06-24 15:22:52 +00:00
Ray Speth
dcb579df98 [SCons] Only copy Boost libraries when they are being used 2013-06-24 15:22:48 +00:00
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