zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: use project api instead of version when finding config files

Browse Source
This commit is contained in:
Mark Olesen
2018-12-10 14:04:01 +01:00
parent ba7b032687
commit a38b459ab0
4 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wmake/wmakeScheduler
View File

@ -43,8 +43,10 @@
#
# Sources the relevant cshrc/bashrc if not set.
#
# WM_PROJECT_DIR, WM_PROJECT and WM_PROJECT_VERSION will have been set
# before calling this routine.
# Environment
# - WM_PROJECT_DIR
# - WM_PROJECT
# - WM_PROJECT_API
#
#-------------------------------------------------------------------------------
Script=${0##*/}
@ -52,7 +54,7 @@ Script=${0##*/}
# csh sets HOST, bash sets HOSTNAME
: ${HOST:=$HOSTNAME}
lockDir=$HOME/.$WM_PROJECT/.wmake
lockDir="$HOME/.$WM_PROJECT/.wmake"
# Fallback - 1 core on current host
: ${WM_HOSTS:=$HOST:1}
@ -86,15 +88,17 @@ case $SHELL in
;;
esac
# Check ~/.$WM_PROJECT/$WM_PROJECT_VERSION/
# Same as foamEtcFile -mode=uo bashrc
#
# Check ~/.$WM_PROJECT/$WM_PROJECT_API/
# Check ~/.$WM_PROJECT/
# Check <installedProject>/etc/
# Check projectDir/etc/
if [ -n "$WM_PROJECT" ]
then
for i in \
$HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
$HOME/.$WM_PROJECT \
$WM_PROJECT_DIR/etc \
"$HOME/.$WM_PROJECT/$WM_PROJECT_API" \
"$HOME/.$WM_PROJECT" \
"$WM_PROJECT_DIR/etc" \
;
do
if [ -f "$i/$shellRc" ]
@ -144,7 +148,6 @@ set -o pipefail
#------------------------------------------------------------------------------
colourPipe()
{
if tty -s <&1 # [ "$1" ]
then
(

29
wmake/wmakeSchedulerUptime
View File

@ -43,8 +43,10 @@
#
# Sources the relevant cshrc/bashrc if not set.
#
# WM_PROJECT_DIR, WM_PROJECT and WM_PROJECT_VERSION will have been set
# before calling this routine.
# Environment
# - WM_PROJECT_DIR
# - WM_PROJECT
# - WM_PROJECT_API
#
#-------------------------------------------------------------------------------
Script=${0##*/}
@ -52,7 +54,8 @@ Script=${0##*/}
# csh sets HOST, bash sets HOSTNAME
: ${HOST:=$HOSTNAME}
lockDir=$HOME/.$WM_PROJECT/.wmake
lockDir="$HOME/.$WM_PROJECT/.wmake"
# Fallback - 1 core on current host
: ${WM_HOSTS:=$HOST:1}
@ -85,15 +88,17 @@ case $SHELL in
;;
esac
# Check ~/.$WM_PROJECT/$WM_PROJECT_VERSION/
# Same as foamEtcFile -mode=uo bashrc
#
# Check ~/.$WM_PROJECT/$WM_PROJECT_API/
# Check ~/.$WM_PROJECT/
# Check <installedProject>/etc/
# Check projectDir/etc/
if [ -n "$WM_PROJECT" ]
then
for i in \
$HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
$HOME/.$WM_PROJECT \
$WM_PROJECT_DIR/etc \
"$HOME/.$WM_PROJECT/$WM_PROJECT_API" \
"$HOME/.$WM_PROJECT" \
"$WM_PROJECT_DIR/etc" \
;
do
if [ -f "$i/$shellRc" ]
@ -138,9 +143,9 @@ done
set -o pipefail
#
#------------------------------------------------------------------------------
# Colour output by argument 1
#
#------------------------------------------------------------------------------
colourPipe()
{
if [ -n "$1" ]
@ -166,8 +171,7 @@ while [ "$#" -gt 0 ]
do
case "$1" in
-np)
shift
nprocs=$1
nprocs="$2"
shift
;;
-*)
@ -177,6 +181,7 @@ do
break
;;
esac
shift
done