Commit graph

50 commits

Author SHA1 Message Date
Ray Speth
7fdef37e4b Replace Google Code URLs 2015-04-07 18:24:55 -04:00
Ray Speth
54c14c3ac1 Remove orphaned 'Cantera_legacy.h' file 2014-06-10 16:21:46 +00:00
Ray Speth
3e39423a42 [Doc] Fix name of 'ck2cti' in man page 2014-05-30 19:22:58 +00:00
Ray Speth
548b5ca468 Remove cti2ctml binary
Use of cti2ctml binary can be replaced with using ctml_writer.py script
directly.
2014-05-29 18:34:44 +00:00
Ray Speth
4e68860165 Generate cantera.pc and Cantera.mak when using MinGW 2014-04-28 18:17:46 +00:00
Ray Speth
403cbc74fc Remove outdated 'mixmaster' script
This script was for the legacy Python module only.
2014-04-14 18:37:49 +00:00
Ray Speth
197a70aab2 Fix to coverage data collection
Skip all the test_problem subdirectories to avoid generating a command line that
is too long for some versions of lcov to handle properly.
2014-04-14 18:36:50 +00:00
Ray Speth
f9278b7e68 Remove unused 'install_tsc' script 2014-01-30 00:47:44 +00:00
Ray Speth
8b435f6dcb [SCons] Fix a problem with Cantera.mak and user-provided BLAS/LAPACK
All cases need to define the mak_blas_lapack_libs_dep variable that
was introduced in r2535.
2013-10-21 01:55:47 +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
5720d7cf90 Fixed an error where the users data was changed before it was used.
Eliminated some deprecations which were not sanctioned.

Worked on Cantera.mak. There is a problem with scons eliminating $ from strings.
2013-09-06 22:52:59 +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
a22ceda566 [Scons] Fix build order dependencies for python modules 2013-08-14 17:55:51 +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
1d40085abc Updated coverage stats to show info on files that were not tested 2013-04-29 18:05:18 +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
978e3605bd [SCons] Cleanup of the build scripts 2013-02-01 23:39:53 +00:00
Ray Speth
89406c2410 [SCons] Udated coverage testing to include the Cython module
Also, exclude the code in the 'test' and 'test_problems' directories from the
coverage statistics.
2013-01-11 22:56:52 +00:00
Ray Speth
55dec034ed Merge branch '2.0' into 'trunk'
Conflicts:
	README
	SConstruct
	configure.ac
	doc/sphinx/conf.py
2012-12-13 22:58:38 +00:00
Ray Speth
180d5c4813 [SCons] Fixed generation of library list in cantera.pc
Now includes cvode, sundials, ctlapack, etc. as necessary depending on the SCons
options specified.
2012-12-12 19:16:02 +00:00
Ray Speth
53891d0b23 [SCons] Include libexecstream in pkg-config libraries 2012-12-07 15:02:55 +00:00
Harry Moffat
08a41f191c Added back constructPhaseFile() and constructPhaseXML().
All molten salt problems were broken and some brine problems were broken.
2012-11-07 23:51:30 +00:00
Harry Moffat
23e792f1a1 Added a CANTERA_INSTALL_ROOT Makefile variable. 2012-11-07 23:30:25 +00:00
Ray Speth
548749d080 Fixed an error building Cantera.mak when 'build_with_f2c' is True 2012-08-14 21:49:00 +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
b1f480daa5 Fixed Cantera.mak when using the 'single_library=y' config option
cherry-pick of r1633 from 2.0 maintenance branch
2012-08-13 20:14:00 +00:00
Ray Speth
f212e3b9d3 Removing leftover references to the Cantera_CXX namespace 2012-08-08 22:18:09 +00:00
Ray Speth
88bb6fe679 Removed obsolete C++ Chemkin mechanism converter 2012-07-26 20:49:50 +00:00
Ray Speth
7bbadb8063 Remove non-Cantera code from coverage report 2012-07-18 17:37:26 +00:00
Ray Speth
1bae2a373c Fixed Cantera.mak when using the 'single_library=y' config option 2012-07-10 16:23:21 +00:00
Ray Speth
205312e632 Generate cantera.pc for use with pkg-config 2012-06-12 22:48:51 +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
847e1ed0bd Added missing man pages for mechanism conversion scripts / programs 2012-06-05 19:56:06 +00:00
Ray Speth
d2b0a92cd9 Fixed an error in ck2cti man page (and reformatted) 2012-06-05 19:56:02 +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
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
04841e181c Fixed generating Cantera.mak on OS X 2012-03-15 19:55:34 +00:00
Ray Speth
3be53356a2 Updated sample build scripts to include pthread where necessary 2012-03-09 22:59:50 +00:00
Ray Speth
8150f49c2c Simplified adding SCons build and install targets 2012-03-05 20:45:20 +00:00
Ray Speth
3a15fef000 legacy_headers option now installs Cantera.h 2012-03-05 20:45:03 +00:00
Ray Speth
489469b6bf Added example Makefiles to install with the F77/F90 samples 2012-03-05 20:44:52 +00:00
Ray Speth
45fe098d51 Added example Makefiles to install with C++ sample programs 2012-03-01 00:44:56 +00:00
Ray Speth
1ece5bcc3d Some changes to make SCons faster 2012-02-23 21:25:20 +00:00
Ray Speth
eb2cab5f2b Updates to SCons scripts to support the new directory structure 2012-02-12 02:46:40 +00:00
Ray Speth
2528df0f75 Reorganized source tree structure
These changes make it unnecessary to copy header files around during
the build process, which tends to confuse IDEs and debuggers. The
headers which comprise Cantera's external C++ interface are now in
the 'include' directory.

All of the samples and demos are now in the 'samples' subdirectory.
2012-02-12 02:27:14 +00:00
Ray Speth
c8e1f291fa Added installation options to WiX installer 2012-01-05 22:22:03 +00:00
Ray Speth
03546b04a6 Moved wxsgen.py into the site_scons directory 2012-01-03 23:08:11 +00:00
Ray Speth
a7402d0094 Added functions to automatically add files to windows install 2012-01-03 23:08:05 +00:00
Ray Speth
084666bef3 First steps toward developing a Windows installer 2012-01-03 23:07:58 +00:00