package openfoam-com: add version 1712 and update patches (#6820)
* combine all patches for 1612 into a single file, with additional comments to explain the rational. * Add kahip decomposition variant. * Add support for ARM64 architecture. * filter instead of patching etc/config.*/settings. This eliminates patch files for 1706, perhaps for the future as well. * URLs at or before version 1612 have a different structure, so provide a url_for_version implementation to handle this
This commit is contained in:
@@ -7,34 +7,28 @@
|
||||
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
|
||||
#-------------------------------------------------------------------------------
|
||||
# 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/>.
|
||||
# This file is part of OpenFOAM, licensed under GNU General Public License
|
||||
# <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# Script
|
||||
# foamEtcFile
|
||||
#
|
||||
# Description
|
||||
# Locate user/group/other files with semantics similar to the
|
||||
# ~OpenFOAM/fileName expansion.
|
||||
# Locate user/group/other file as per '#includeEtc'.
|
||||
#
|
||||
# The -mode option can be used to allow chaining from
|
||||
# personal settings to site-wide settings.
|
||||
# The -mode option can be used to allow chaining from personal settings
|
||||
# to site-wide settings.
|
||||
#
|
||||
# For example, within the user ~/.OpenFOAM/<VER>/prefs.sh:
|
||||
# For example, within the user ~/.OpenFOAM/<VER>/config.sh/compiler:
|
||||
# \code
|
||||
# eval $(foamEtcFile -sh -mode=go prefs.sh)
|
||||
# eval $(foamEtcFile -sh -mode=go config.sh/compiler)
|
||||
# \endcode
|
||||
#
|
||||
# The -mode option is similarly used within etc/{bashrc,cshrc} to ensure
|
||||
# that system prefs are respected:
|
||||
# \code
|
||||
# eval $(foamEtcFile -sh -mode=o prefs.sh)
|
||||
# eval $(foamEtcFile -sh -mode=ug prefs.sh)
|
||||
# \endcode
|
||||
#
|
||||
# Environment
|
||||
@@ -46,42 +40,37 @@
|
||||
# This script must exist in one of these locations:
|
||||
# - $WM_PROJECT_INST_DIR/OpenFOAM-<VERSION>/bin
|
||||
# - $WM_PROJECT_INST_DIR/openfoam-<VERSION>/bin
|
||||
# - $WM_PROJECT_INST_DIR/OpenFOAM+<VERSION>/bin
|
||||
# - $WM_PROJECT_INST_DIR/openfoam+<VERSION>/bin
|
||||
# - $WM_PROJECT_INST_DIR/openfoam<VERSION>/bin (debian version)
|
||||
#
|
||||
#-------------------------------------------------------------------------------
|
||||
unset optQuiet optSilent
|
||||
usage() {
|
||||
[ "${optQuiet:-$optSilent}" = true ] && exit 1
|
||||
exec 1>&2
|
||||
while [ "$#" -ge 1 ]; do echo "$1"; shift; done
|
||||
printHelp() {
|
||||
cat<<USAGE
|
||||
|
||||
Usage: foamEtcFile [OPTION] fileName
|
||||
foamEtcFile [OPTION] [-list|-list-test] [fileName]
|
||||
|
||||
options:
|
||||
-a, -all Return all files (otherwise stop after the first match)
|
||||
-l, -list List directories or files to be checked
|
||||
-all (-a) Return all files (otherwise stop after the first match)
|
||||
-list (-l) List directories or files to be checked
|
||||
-list-test List (existing) directories or files to be checked
|
||||
-mode=MODE Any combination of u(user), g(group), o(other)
|
||||
-prefix=DIR Specify an alternative installation prefix
|
||||
-version=VER Specify alternative OpenFOAM version (eg, 3.0, 1612, ...)
|
||||
-csh | -sh Produce output suitable for a csh or sh 'eval'
|
||||
-csh-verbose | -sh-verbose
|
||||
As per -csh | -sh, with additional verbosity
|
||||
-q, -quiet Suppress all normal output
|
||||
-s, -silent Suppress stderr, except -csh-verbose, -sh-verbose output
|
||||
-csh Produce output suitable for a csh or sh 'eval'
|
||||
-csh-verbose As per -csh with additional verbosity
|
||||
-sh Produce output suitable for a csh or sh 'eval'
|
||||
-sh-verbose As per -sh with additional verbosity
|
||||
-quiet (-q) Suppress all normal output
|
||||
-silent (-s) Suppress stderr, except -csh-verbose, -sh-verbose output
|
||||
-help Print the usage
|
||||
|
||||
Locate user/group/other file with semantics similar to the
|
||||
~OpenFOAM/fileName expansion.
|
||||
Locate user/group/other file as per '#includeEtc'
|
||||
|
||||
Single character options must not be grouped. Equivalent options:
|
||||
-mode=MODE, -mode MODE, -m MODE
|
||||
-prefix=DIR, -prefix DIR, -p DIR
|
||||
-version=VER, -version VER, -v VER
|
||||
Do not group single character options.
|
||||
Equivalent options:
|
||||
| -mode=MODE | -mode MODE | -m MODE
|
||||
| -prefix=DIR | -prefix DIR | -p DIR
|
||||
| -version=VER | -version VER | -v VER
|
||||
|
||||
Exit status
|
||||
0 when the file is found. Print resolved path to stdout.
|
||||
@@ -89,9 +78,11 @@ Exit status
|
||||
2 when the file is not found.
|
||||
|
||||
USAGE
|
||||
exit 1
|
||||
exit 0 # A clean exit
|
||||
}
|
||||
|
||||
|
||||
unset optQuiet optSilent
|
||||
# Report error and exit
|
||||
die()
|
||||
{
|
||||
@@ -146,13 +137,6 @@ guessVersion()
|
||||
version="${version%%*-}" # Extra safety, eg openfoam-version-packager
|
||||
;;
|
||||
|
||||
(OpenFOAM+* | openfoam+*)
|
||||
# Alternative naming: OpenFOAM+<VERSION> or openfoam+<VERSION>
|
||||
dirBase="${projectDirName%%+*}+"
|
||||
version="${projectDirName#*+}"
|
||||
version="${version%%*-}" # Extra safety, eg openfoam-version-packager
|
||||
;;
|
||||
|
||||
(openfoam[0-9]*)
|
||||
# Debian naming: openfoam<VERSION>
|
||||
dirBase="openfoam"
|
||||
@@ -205,8 +189,8 @@ unset optAll optList optShell optVersion
|
||||
while [ "$#" -gt 0 ]
|
||||
do
|
||||
case "$1" in
|
||||
-h | -help)
|
||||
usage
|
||||
-h | -help*)
|
||||
printHelp
|
||||
;;
|
||||
-a | -all)
|
||||
optAll=true
|
||||
|
Reference in New Issue
Block a user