minor tweak to wmake

- place wmkdep and dirToString executables under
  utilbin/$(WM_ARCH)$(WM_COMPILER).
  This helps somewhat when copying rules about, and might help when creating
  general rules.
This commit is contained in:
Mark Olesen
2009-05-06 15:56:29 +02:00
parent 51f443a345
commit 1cdbeb29d7
16 changed files with 66 additions and 52 deletions

View File

@ -5,7 +5,7 @@
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#

View File

@ -5,7 +5,7 @@
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
@ -35,11 +35,11 @@
if [ -r Make/files ]
then
echo "makeFiles: Make/files already exists, exiting"
exit 1
echo "makeFiles: Make/files already exists, exiting"
exit 1
fi
rulesPath=$WM_DIR/rules/$WM_ARCH$WM_COMPILER
utilbin=$WM_DIR/utilbin/$WM_ARCH$WM_COMPILER
[ -d Make ] || mkdir Make
rm -f Make/files
@ -48,16 +48,16 @@ dirs=`find . -name "*" -type d -print`
for dir in $dirs
do
if [ $dir != . ]
then
baseDirName=`echo $dir | sed 's%^\./%%' | $rulesPath/dirToString`
baseDir=`echo $dir | sed 's%^\./%%'`
if [ $dir != . ]
then
baseDir=`echo $dir | sed 's%^\./%%'`
baseDirName=`echo $baseDir | $utilbin/dirToString`
if [ $baseDirName != Make ]
then
echo $baseDirName " = " $baseDir >> Make/files
fi
fi
if [ $baseDirName != Make ]
then
echo $baseDirName " = " $baseDir >> Make/files
fi
fi
done
echo >> Make/files
@ -66,12 +66,12 @@ files=`find . -name "*.[cCylfF]" -type f -print`
for file in $files
do
pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $rulesPath/dirToString`
pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $utilbin/dirToString`
fileName=`echo ${file##*/}`
if [ "$pathName" != "" ]
then
echo '$('$pathName")/"$fileName >> Make/files
echo '$('$pathName')/'$fileName >> Make/files
else
echo $fileName >> Make/files
fi

View File

@ -5,7 +5,7 @@
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#

View File

@ -5,7 +5,7 @@
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#