ENH: make use of FOAM_API for environment as well (issue #1158)

- was WM_PROJECT_API in the environment and FOAM_API in dictionaries.

  Make these both consistently FOAM_API.
  This is a non-breaking change, since the value of WM_PROJECT_API
  (added in 1812) and/or FOAM_API is purely informative.
  For the current correct values, always use

    * foamEtcFile -show-api
    * wmakeBuildInfo -show-api
This commit is contained in:
Mark Olesen
2019-01-10 12:21:19 +01:00
parent bae92919e5
commit 63d8e7e576
13 changed files with 71 additions and 63 deletions

View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
# \\/ M anipulation | Copyright (C) 2016-2019 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
@ -180,13 +180,13 @@ fi
export PATH="$WM_PROJECT_DIR/bin:$PATH"
# Prepend site-specific scripts to path - only if they exist
if [ -d "$siteDir/bin" ] # Generic
if [ -d "$siteDir/bin" ] # Generic
then
_foamAddPath "$siteDir/bin"
fi
if [ -d "$siteDir/$WM_PROJECT_API/bin" ] # API-specific
if [ -d "$siteDir/$FOAM_API/bin" ] # API-specific
then
_foamAddPath "$siteDir/$WM_PROJECT_API/bin"
_foamAddPath "$siteDir/$FOAM_API/bin"
fi
# OpenFOAM executables (user, group, standard)