[rtems commit] Do not remove scripts upon ./bootstrap -c.

Ralf Corsepius ralf at rtems.org
Fri Jul 27 08:08:01 UTC 2012


Module:    rtems
Branch:    4.10
Commit:    2fae9a7b2aa4f23b0f88e89b7811a400d0395161
Changeset: http://git.rtems.org/rtems/commit/?id=2fae9a7b2aa4f23b0f88e89b7811a400d0395161

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Fri Jul 27 10:11:31 2012 +0200

Do not remove scripts upon ./bootstrap -c.
Introduce ./boottrap -c -f.

---

 bootstrap |   74 +++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/bootstrap b/bootstrap
index 2f7d4dc..de5d626 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,12 +3,10 @@
 # helps bootstrapping, when checked out from CVS
 # requires GNU autoconf and GNU automake
 #
-# $Id$
-
 # this is not meant to be exported outside the source tree
-
+#
 # NOTE: Inspired by libtool's autogen script
-
+#
 # to be run from the toplevel directory of RTEMS'
 # source tree
 
@@ -17,7 +15,8 @@ top_srcdir=`dirname $0`
 
 verbose="";
 quiet="false"
-mode="generate"
+mode="autoreconf"
+force=0
 
 usage()
 {
@@ -83,12 +82,18 @@ case $1 in
 -c|--cl|--cle|--clea|--clean)
   mode="clean";
   shift;;
+-f|--fo|--for|--forc|--force)
+  force=`expr $force + 1`
+  shift;;
 -p|--pr|--pre|--prei|--prein|--preins|--preinst)
   mode="preinstall";
   shift;;
 -r|--re|--rec|--reco|--recon|--reconf)
   mode="autoreconf";
   shift;;
+-g|--ge|--gen|--gene|--gener|--genera|--generat|--generate)
+  mode="generate";
+  shift;;
 -*) echo "unknown option $1" ;
   usage ;;
 *) echo "invalid parameter $1" ;
@@ -188,27 +193,58 @@ autoreconf)
 clean)
   test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
   files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
-  for i in $files; do if test -f $i; then
-    rm -f $i
-    test "$verbose" = "-v" && echo "$i"    
-  fi; done
+  for i in $files; do 
+    if test -f $i; then
+      rm -f $i
+      test "$verbose" = "-v" && echo "$i"    
+    fi; 
+  done
 
   test "$quiet" = "true" || echo "removing configure files"
   files=`find . -name 'configure' -print` ;
-  test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
-  for i in $files; do if test -f $i; then
-    rm -f $i config.sub config.guess depcomp install-sh mdate-sh missing \
-	mkinstalldirs texinfo.tex compile
-    test "$verbose" = "-v" && echo "$i"    
-  fi; done
+  for i in $files; do 
+    if test -f $i; then
+      rm -f $i
+      test "$verbose" = "-v" && echo "$i"
+    fi;
+  done
   
+  if test $force -gt 0; then
+    needles=""
+    if test $force -gt 1; then
+      # Manually maintained
+      needles="$needles config.sub"
+      needles="$needles config.guess"
+    fi
+    if test $force -gt 0; then
+      # Inherited from automake
+      needles="$needles compile"
+      needles="$needles depcomp"
+      needles="$needles install-sh"
+      needles="$needles missing"
+      needles="$needles mdate-sh"
+      needles="$needles texinfo.tex"
+    fi
+    for j in $needles; do
+      files=`find . -name "$j" -print`
+      for i in $files; do 
+        if test -f $i; then
+          rm -f $i
+          test "$verbose" = "-v" && echo "$i"
+        fi;
+      done
+    done
+  fi
+
   test "$quiet" = "true" || echo "removing aclocal.m4 files"
   files=`find . -name 'aclocal.m4' -print` ;
   test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
-  for i in $files; do if test -f $i; then
-    rm -f $i
-    test "$verbose" = "-v" && echo "$i"    
-  fi; done
+  for i in $files; do 
+    if test -f $i; then
+      rm -f $i
+      test "$verbose" = "-v" && echo "$i"    
+    fi; 
+  done
 
   find . -name '*~' -print | xargs rm -f
   find . -name 'bspopts.h.in' -print | xargs rm -f




More information about the vc mailing list