ENH: minor improvements to environment

- handle sourcing bashrc with a relative path (issue #383)
- handle sourcing from bash and zsh.
  Still need manual intervention when sourcing dash, sh, or ksh.
- replace grep in etc/cshrc with sed only
- logical instead of physical path for WM_PROJECT_DIR (issue #431).
  Doesn't seem to be possible for csh/tcsh.

  * Continue using physical locations when comparing directories,
    but not for the top-level FOAM_INST_DIR, WM_PROJECT_DIR.

- relocate WM_CC, WM_CXX overrides from etc/config.*/compiler
  to etc/config.*/settings to ensure that they are left untouched
  when etc/config.sh/compiler is sourced while making third-party
  packages (eg, gcc, llvm, CGAL).

- provide fallback FOAM_TUTORIALS setting in RunFunctions

STYLE: remove "~OpenFOAM" fallback as being too rare, non-obvious
This commit is contained in:
Mark Olesen
2017-03-20 08:57:12 +01:00
parent 5d62a7430d
commit b970ba0901
20 changed files with 267 additions and 268 deletions

View File

@ -31,7 +31,7 @@
#------------------------------------------------------------------------------
case "$WM_COMPILER_TYPE" in
OpenFOAM | ThirdParty)
ThirdParty)
# Default versions of GMP, MPFR and MPC, override as necessary
gmp_version=gmp-system
mpfr_version=mpfr-system
@ -88,20 +88,6 @@ Please check your settings
UNKNOWN_COMPILER
;;
esac
WM_COMPILER_TYPE=ThirdParty # Canonical name
;;
esac
# Common settings (system or ThirdParty)
case "$WM_COMPILER" in
Clang*)
# Using clang - not gcc
export WM_CC='clang'
export WM_CXX='clang++'
;;
Icc*)
export WM_CC='icc'
export WM_CXX='icpc'
;;
esac