Commit graph

68 commits

Author SHA1 Message Date
Ray Speth
886d7b7cdc Move MixMaster into a separate Python module and Git repository
MixMaster has been moved to https://github.com/Cantera/mixmaster
2017-01-20 16:16:32 -05:00
Santosh Shanbhogue
46009e4a95 Fix cantera.pc to pass correct compiler options 2016-12-21 23:42:31 -05:00
Ray Speth
d0a5003eac [SCons] Fix compiler flags included in cantera.pc
Missing '-std=c++0x' or equivalent would lead to compilation errors.
2016-12-21 21:23:50 -05:00
Ray Speth
feca44aa2d [SCons] Install to lib64 directory on operating systems that use this
Resolves #318.
2016-07-25 14:42:46 -04:00
Ray Speth
3261b4108a [SCons] Link Fortran sample programs to the correct standard library 2016-07-20 18:43:41 -04:00
Ray Speth
e71f22aba1 [SCons] Install license file with licenses for 3rd-party code 2016-06-24 15:27:20 -04:00
Ray Speth
df43a474cd [SCons] Modify build system to exclude unused Fortran and f2c code
Cantera no longer requires BLAS / LAPACK (but can use them if available), so it
is never necessary to compile any of the external Fortran or f2c-converted code.
2016-05-14 22:00:22 -04:00
Ray Speth
31c66378c6 [SCons] Fix Cantera.mak when blas_lapack_dir is empty
Previously, if no library directory needed to be specified for BLAS/LAPACK, the
link line would end up containing '-L -llapack -lblas' which is interpreted as
adding the directory '-llapack' to the linker search path.
2016-04-01 15:48:12 -04:00
Ray Speth
b4a1fb2db1 [SCons/Numerics] Use ext/sundials if system Sundials not installed 2015-11-23 16:53:20 -05:00
Bryan W. Weber
b395c68236 [SCons] Fix Cantera.mak cannot be written if extra_inc_dirs or extra_lib_dirs is specified 2015-10-28 12:55:23 -04:00
Ray Speth
f9375e1a09 Use locks/mutexes from the standard library instead of Boost.Thread
This eliminates the need to link against any of the compiled Boost libraries,
and means that we can always build in thread-safe mode
2015-10-17 18:58:50 -04:00
Ray Speth
ab4add0ba2 Cantera does not write temporary files 2015-08-27 23:38:55 -04:00
Ray Speth
6a9dd7f9d6 Remove unused 'csvdiff' application 2015-07-15 12:20:22 -04:00
Ray Speth
812cbc4bc4 Fix user-provided BLAS/LAPACK dir in Cantera.mak
Fixes an error introduced in 5720d7cf90.
2015-06-30 23:22:46 -04:00
Ray Speth
eb75e8b6cc [SCons] Fix BLAS/LAPACK-related variables in Cantera.mak
* Fix logic for when BLAS/LAPACK libraries need to be explicitly listed
* ctlapack and ctblas are no longer separate libraries
2015-06-22 16:53:04 -04:00
Ray Speth
7f847c3877 [SCons] Miscellaneous cleanup of SConstruct/SConscript files 2015-06-13 23:29:58 -04:00
Ray Speth
341b137766 [Doc] Capitalize proper nouns and acronyms 2015-05-25 20:58:44 -04:00
Ray Speth
8ce62988a1 [SCons] Remove previously-deprecated configuration options 2015-05-11 17:23:37 -04:00
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