songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wdep: If source file is not in the current directory search tree for first occurrence

Browse Source
This commit is contained in:
Henry 2015-01-11 17:16:15 +00:00
parent a64d623394
commit 6b819790b4
6 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/foamPackBin
View File

@ -133,7 +133,7 @@ fi
#------------------------------------------------------------------------------
# get list of directories
# Get list of directories
dirList=$( $listBinDirs $packDir $archOptions )
if [ $? -eq 0 -a -n "$dirList" ]
then

0
wmake/wmakeFunctions → wmake/scripts/wmakeFunctions
View File

25
wmake/wdep
View File

@ -27,17 +27,15 @@
# cat `wdep <file>`
#
# Description
# Find the dep-file corresponding to <file> and print the path.
#
# Note: wdep MUST be run from the directory containing <file>.
# If it proves useful an option could be added to search the local
# source-tree for <file> if it is not in the current directory.
# Find the .dep file corresponding to <file> and print the path.
# If <file> is not in the current directory the tree is searched for
# the first occurrence.
#
#------------------------------------------------------------------------------
Script=${0##*/}
# Source the wdep functions
. ${0%/*}/wmakeFunctions
# Source the wmake functions
. ${0%/*}/scripts/wmakeFunctions
usage() {
exec 1>&2
@ -78,13 +76,20 @@ checkEnv
#------------------------------------------------------------------------------
# Check <file> is is the current directory
# Check <file> is is the current directory,
# otherwise search tree for first occurrance
#------------------------------------------------------------------------------
sourceFile=$1
if [ ! -e $1 ]
then
echo "$Script error: source file $1 is not in the current directory" 1>&2
sourceFile=$(find . -name $sourceFile -print -quit)
if [ -z "$sourceFile" ]
then
echo "$Script: cannot find source file $1" 1>&2
exit 1
fi
fi
@ -93,7 +98,7 @@ fi
# and echo path for the dep file corresponding to the specified source file
#------------------------------------------------------------------------------
findObjectDir $1
findObjectDir $sourceFile
fileName=${1##*/}

4
wmake/wrmdep
View File

@ -34,8 +34,8 @@
#------------------------------------------------------------------------------
Script=${0##*/}
# Source the wmakeFunctions
. ${0%/*}/wmakeFunctions
# Source the wmake functions
. ${0%/*}/scripts/wmakeFunctions
usage() {
exec 1>&2

4
wmake/wrmdepold
View File

@ -35,8 +35,8 @@
#------------------------------------------------------------------------------
Script=${0##*/}
# Source the wdep functions
. ${0%/*}/wmakeFunctions
# Source the wmake functions
. ${0%/*}/scripts/wmakeFunctions
usage() {
exec 1>&2

4
wmake/wrmo
View File

@ -34,8 +34,8 @@
#------------------------------------------------------------------------------
Script=${0##*/}
# Source the wmakeFunctions
. ${0%/*}/wmakeFunctions
# Source the wmake functions
. ${0%/*}/scripts/wmakeFunctions
usage() {
exec 1>&2