Commit graph

160 commits

Author SHA1 Message Date
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
Ray Speth
ec1abb55a1 Added debian file layout option 2012-06-05 19:56:30 +00:00
Ray Speth
f3c3f47bc5 Incremented version number (2.0.0b3) 2012-06-05 19:56:26 +00:00
Ray Speth
96114edb46 Fixed names of some executable scripts
Also added shebang line to ctml_writer
2012-06-05 19:56:21 +00:00
Ray Speth
8b497e2e97 Fixed some things that weren't cleaned up by 'scons clean' 2012-06-05 19:56:18 +00:00
Ray Speth
cc042e088f Enabled class Adsorbate 2012-05-31 14:57:49 +00:00
Ray Speth
55ef0f3c73 Removed some unimplemented configuration options 2012-05-31 14:57:44 +00:00
Ray Speth
6011f24b38 Removed unnecessary WITH_FEATURE configuration options 2012-05-31 14:57:32 +00:00
Ray Speth
54f18a4e95 Fixed a problem linking to BLAS/LAPACK libraries not on the system path 2012-05-29 21:22:27 +00:00
Ray Speth
31ffb5e400 Added support for Sundials 2.5 2012-05-25 23:13:51 +00:00
Ray Speth
021e11456e Fixed building with thread safety 2012-05-17 21:15:01 +00:00
Ray Speth
924d5b27a6 Improved detection of fortran compiler for setting the module output directory 2012-05-07 18:20:25 +00:00
Ray Speth
1ba0deca74 Fixed python module location in post-install message and setup_cantera script 2012-04-26 21:20:00 +00:00
Ray Speth
436b324ccf Updated the post-build message to be platform-aware 2012-04-19 16:45:19 +00:00
Ray Speth
afc0bad412 Fixed an installation problem on OS X 2012-04-17 15:11:20 +00:00
Ray Speth
e2d775c2cb Fixed configuration check for Sundials when Sundials requires BLAS/LAPACK 2012-04-16 21:00:04 +00:00
Ray Speth
16390cc547 All tests now run using "scons test"
The "newtest" target has been removed.  Python and Matlab unit tests
can be run with "scons test-python" and "scons test-matlab",
respectively.
2012-04-12 15:28:33 +00:00
Ray Speth
ba8c814814 Use the Windows Registry to set PYTHONPATH
Cantera's mechanism conversion scripts are now installed in the main
Cantera directory, so processing should work fine as long as Python is
on the path, whether or not the Cantera Python module is installed.
2012-04-11 20:26:05 +00:00
Ray Speth
2076f37421 Fixed a dependency issue with the MSI target
MSI target now automatically implies "install" (to the stage dir)
2012-04-11 20:26:02 +00:00
Ray Speth
e11281477e Added configuration option for building a single library
This is necessary particularly for Windows, where there's no easy way
to build shared libraries of the f2c code because those functions
don't have the necessary __declspec(dllexport) in their non-existent
headers.
2012-04-05 22:03:30 +00:00
Harry Moffat
25ba149aab Sorry for monolithic commit. Will break it up in the future.
Moved the external libraries to separate library files so that libcantera.a just contains its own namespace externals.

Fixed several errors in the equilibrium program that occurred during the port. (int to size_t issues).

Moved some equilibrium program headers to the include file system, so that it can link with equilibrium program.

Worked on Cantera.mak. Needs more work.

Fixed an issue with the Residual virtual base classes within numerics. They didn't inherit due to int to size_t migration. This caused numerous test problems to fail (issue with backwards compatibility - do we want it and how much do we want?).

Added csvdiff back so that it's available for shell environment runtests.
2012-04-05 00:24:31 +00:00
Ray Speth
3acf30b3aa Moved build directories for docs to make relative links consistent 2012-04-04 18:45:26 +00:00