From f8823b684b123bd899cbbc7b54f67e644f1688ac Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 30 Sep 2008 19:32:13 +0200
Subject: [PATCH] wcleanAll - provide some information about the progress
- move tutorial cleanup to the end in case the user wishes to
abort the wcleanAll script
- adjusted wcleanAlmostAll according, but don't know if it's really
needed any more
---
tutorials/Allclean | 10 +++++-----
wmake/wcleanAll | 11 +++++++++--
wmake/wcleanAlmostAll | 18 ++++++++++++------
3 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/tutorials/Allclean b/tutorials/Allclean
index c72811f9fae..2a79bb7ec44 100755
--- a/tutorials/Allclean
+++ b/tutorials/Allclean
@@ -32,15 +32,15 @@
cd ${0%/*} || exit 1 # run from this directory
-echo "Cleaning backup files"
+echo "--------"
+echo "Cleaning tutorials ..."
+echo "Removing backup files"
find . -type f \( -name "*~" -o -name "*.bak" \) -exec rm {} \;
find . \( -name 'core' -o -name 'core.[1-9]*' \) -exec rm {} \;
find . \( -name '*.pvs' -o -name '*.OpenFOAM' \) -exec rm {} \;
-rm logs > /dev/null 2>&1
-rm testLoopReport > /dev/null 2>&1
-
-echo ""
+rm logs testLoopReport > /dev/null 2>&1
foamCleanTutorials cases
+echo "--------"
# ----------------------------------------------------------------- end-of-file
diff --git a/wmake/wcleanAll b/wmake/wcleanAll
index e7d3477cb7d..e9b36bc3756 100755
--- a/wmake/wcleanAll
+++ b/wmake/wcleanAll
@@ -39,20 +39,27 @@
for dir in lib applications/bin
do
+ echo "Removing $dir/"
[ -d $dir ] && rm -rf $dir/*
done
-( cd tutorials && ./Allclean )
-
+echo "Removing *~ backup files"
find . -name '*~' -exec rm {} \;
+
+echo "Removing .dep files"
find . -name '*.dep' -exec rm {} \;
+echo "Cleaning Make subdirectories"
find `find . -depth \( -name "Make.[A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
+echo "Removing lnInclude and intermediate directories"
find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
+echo "Removing misc files"
find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
# rm -rf src/mpich-${MPICH_VERSION}/platforms
+( cd tutorials && ./Allclean )
+
#------------------------------------------------------------------------------
diff --git a/wmake/wcleanAlmostAll b/wmake/wcleanAlmostAll
index 515c3110d85..8bd52916008 100755
--- a/wmake/wcleanAlmostAll
+++ b/wmake/wcleanAlmostAll
@@ -24,11 +24,10 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
-# wmakeAlmostAll
+# wcleanAlmostAll
#
# Description
-# script that searches all the directories below the current for the
-# object file directories of all machines and then deletes them.
+# as per wcleanAll, but retains "*~" backup files
#
#------------------------------------------------------------------------------
@@ -39,18 +38,25 @@
for dir in lib applications/bin
do
+ echo "Removing $dir/"
[ -d $dir ] && rm -rf $dir/*
done
-( cd tutorials && ./Allclean )
+echo "Retaining *~ backup files"
+## find . -name '*~' -exec rm {} \;
-# find . -name '*~' -exec rm {} \;
+echo "Removing .dep files"
find . -name '*.dep' -exec rm {} \;
-find `find . -depth \( -name "Make[.A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make[.A-Za-z]*" ! -name "*Make" \) -exec rm -r {} \;
+echo "Cleaning Make subdirectories"
+find `find . -depth \( -name "Make.[A-Za-z]*" -o -name "Make" \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
+echo "Removing lnInclude and intermediate directories"
find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
+echo "Removing misc files"
find . \( -name exe -o -name log -o -name so_locations \) -exec rm {} \;
+( cd tutorials && ./Allclean )
+
#------------------------------------------------------------------------------
--
GitLab