Commit 93e72c71 authored by Mark Olesen's avatar Mark Olesen

Renamed and adjusted as openfoam-selector, openfoam-selector-menu

- the registered OpenFOAM versions are to have functioning
  etc/bashrc, etc/cshrc files
parent d1d60089
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
EXTRA_DIST = README LICENSE EXTRA_DIST = README LICENSE
nodist_bin_SCRIPTS = mpi-selector nodist_bin_SCRIPTS = openfoam-selector
dist_bin_SCRIPTS = mpi-selector-menu dist_bin_SCRIPTS = openfoam-selector-menu
shell_startupdir = @MPI_SELECTOR_SHELL_STARTUP_DIR@ shell_startupdir = @OPENFOAM_SELECTOR_SHELL_STARTUP_DIR@
shell_startup_SCRIPTS = mpi-selector.sh mpi-selector.csh shell_startup_SCRIPTS = openfoam-selector.sh openfoam-selector.csh
man_MANS = mpi-selector.1 mpi-selector-menu.1 man_MANS = openfoam-selector.1 openfoam-selector-menu.1
CLEANFILES = $(bin_scripts) $(man_MANS) CLEANFILES = $(bin_scripts) $(man_MANS)
mpi-selector.1: mpi-selector openfoam-selector.1: openfoam-selector
pod2man --section=1 --center="User Commands" --release="$(VERSION)" --date="$(MAN_DATE)" --name=mpi-selector mpi-selector > mpi-selector.1 pod2man --section=1 --center="User Commands" --release="$(VERSION)" --date="$(MAN_DATE)" --name=openfoam-selector openfoam-selector > openfoam-selector.1
mpi-selector-menu.1: mpi-selector-menu openfoam-selector-menu.1: openfoam-selector-menu
pod2man --section=1 --center="User Commands" --release="$(VERSION)" --date="$(MAN_DATE)" --name=mpi-selector-menu mpi-selector-menu > mpi-selector-menu.1 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.
This diff is collapsed.
This diff is collapsed.
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
# Startup # Startup
AC_INIT([mpi-selector], AC_INIT([openfoam-selector],
[m4_normalize(esyscmd([cat VERSION]))], [m4_normalize(esyscmd([cat VERSION]))],
[], [mpi-selector]) [], [openfoam-selector])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Setup some directory names and filenames that are common across all # Setup some directory names and filenames that are common across all
...@@ -19,35 +19,33 @@ AC_ARG_WITH([shell-startup-dir], ...@@ -19,35 +19,33 @@ AC_ARG_WITH([shell-startup-dir],
AC_HELP_STRING([--with-shell-startup-dir=<dir>], AC_HELP_STRING([--with-shell-startup-dir=<dir>],
[Directory where shell startup files are installed (default: $pkgdatadir)])) [Directory where shell startup files are installed (default: $pkgdatadir)]))
if test "$with_shell_startup_dir" == ""; then if test "$with_shell_startup_dir" == ""; then
MPI_SELECTOR_SHELL_STARTUP_DIR='$(pkgdatadir)' OPENFOAM_SELECTOR_SHELL_STARTUP_DIR='$(pkgdatadir)'
else else
MPI_SELECTOR_SHELL_STARTUP_DIR=$with_shell_startup_dir OPENFOAM_SELECTOR_SHELL_STARTUP_DIR=$with_shell_startup_dir
fi fi
AC_SUBST(MPI_SELECTOR_SHELL_STARTUP_DIR) AC_SUBST(OPENFOAM_SELECTOR_SHELL_STARTUP_DIR)
AC_MSG_RESULT([$MPI_SELECTOR_SHELL_STARTUP_DIR]) AC_MSG_RESULT([$OPENFOAM_SELECTOR_SHELL_STARTUP_DIR])
AC_MSG_CHECKING([repository directory]) AC_MSG_CHECKING([repository directory])
localstatedir_save="$localstatedir" localstatedir_save="$localstatedir"
eval localstatedir="$localstatedir" eval localstatedir="$localstatedir"
eval MPI_SELECTOR_DATADIR="$localstatedir/mpi-selector/data" eval OPENFOAM_SELECTOR_DATADIR="$localstatedir/openfoam-selector/data"
AC_SUBST(MPI_SELECTOR_DATADIR) AC_SUBST(OPENFOAM_SELECTOR_DATADIR)
localstatedir="$localstatedir_save" localstatedir="$localstatedir_save"
AC_MSG_RESULT([$MPI_SELECTOR_DATADIR]) AC_MSG_RESULT([$OPENFOAM_SELECTOR_DATADIR])
AC_MSG_CHECKING([system configuration directory]) AC_MSG_CHECKING([system configuration directory])
sysconfdir_save="$sysconfdir" sysconfdir_save="$sysconfdir"
eval sysconfdir="$sysconfdir" eval sysconfdir="$sysconfdir"
eval MPI_SELECTOR_SYSCONFDIR="$sysconfdir/sysconfig" eval OPENFOAM_SELECTOR_SYSCONFDIR="$sysconfdir/sysconfig"
AC_SUBST(MPI_SELECTOR_SYSCONFDIR) AC_SUBST(OPENFOAM_SELECTOR_SYSCONFDIR)
sysconfdir="$sysconfdir_save" sysconfdir="$sysconfdir_save"
AC_MSG_RESULT([$MPI_SELECTOR_SYSCONFDIR]) AC_MSG_RESULT([$OPENFOAM_SELECTOR_SYSCONFDIR])
MPI_SELECTOR_SYSCONFIG_FILE="mpi-selector" OPENFOAM_SELECTOR_SYSCONFIG_FILE="openfoam-selector"
MPI_SELECTOR_HOME_FILE=".mpi-selector" OPENFOAM_SELECTOR_HOME_FILE=".openfoam-selector"
MPI_SELECTOR_MPIVARS_BASENAME="mpivars" AC_SUBST(OPENFOAM_SELECTOR_SYSCONFIG_FILE)
AC_SUBST(MPI_SELECTOR_SYSCONFIG_FILE) AC_SUBST(OPENFOAM_SELECTOR_HOME_FILE)
AC_SUBST(MPI_SELECTOR_HOME_FILE)
AC_SUBST(MPI_SELECTOR_MPIVARS_BASENAME)
prefix=$prefix_save prefix=$prefix_save
...@@ -59,12 +57,12 @@ AC_SUBST(MAN_DATE) ...@@ -59,12 +57,12 @@ AC_SUBST(MAN_DATE)
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
mpi-selector openfoam-selector
mpi-selector.sh openfoam-selector.sh
mpi-selector.csh openfoam-selector.csh
]) ])
AC_CONFIG_COMMANDS([tasty], [ AC_CONFIG_COMMANDS([tasty], [
for file in mpi-selector mpi-selector.sh mpi-selector.csh; for file in openfoam-selector openfoam-selector.sh;
do do
if test -f "$file"; then if test -f "$file"; then
chmod -w $file chmod -w $file
......
#! /bin/sh #! /bin/sh
# Common stub for a few missing GNU programs while installing. # Common wrapper for a few potentially missing GNU programs.
scriptversion=2005-06-08.21 scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -18,9 +17,7 @@ scriptversion=2005-06-08.21 ...@@ -18,9 +17,7 @@ scriptversion=2005-06-08.21
# GNU General Public License for more details. # GNU General Public License for more details.
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you # As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a # distribute this file as part of a program that contains a
...@@ -28,63 +25,40 @@ scriptversion=2005-06-08.21 ...@@ -28,63 +25,40 @@ scriptversion=2005-06-08.21
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information" echo 1>&2 "Try '$0 --help' for more information"
exit 1 exit 1
fi fi
run=: case $1 in
# In the cases where this matters, `missing' is being run in the --is-lightweight)
# srcdir already. # Used by our autoconf macros to check whether the available missing
if test -f configure.ac; then # script is modern enough.
configure_ac=configure.ac exit 0
else ;;
configure_ac=configure.in
fi
msg="missing on your system"
case "$1" in --run)
--run) # Back-compat with the calling convention used by older automake.
# Try to run requested program, and just exit if it succeeds.
run=
shift shift
"$@" && exit 0
# Exit code 63 means version mismatch. This often happens
# when the user try to use an ancient version of a tool on
# a file that requires a minimum version. In this case we
# we should proceed has if the program had been absent, or
# if --run hadn't been passed.
if test $? = 63; then
run=:
msg="probably too old"
fi
;; ;;
-h|--h|--he|--hel|--help) -h|--h|--he|--hel|--help)
echo "\ echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]... $0 [OPTION]... PROGRAM [ARGUMENT]...
Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
error status if there is no known handling for PROGRAM. to PROGRAM being missing or too old.
Options: Options:
-h, --help display this help and exit -h, --help display this help and exit
-v, --version output version information and exit -v, --version output version information and exit
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values: Supported PROGRAM values:
aclocal touch file \`aclocal.m4' aclocal autoconf autoheader autom4te automake makeinfo
autoconf touch file \`configure' bison yacc flex lex help2man
autoheader touch file \`config.h.in'
automake touch all \`Makefile.in' files Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
bison create \`y.tab.[ch]', if possible, from existing .[ch] 'g' are ignored when checking the name.
flex create \`lex.yy.c', if possible, from existing .c
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake@gnu.org>." Send bug reports to <bug-automake@gnu.org>."
exit $? exit $?
...@@ -96,265 +70,146 @@ Send bug reports to <bug-automake@gnu.org>." ...@@ -96,265 +70,146 @@ Send bug reports to <bug-automake@gnu.org>."
;; ;;
-*) -*)
echo 1>&2 "$0: Unknown \`$1' option" echo 1>&2 "$0: unknown '$1' option"
echo 1>&2 "Try \`$0 --help' for more information" echo 1>&2 "Try '$0 --help' for more information"
exit 1 exit 1
;; ;;
esac esac
# Now exit if we have it, but it failed. Also exit now if we # Run the given program, remember its exit status.
# don't have it and --version was passed (most likely to detect "$@"; st=$?
# the program).
case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
tar) # If it succeeded, we are done.
if test -n "$run"; then test $st -eq 0 && exit 0
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
exit 1
fi
;;
*) # Also exit now if we it failed (or wasn't found), and '--version' was
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # passed; such an option is passed most likely to detect whether the
# We have it, but it failed. # program is present and works.
exit 1 case $2 in --version|--help) exit $st;; esac
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone
# running `$TOOL --version' or `$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
;;
esac
# If it does not exist, or fails to run (possibly an outdated version), # Exit code 63 means version mismatch. This often happens when the user
# try to emulate it. # tries to use an ancient version of a tool on a file that requires a
case "$1" in # minimum version.
aclocal*) if test $st -eq 63; then
echo 1>&2 "\ msg="probably too old"
WARNING: \`$1' is $msg. You should only need it if elif test $st -eq 127; then
you modified \`acinclude.m4' or \`${configure_ac}'. You might want # Program was missing.
to install the \`Automake' and \`Perl' packages. Grab them from msg="missing on your system"
any GNU archive site." else
touch aclocal.m4 # Program was found and executed, but failed. Give up.
;; exit $st
fi
autoconf) perl_URL=http://www.perl.org/
echo 1>&2 "\ flex_URL=http://flex.sourceforge.net/
WARNING: \`$1' is $msg. You should only need it if gnu_software_URL=http://www.gnu.org/software
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU program_details ()
archive site." {
touch configure case $1 in
aclocal|automake)
echo "The '$1' program is part of the GNU Automake package:"
echo "<$gnu_software_URL/automake>"
echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
echo "<$gnu_software_URL/autoconf>"
echo "<$gnu_software_URL/m4/>"
echo "<$perl_URL>"
;;
autoconf|autom4te|autoheader)
echo "The '$1' program is part of the GNU Autoconf package:"
echo "<$gnu_software_URL/autoconf/>"
echo "It also requires GNU m4 and Perl in order to run:"
echo "<$gnu_software_URL/m4/>"
echo "<$perl_URL>"
;; ;;
autoheader)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
esac esac
done }
touch $touch_files
give_advice ()
{
# Normalize program name to check for.
normalized_program=`echo "$1" | sed '
s/^gnu-//; t
s/^gnu//; t
s/^g//; t'`
printf '%s\n' "'$1' is $msg."
configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
case $normalized_program in
autoconf*)
echo "You should only need it if you modified 'configure.ac',"
echo "or m4 files included by it."
program_details 'autoconf'
;;
autoheader*)
echo "You should only need it if you modified 'acconfig.h' or"
echo "$configure_deps."
program_details 'autoheader'
;; ;;
automake*) automake*)
echo 1>&2 "\ echo "You should only need it if you modified 'Makefile.am' or"
WARNING: \`$1' is $msg. You should only need it if echo "$configure_deps."
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. program_details 'automake'
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
while read f; do touch "$f"; done
;;
autom4te)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo "#! /bin/sh"
echo "# Created by GNU Automake missing as a replacement of"
echo "# $ $@"
echo "exit 0"
chmod +x $file
exit 1
fi
;; ;;
aclocal*)
bison|yacc) echo "You should only need it if you modified 'acinclude.m4' or"
echo 1>&2 "\ echo "$configure_deps."
WARNING: \`$1' $msg. You should only need it if program_details 'aclocal'
you modified a \`.y' file. You may need the \`Bison' package ;;
in order for those modifications to take effect. You can get autom4te*)
\`Bison' from any GNU archive site." echo "You might have modified some maintainer files that require"
rm -f y.tab.c y.tab.h echo "the 'autom4te' program to be rebuilt."
if [ $# -ne 1 ]; then program_details 'autom4te'
eval LASTARG="\${$#}" ;;
case "$LASTARG" in bison*|yacc*)
*.y) echo "You should only need it if you modified a '.y' file."
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` echo "You may want to install the GNU Bison package:"
if [ -f "$SRCFILE" ]; then echo "<$gnu_software_URL/bison/>"
cp "$SRCFILE" y.tab.c ;;
fi lex*|flex*)
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` echo "You should only need it if you modified a '.l' file."
if [ -f "$SRCFILE" ]; then echo "You may want to install the Fast Lexical Analyzer package:"
cp "$SRCFILE" y.tab.h echo "<$flex_URL>"
fi ;;
;; help2man*)
esac echo "You should only need it if you modified a dependency" \
fi "of a man page."
if [ ! -f y.tab.h ]; then echo "You may want to install the GNU Help2man package:"
echo >y.tab.h echo "<$gnu_software_URL/help2man/>"
fi ;;
if [ ! -f y.tab.c ]; then makeinfo*)
echo 'main() { return 0; }' >y.tab.c echo "You should only need it if you modified a '.texi' file, or"
fi echo "any other file indirectly affecting the aspect of the manual."
;; echo "You might want to install the Texinfo package:"
echo "<$gnu_software_URL/texinfo/>"
lex|flex) echo "The spurious makeinfo call might also be the consequence of"
echo 1>&2 "\ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
WARNING: \`$1' is $msg. You should only need it if echo "want to install GNU make:"
you modified a \`.l' file. You may need the \`Flex' package echo "<$gnu_software_URL/make/>"
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
fi
if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
exit 1
fi
;;
makeinfo)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
# If the file does not exist, the user really needs makeinfo;
# let's fail without touching anything.
test -f $file || exit 1
touch $file
;;
tar)
shift
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
# messages.
if (gnutar --version > /dev/null 2>&1); then
gnutar "$@" && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
gtar "$@" && exit 0
fi
firstarg="$1"
if shift; then
case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;; ;;
esac *)
case "$firstarg" in echo "You might have modified some files without having the proper"
*h*) echo "tools for further handling them. Check the 'README' file, it"
firstarg=`echo "$firstarg" | sed s/h//` echo "often tells you about the needed prerequisites for installing"
tar "$firstarg" "$@" && exit 0 echo "this package. You may also peek at any GNU archive site, in"
echo "case some other package contains this missing '$1' program."
;; ;;
esac esac
fi }
echo 1>&2 "\ give_advice "$1" | sed -e '1s/^/WARNING: /' \
WARNING: I can't seem to be able to run \`tar' with the given arguments. -e '2,$s/^/ /' >&2
You may want to install GNU tar or Free paxutils, or check the
command line arguments."
exit 1
;;
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
;;
esac
exit 0 # Propagate the correct exit status (expected to be 127 for a program
# not found, 63 for a program that failed due to version mismatch).
exit $st
# Local variables: # Local variables: