mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
4409a0ea5a
1. "foamCompiler" was changed to a more permanent "WM_COMPILER_TYPE"
environment variable, so that it can be used by 3rd party
installation scripts, such as "makeGcc", "makeLLVM" and so on. More
on this will be provided in issue #1215.
2. The script functions such as "_foamSource()" and "_foamAddPath()"
were moved to a new file "etc/config.sh/functions". It has the
ability to set or unset, depending on whether "WM_BASH_FUNCTIONS" is
defined or not. This allows for these functions to be reused by
other scripts, such as "makeGcc".
3. The script "etc/config.sh/CGAL" relies on whether a local
environment variable "SOURCE_CGAL_VERSIONS_ONLY" is defined or not,
so that it will load only the version settings if it's defined. This
is to make it easier to call this script from "makeCGAL". Although
it still feels a bit of a clunky hack, but I didn't manage to deduce
any other way we could do this :( I didn't add indentation within
the if-block, to make it easier to read the changes. In addition,
the local variable "common_path" is used to shorten the length of
the lines and use slightly less repeated code.
4. Added another new script "etc/config.sh/compiler", which has only
the version numbers for the compilers taken out from the "settings"
file. It currently depends on "WM_COMPILER_TYPE" for setting the
variables, the same way it did with "foamCompiler". This script is
now always sourced from the "settings" file, for the following
reasons:
- "makeGCC" and "makeLLVM" can now take advantage of this script file.
- The example "compiler" script (detailed next) can rely on this
script file and then override parameters on-demand, as well as
allowing for system compilers to have dedicated settings, such as
setting "WM_CC". This is similar to how the example environment
script for "paraview" works.
5. To the script "etc/config.sh/example/compiler" were added a few more examples:
- It now starts with a block where it first loads the default "compiler" script.
- Has a "WM_COMPILER=Gcc48u" case example for when we try to use GCC
4.8 in Ubuntu 15.10. This is just to give the idea that in a
particular system, we might have several system-wide compiler
versions. For example, in Ubuntu 15.10, there is GCC 4.7, 4.8 and
5.2, which could be used for testing performances or compatibility
with some other 3rd party library.
- Has the "WM_COMPILER=Icc" case example, related to the original bug
report, where "WM_CC=icc" and "WM_CXX=icpc", so that the user then
simply copies this file to their own local preferences folder.
6. Small bug fix in "etc/config.sh/mpi", where unsetting "minBufferSize" was missing at the end of the script.
7. Small change in "etc/config.sh/paraview", where "CMAKE_ROOT" is set
along with "CMAKE_HOME". This is due to a rare issue that occurs on
people's systems where they have a custom system-wide CMake version
installed and which is used by having "CMAKE_ROOT" set on that
environment. This can mess up OpenFOAM's custom ParaView builds,
given that conflicting CMake versions can lead to not building
ParaView at all.
- For more details about "CMAKE_ROOT":
https://cmake.org/Wiki/CMake_Useful_Variables [^]
8. The scripts "_foamAddPath _foamAddLib _foamAddMan" were not being
unset at the end of "settings". They are now unset at the end of
"bashrc", through a call to the new double-use "functions" script.
Additionally all references to "foamCompiler" have been changed to
"WM_COMPILER_TYPE".
See also http://www.openfoam.org/mantisbt/view.php?id=1232
155 lines
4.8 KiB
Bash
155 lines
4.8 KiB
Bash
#----------------------------------*-sh-*--------------------------------------
|
|
# ========= |
|
|
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
# \\ / O peration |
|
|
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
|
# \\/ M anipulation |
|
|
#------------------------------------------------------------------------------
|
|
# License
|
|
# This file is part of OpenFOAM.
|
|
#
|
|
# OpenFOAM is free software: you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
# for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
# File
|
|
# etc/config.sh/paraview
|
|
#
|
|
# Description
|
|
# Setup file for paraview-[3-5].x
|
|
# Sourced from OpenFOAM-<VERSION>/etc/bashrc or from foamPV alias
|
|
#
|
|
# Note
|
|
# The env. variables 'ParaView_DIR' and 'ParaView_MAJOR'
|
|
# are required for building plugins
|
|
#------------------------------------------------------------------------------
|
|
|
|
# clean the PATH
|
|
cleaned=$($WM_PROJECT_DIR/bin/foamCleanPath "$PATH" \
|
|
"$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- \
|
|
$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-" \
|
|
) \
|
|
&& PATH="$cleaned"
|
|
|
|
# determine the cmake to be used
|
|
unset CMAKE_HOME
|
|
for cmake in cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 \
|
|
cmake-2.8.1
|
|
do
|
|
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
|
|
if [ -r $cmake ]
|
|
then
|
|
export CMAKE_HOME=$cmake
|
|
export CMAKE_ROOT=$cmake
|
|
export PATH=$CMAKE_HOME/bin:$PATH
|
|
break
|
|
fi
|
|
done
|
|
|
|
|
|
#- ParaView version, automatically determine major version
|
|
#export ParaView_VERSION=3.12.0
|
|
#export ParaView_VERSION=4.0.1
|
|
#export ParaView_VERSION=4.1.0
|
|
#export ParaView_VERSION=4.3.1
|
|
#export ParaView_VERSION=4.4.0
|
|
export ParaView_VERSION=5.0.0
|
|
export ParaView_MAJOR=detect
|
|
|
|
|
|
# Evaluate command-line parameters for ParaView
|
|
_foamParaviewEval()
|
|
{
|
|
while [ $# -gt 0 ]
|
|
do
|
|
case "$1" in
|
|
ParaView*=*)
|
|
# name=value -> export name=value
|
|
eval "export $1"
|
|
;;
|
|
esac
|
|
shift
|
|
done
|
|
}
|
|
|
|
# Evaluate command-line parameters
|
|
_foamParaviewEval $@
|
|
|
|
|
|
# set MAJOR version to correspond to VERSION
|
|
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
|
|
case "$ParaView_VERSION" in
|
|
"$ParaView_MAJOR".* )
|
|
# version and major appear to correspond
|
|
;;
|
|
|
|
[0-9]*)
|
|
# extract major from the version
|
|
ParaView_MAJOR=$(echo $ParaView_VERSION | \
|
|
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
|
|
;;
|
|
esac
|
|
export ParaView_VERSION ParaView_MAJOR
|
|
|
|
paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION
|
|
paraviewArchName=ParaView-$ParaView_VERSION
|
|
|
|
export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
|
|
|
|
# set paths if binaries or source are present
|
|
if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
|
|
then
|
|
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
|
|
if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview-3.0 ]
|
|
then
|
|
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0
|
|
fi
|
|
|
|
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
|
|
if [ ! -d $ParaView_LIB_DIR -a -d $ParaView_DIR/lib/paraview-3.0 ]
|
|
then
|
|
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-3.0
|
|
fi
|
|
|
|
export PATH=$ParaView_DIR/bin:$PATH
|
|
export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH
|
|
export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR
|
|
|
|
if [ "$FOAM_VERBOSE" -a "$PS1" ]
|
|
then
|
|
echo "Using paraview"
|
|
echo " ParaView_DIR : $ParaView_DIR"
|
|
echo " ParaView_LIB_DIR : $ParaView_LIB_DIR"
|
|
echo " ParaView_INCLUDE_DIR : $ParaView_INCLUDE_DIR"
|
|
echo " PV_PLUGIN_PATH : $PV_PLUGIN_PATH"
|
|
fi
|
|
|
|
# add in python libraries if required
|
|
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
|
|
if [ -r $paraviewPython ]
|
|
then
|
|
if [ "$PYTHONPATH" ]
|
|
then
|
|
export PYTHONPATH=$PYTHONPATH:$paraviewPython:$ParaView_LIB_DIR
|
|
else
|
|
export PYTHONPATH=$paraviewPython:$ParaView_LIB_DIR
|
|
fi
|
|
fi
|
|
else
|
|
unset PV_PLUGIN_PATH
|
|
fi
|
|
|
|
unset _foamParaviewEval
|
|
unset cleaned cmake paraviewInstDir paraviewPython
|
|
|
|
#------------------------------------------------------------------------------
|