Commit ad543c88 authored by Mark Olesen's avatar Mark Olesen

Merge branch 'develop' into 'master'

Update master to match develop
parents 2e32ac0a 6fee7e3c
......@@ -270,32 +270,6 @@ sed -n \
#------------------------------------------------------------------------------
# Special treatment for gcc sub-components (needs rethinking)
case "$compilerVERSION" in
Gcc | Gcc48)
gccVERSION=gcc-4.8.5 # match value in config.sh/compiler
;;
Gcc49)
gccVERSION=gcc-4.9.3 # match value in config.sh/compiler
;;
Gcc62)
gccVERSION=gcc-6.2.0 # match value in config.sh/compiler
;;
Gcc63)
gccVERSION=gcc-6.3.0 # match value in config.sh/compiler
;;
Gcc71)
gccVERSION=gcc-7.1.0 # match value in config.sh/compiler
;;
Gcc*)
echo "Error: unconfigured gcc version '$compilerVERSION'"
exit 1 # Really exit, since this must be an input error
;;
esac
# -----------------------------------------------------------------------------
# NO FURTHER EDITING BELOW THIS LINE
#------------------------------------------------------------------------------
# Name of qt source directory is a fixed value
qtSource="qt-everywhere-opensource-src-${qtVERSION##*-}"
......@@ -528,6 +502,58 @@ _ifDifferent()
[ "$#" -eq 3 -a "$2" != "$3" ] && echo "$1 $2"
}
# Function to do replacement on file. Checks if any replacement has been done.
# _inlineSed <file> <regexp> <replacement> <msg>
_inlineSed()
{
local file="$1"
local regexp="$2"
local replacement="$3"
local msg="$4"
local cmd='/^[^#]/s@'"$regexp"'@'"$replacement"'@'
[ -f "$file" ] || {
echo "Missing file: $file"
exit 2 # Fatal
}
grep -q "$regexp" "$file" && sed -i -e "$cmd" "$file" || { \
echo "Failed: ${msg:-replacement} in $file"
return 1
}
[ -n "$msg" ] && echo " $msg ($file)"
return 0
}
# Standard <key> <val> type of replacements.
# replace <file> <key1> <val1> .. <keyN> <valN>
# looks for KEYWORD=.*
replace()
{
local file="$1"
shift
local key val
while [ "$#" -ge 2 ]
do
key=$1
val=$2
shift 2
_inlineSed \
$file \
"$key=.*" \
"$key=$val" \
"Replaced $key setting by '$val'"
done
}
#
# Unpack files and make any adjustments
#
......@@ -570,6 +596,7 @@ unpackAllFiles()
_mvdir "$TPsource" "$TPdirName"
_mvdir ThirdParty-plus "$TPdirName"
echo
cd $INSTALL_DIR/$OFdirName || {
echo "Error: cannot change to $INSTALL_DIR/$OFdirName"
......@@ -585,6 +612,9 @@ unpackAllFiles()
if true
then
# Pre-1812, no -gcc option for foamConfigurePaths
hasOptGcc="$(exec /bin/sh $foamConfigure -help 2>&1 | sed -ne 's/^ *-gcc.*$/true/p')"
# Compiler configuration (already sanity checked much further above)
compilerOpt="-$compilerTypeVERSION $compilerVERSION"
case "$compilerTypeVERSION:$compilerVERSION" in
......@@ -592,6 +622,17 @@ unpackAllFiles()
compilerOpt="$compilerOpt -clang $llvmVERSION"
;;
third:Gcc*)
case "$hasOptGcc:$gccVERSION" in
(true:gcc-[1-9]*)
# Can use the -gcc option, and have gcc-version
compilerOpt="$compilerOpt -gcc $gccVERSION"
;;
(:gcc-[1-9]*)
# Manual edit for gcc-version
echo "Simulated '-gcc $gccVERSION' option manually"
replace etc/config.sh/compiler gcc_version "$gccVERSION"
;;
esac
compilerOpt="$compilerOpt $gmpVERSION $mpfrVERSION $mpcVERSION"
;;
esac
......@@ -607,6 +648,7 @@ unpackAllFiles()
_ifDifferent -fftw $fftwVERSION $fftwDEFAULT
_ifDifferent -scotch $scotchVERSION $scotchDEFAULT
_ifDifferent -kahip $kahipVERSION $kahipDEFAULT
_ifDifferent -metis $metisVERSION $metisDEFAULT
_ifDifferent -openmpi $openmpiVERSION $openmpiDEFAULT
)
......@@ -633,6 +675,7 @@ unpackAllFiles()
_unpackIfDifferent $fftwVERSION $fftwDEFAULT
_unpackIfDifferent $scotchVERSION $scotchDEFAULT
_unpackIfDifferent $kahipVERSION $kahipDEFAULT
_unpackIfDifferent $metisVERSION $metisDEFAULT
_unpackIfDifferent $openmpiVERSION $openmpiDEFAULT
case "$compilerTypeVERSION:$compilerVERSION" in
......
#------------------------------------------------------------------------------
# File
# v1806.cfg
#
# Description
# Configuration file for legacyCompile
#------------------------------------------------------------------------------
# Top-level package information
[package]
FoamVersion=v1806
OFdirName=OpenFOAM-v1806
TPdirName=ThirdParty-v1806
# If source packages differ from the directory names, uncomment and adjust
# OFsource=OpenFOAM-plus
# TPsource=ThirdParty-plus
# Architecture
[arch]
label=32
scalar=32
[software]
# Preferred software versions etc. Use 'third' for ThirdParty.
#---------------------+-------------------+-------------------+
# package | default | user-preference |
#---------------------+-------------------+-------------------+
boost boost_1_64_0
cgal CGAL-4.9.1
fftw fftw-3.3.7
openmpi openmpi-1.10.4
scotch scotch_6.0.3
kahip kahip-2.00
paraview ParaView-5.5.2 none
cmake cmake-system cmake-3.5.2
vtk none VTK-8.1.0
mesa none mesa-17.1.1
qt qt-system qt-5.9.3
llvm llvm-3.7.1
gcc system gcc-4.8.5
gmp system gmp-6.1.2
mpfr system mpfr-4.0.1
mpc system mpc-1.0.3
ompiType system third
compilerType system third
compiler Gcc
# -----------------------------------------------------------------------------
Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
$COPYRIGHT$
Additional copyrights may follow
Copyright (C) 2018 OpenCFD Ltd.
$HEADER$
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer listed
in this license in the documentation and/or other materials
provided with the distribution.
- Neither the name of the copyright holders nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
The copyright holders provide no reassurances that the source code
provided does not infringe any patent, copyright, or any other
intellectual property rights of third parties. The copyright holders
disclaim any liability to any recipient for claims brought against
recipient by any third party for infringement of that parties
intellectual property rights.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
# Copyright (C) 2018 OpenCFD Ltd.
EXTRA_DIST = README LICENSE
nodist_bin_SCRIPTS = openfoam-selector
dist_bin_SCRIPTS = openfoam-selector-menu
shell_startupdir = @OPENFOAM_SELECTOR_SHELL_STARTUP_DIR@
shell_startup_SCRIPTS = openfoam-selector.sh openfoam-selector.csh
man_MANS = openfoam-selector.1 openfoam-selector-menu.1
CLEANFILES = $(bin_scripts) $(man_MANS)
openfoam-selector.1: openfoam-selector
pod2man --section=1 --center="User Commands" --release="$(VERSION)" --date="$(MAN_DATE)" --name=openfoam-selector openfoam-selector > openfoam-selector.1
openfoam-selector-menu.1: openfoam-selector-menu
pod2man --section=1 --center="User Commands" --release="$(VERSION)" --date="$(MAN_DATE)" --name=openfoam-selector-menu openfoam-selector-menu > openfoam-selector-menu.1
This diff is collapsed.
Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved.
Copyright (C) 2018 OpenCFD Ltd.
Preamble
========
The openfoam-selector an OpenFOAM-specific adaptation of the
mpi-selector provided by Jeff Squyres and Cisco Systems.
Overview
========
openfoam-selector is simple tool to help manage multiple OPENFOAM
versions installed on a single host (or cluster). It allows system
administrators to set a site-wide default OPENFOAM version, but also
allows users to selectively override that site-wide default with their
own choice of OPENFOAM version.
Both selections are optional and independent; system administrators
may choose not to set a site-wide default while users do choose to
their own default (and vice versa).
More information is contained in the openfoam-selector.1 man page.
Installation
============
openfoam-selector is installed with a traditional "configure" / "make"
combination common. The main option that you'll need for "configure"
is the --prefix option, which specifies the top directory where
openfoam-selector and its files are installed.
shell$ ./configure --prefix=/where/to/install
Then run "make install" to install (you may need root permissions if
installing into restricted directories):
shell# make install
This command will install the following files:
$bindir/openfoam-selector
--> $bindir defaults to "$prefix/bin", unless overridden on
the "configure" command line
$mandir/man1/openfoam-selector.1
--> $mandir defaults to "$prefix/man", unless overridden on
the "configure" command line
$pkgdatadir/openfoam-selector.sh
$pkgdatadir/openfoam-selector.csh
--> $pkgdatadir defaults to "$prefix/share/openfoam-selector", unless
overridden on the "configure" command line (RPMs will
typically change this value -- YMMV).
The two files installed in $pkgdatadir are intended for site-wide
shell startup usage. For example, on RedHat systems, they should be
copied to /etc/profile.d so that all shells will execute them upon
startup.
These last two files will examine both the site-wide and per user OPENFOAM
version selection, and if one is set, setup the shell's
environment for it.
The shell version also provides an "openfoam_select" function that can
be used directly from the user shell after changing versions and
without logging out.
Contact
=======
If you need assistance with openfoam-selector, first read the
openfoam-selector(1) man page; it contains more information than
listed here.
If that still does not answer your question, please post a gitlab issue
https://develop.openfoam.com/Community/feature-scripts
2018-12-03 OpenCFD Ltd.
This diff is collapsed.
This diff is collapsed.
# -*- shell-script -*-
# Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
# Copyright (C) 2018 OpenCFD Ltd.
# Startup
AC_INIT([openfoam-selector],
[m4_normalize(esyscmd([cat VERSION]))],
[], [openfoam-selector])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Setup some directory names and filenames that are common across all
# the scripts
prefix_save=$prefix
if test "NONE" = "$prefix"; then
prefix=/usr/local
fi
AC_MSG_CHECKING([shell startup file directory])
AC_ARG_WITH([shell-startup-dir],
AC_HELP_STRING([--with-shell-startup-dir=<dir>],
[Directory where shell startup files are installed (default: $pkgdatadir)]))
if test "$with_shell_startup_dir" == ""; then
OPENFOAM_SELECTOR_SHELL_STARTUP_DIR='$(pkgdatadir)'
else
OPENFOAM_SELECTOR_SHELL_STARTUP_DIR=$with_shell_startup_dir
fi
AC_SUBST(OPENFOAM_SELECTOR_SHELL_STARTUP_DIR)
AC_MSG_RESULT([$OPENFOAM_SELECTOR_SHELL_STARTUP_DIR])
AC_MSG_CHECKING([repository directory])
localstatedir_save="$localstatedir"
eval localstatedir="$localstatedir"
eval OPENFOAM_SELECTOR_DATADIR="$localstatedir/openfoam-selector/data"
AC_SUBST(OPENFOAM_SELECTOR_DATADIR)
localstatedir="$localstatedir_save"
AC_MSG_RESULT([$OPENFOAM_SELECTOR_DATADIR])
AC_MSG_CHECKING([system configuration directory])
sysconfdir_save="$sysconfdir"
eval sysconfdir="$sysconfdir"
eval OPENFOAM_SELECTOR_SYSCONFDIR="$sysconfdir/sysconfig"
AC_SUBST(OPENFOAM_SELECTOR_SYSCONFDIR)
sysconfdir="$sysconfdir_save"
AC_MSG_RESULT([$OPENFOAM_SELECTOR_SYSCONFDIR])
OPENFOAM_SELECTOR_SYSCONFIG_FILE="openfoam-selector"
OPENFOAM_SELECTOR_HOME_FILE=".openfoam-selector"
AC_SUBST(OPENFOAM_SELECTOR_SYSCONFIG_FILE)
AC_SUBST(OPENFOAM_SELECTOR_HOME_FILE)
prefix=$prefix_save
# Information for the man page
MAN_DATE=`date "+%Y-%m-%d"`
AC_SUBST(MAN_DATE)
# Party on
AC_CONFIG_FILES([
Makefile
openfoam-selector
openfoam-selector.sh
openfoam-selector.csh
])
AC_CONFIG_COMMANDS([tasty], [
for file in openfoam-selector openfoam-selector.sh;
do
if test -f "$file"; then
chmod -w $file
chmod +x $file
fi
done])
AC_OUTPUT
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2005-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
#
# Copyright (C) 1994 X Consortium
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Except as contained in this notice, the name of the X Consortium shall not
# be used in advertising or otherwise to promote the sale, use or other deal-
# ings in this Software without prior written authorization from the X Consor-
# tium.
#
#
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs.
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
chmodcmd="$chmodprog 0755"
chowncmd=
chgrpcmd=
stripcmd=
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=
dst=
dir_arg=
dstarg=
no_target_directory=
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
In the 1st form, copy SRCFILE to DSTFILE.
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
-c (ignored)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-s $stripprog installed files.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
--help display this help and exit.
--version display version info and exit.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
while test -n "$1"; do
case $1 in
-c) shift
continue;;
-d) dir_arg=true
shift
continue;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
--help) echo "$usage"; exit $?;;
-m) chmodcmd="$chmodprog $2"
shift
shift
continue;;
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
-s) stripcmd=$stripprog
shift
continue;;
-t) dstarg=$2
shift
shift
continue;;
-T) no_target_directory=true
shift
continue;;
--version) echo "$0 $scriptversion"; exit $?;;
*) # When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
test -n "$dir_arg$dstarg" && break
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
dstarg=$arg
done
break;;
esac
done
if test -z "$1"; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
fi
# It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
for src
do
# Protect names starting with `-'.
case $src in
-*) src=./$src ;;
esac
if test -n "$dir_arg"; then
dst=$src
src=
if test -d "$dst"; then
mkdircmd=:
chmodcmd=
else
mkdircmd=$mkdirprog
fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
echo "$0: $src does not exist." >&2
exit 1
fi
if test -z "$dstarg"; then
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dstarg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst ;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
dst=$dst/`basename "$src"`
fi
fi
# This sed command emulates the dirname command.
dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# Skip lots of stat calls in the usual case.
if test ! -d "$dstdir"; then
defaultIFS='
'
IFS="${IFS-$defaultIFS}"
oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
shift
IFS=$oIFS
pathcomp=
while test $# -ne 0 ; do
pathcomp=$pathcomp$1
shift
if test ! -d "$pathcomp"; then
$mkdirprog "$pathcomp"
# mkdir can fail with a `File exist' error in case several
# install-sh are creating the directory concurrently. This
# is OK.
test -d "$pathcomp" || exit
fi
pathcomp=$pathcomp/
done
fi
if test -n "$dir_arg"; then
$doit $mkdircmd "$dst" \
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
else
dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
$doit $cpprog "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
# Now rename the file to the real destination.
{ $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
if test -f "$dstdir/$dstfile"; then
$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
(exit 1); exit 1
}
else
:
fi
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
}
}
fi || { (exit 1); exit 1; }
done
# The final little trick to "correctly" pass the exit status to the exit trap.
{
(exit 0); exit 0
}
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:
#!/bin/sh
#------------------------------------------------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2018 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------