From 1cd18ce0b5b8893eb093f2db5ad219b24475ef71 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 7 Jan 2009 21:06:08 +0100 Subject: [PATCH] added wmakeLnIncludeAll - can be quite useful after a wcleanLnIncludeAll --- wmake/rules/SiCortex64Gcc/mplib | 6 +-- wmake/rules/SiCortex64Gcc/mplibMPI | 2 +- wmake/wcleanLnIncludeAll | 1 + wmake/wmakeLnIncludeAll | 69 ++++++++++++++++++++++++++++++ wmake/wmkdir | 22 +++++----- 5 files changed, 85 insertions(+), 15 deletions(-) create mode 100755 wmake/wmakeLnIncludeAll diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib index 8a84b40146..294bd86150 100644 --- a/wmake/rules/SiCortex64Gcc/mplib +++ b/wmake/rules/SiCortex64Gcc/mplib @@ -1,3 +1,3 @@ -PFLAGS = -PINC = -PLIBS = +PFLAGS = +PINC = +PLIBS = diff --git a/wmake/rules/SiCortex64Gcc/mplibMPI b/wmake/rules/SiCortex64Gcc/mplibMPI index 4b284e2439..1fb55dd946 100644 --- a/wmake/rules/SiCortex64Gcc/mplibMPI +++ b/wmake/rules/SiCortex64Gcc/mplibMPI @@ -1,3 +1,3 @@ PFLAGS = -DMPICH_SKIP_MPICXX -PINC = +PINC = PLIBS = -lscmpi diff --git a/wmake/wcleanLnIncludeAll b/wmake/wcleanLnIncludeAll index 8e032fa17c..0ca7561c6a 100755 --- a/wmake/wcleanLnIncludeAll +++ b/wmake/wcleanLnIncludeAll @@ -40,6 +40,7 @@ then echo "Usage: ${0##*/} [dir1] .. [dirN]" echo echo " Delete all the lnInclude directories in the tree" + echo exit 1 fi diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll new file mode 100755 index 0000000000..1eb5544d08 --- /dev/null +++ b/wmake/wmakeLnIncludeAll @@ -0,0 +1,69 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. +# \\/ 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 2 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, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# Script +# wmakeLnIncludeAll +# +# Description +# Find directories containing a Make/ directory and execute +# 'wmakeLnInclude -f' for each one +# +#------------------------------------------------------------------------------ +# default is pwd +if [ "$#" -eq 0 ] +then + set -- . +elif [ "$1" = "-h" -o "$1" = "-help" ] +then + echo "Usage: ${0##*/} [dir1] .. [dirN]" + echo + echo " Find directories containing a Make/ directory and" + echo " execute 'wmakeLnInclude -f' for each one" + echo + exit 1 +fi + + +for checkDir +do + if [ -d $checkDir ] + then + echo "searching: $checkDir for 'Make' directories" + else + echo "skipping non-dir: $checkDir" + continue + fi + + find $checkDir -depth -type d -name Make -print | while read dir + do + dir=${dir%Make} + if [ -d "$dir" ] + then + wmakeLnInclude -f $dir + fi + done +done + +#------------------------------------------------------------------------------ diff --git a/wmake/wmkdir b/wmake/wmkdir index 51e8a134e3..441eedb52d 100755 --- a/wmake/wmkdir +++ b/wmake/wmkdir @@ -27,22 +27,22 @@ # wmkdir # # Description -# Script that makes a directory is not already constructed. -# Usage : wmkdir +# Script to make a directory that does not already exist +# Usage : wmkdir # #------------------------------------------------------------------------------ if [ $# -eq 1 ] then - # provide help - if [ "$1" = "-h" -o "$1" = "-help" ] - then - echo "usage: ${0##*/} " - echo " mkdir if directory does not already exist" - else - [ -d "$1" ] || mkdir -p "$1" - fi + # provide help + if [ "$1" = "-h" -o "$1" = "-help" ] + then + echo "usage: ${0##*/} " + echo " mkdir if directory does not already exist" + echo + else + [ -d "$1" ] || mkdir -p "$1" + fi fi - #------------------------------------------------------------------------------