wmake: Use functions from wmakeFunctions to avoid code duplication

wclean: added support for automatic searching up the tree for the Make directory if in a sub-directory
This commit is contained in:
Henry Weller
2016-07-17 22:59:55 +01:00
parent 8f16204390
commit 13e8fce173
4 changed files with 66 additions and 63 deletions

View File

@ -35,7 +35,7 @@
checkEnv()
{
for envar in WM_OPTIONS WM_DIR WM_PROJECT_DIR
for envar in WM_OPTIONS WM_LINK_LANGUAGE WM_DIR WM_PROJECT_DIR
do
eval test "\$$envar" || {
echo "$Script error: environment variable \$$envar not set" 1>&2
@ -79,6 +79,32 @@ findTarget()
fi
}
cdSource()
{
if [ ! -d $MakeDir ]
then
echo "$Script: '$MakeDir' directory does not exist in $PWD" 1>&2
echo " Searching up directories tree for Make directory"
findTarget .
targetType=
if [ "$dir" ]
then
cd $dir 2>/dev/null || {
echo "$Script error: could not change to directory '$dir'" 1>&2
exit 1
}
fi
fi
[ -r $MakeDir/files ] || {
echo "$Script error: file '$MakeDir/files' does not exist in $PWD" 1>&2
exit 1
}
}
findObjectDir()
{
expandPath $WM_PROJECT_DIR