diff --git a/tutorials/Allclean b/tutorials/Allclean index c72811f9fae68642d7f48847ec2d44515da5a89b..2a79bb7ec44f9a5caa5964c6574447d15c7d49f2 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 e7d3477cb7d65cb6252a2a285ed786d89e14f1e1..e9b36bc375639f473af76cd2501812a5038b2387 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 515c3110d856507686bddbc0fc60f687cb5c5396..8bd52916008b40ea5475065b101641f811044d4d 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 ) + #------------------------------------------------------------------------------