From 6343e1e3b3a3f457d196c70d6deeeacd2f587a64 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@Germany> Date: Fri, 10 Feb 2017 10:33:50 +0100 Subject: [PATCH] ENH: have wmake and wclean do something sensible with a filename as target - For convenience, let "wmake some/path/filename.C" behave similar to "wmake some/path" and trace back for the Make directory. --- wmake/wclean | 5 ++++- wmake/wmake | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/wmake/wclean b/wmake/wclean index e2f6a3142c3..de9bd6c58db 100755 --- a/wmake/wclean +++ b/wmake/wclean @@ -100,10 +100,13 @@ MakeDir=Make if [ $# -ge 1 ] then - if [ -d "$1" ] then dir=$1 + elif [ -f "$1" ] + then + dir="${1%/*}" + : ${dir:=.} else targetType=$1 fi diff --git a/wmake/wmake b/wmake/wmake index 38f3d3ff6e5..1c3ad99fa6f 100755 --- a/wmake/wmake +++ b/wmake/wmake @@ -4,7 +4,7 @@ # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation -# \\/ M anipulation | +# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. #------------------------------------------------------------------------------- # License # This file is part of OpenFOAM. @@ -250,7 +250,11 @@ if [ $# -ge 1 ] then if [ -d "$1" ] then - dir=$1 + dir="$1" + elif [ -f "$1" ] + then + dir="${1%/*}" + : ${dir:=.} else targetType=$1 fi -- GitLab