For that matter, can we wrap bootstrap -p into bootstrap? I think the default behavior for bootstrap should be to generate everything, and for bootstrap -c to clean everything.<br><br>-Gedare<br><br><div class="gmail_quote">
On Thu, Aug 9, 2012 at 10:34 AM, Gedare Bloom <span dir="ltr"><<a href="mailto:gedare@rtems.org" target="_blank">gedare@rtems.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi,<br><br>Do we need the -f flag here, or can we just add the deleted files that -f removes to be deleted when doing a bootstrap -c ?<span class="HOEnZb"><font color="#888888"><br><br>-Gedare</font></span><div class="HOEnZb">
<div class="h5"><br><br><div class="gmail_quote">On Mon, Aug 6, 2012 at 12:39 PM, Gedare Bloom <span dir="ltr"><<a href="mailto:gedare@rtems.org" target="_blank">gedare@rtems.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Module: rtems<br>
Branch: master<br>
Commit: aa96f47df12980ba786028f169b93e85563e8b39<br>
Changeset: <a href="http://git.rtems.org/rtems/commit/?id=aa96f47df12980ba786028f169b93e85563e8b39" target="_blank">http://git.rtems.org/rtems/commit/?id=aa96f47df12980ba786028f169b93e85563e8b39</a><br>
<br>
Author: Ralf Corsépius <<a href="mailto:ralf.corsepius@rtems.org" target="_blank">ralf.corsepius@rtems.org</a>><br>
Date: Fri Jul 27 10:02:00 2012 +0200<br>
<br>
Do not remove scripts upon ./bootstrap -c. Introduce ./bootstrap -c -f.<br>
<br>
---<br>
<br>
bootstrap | 63 +++++++++++++++++++++++++++++++++++++++++++++++-------------<br>
1 files changed, 49 insertions(+), 14 deletions(-)<br>
<br>
diff --git a/bootstrap b/bootstrap<br>
index 137b4ab..de5d626 100755<br>
--- a/bootstrap<br>
+++ b/bootstrap<br>
@@ -16,6 +16,7 @@ top_srcdir=`dirname $0`<br>
verbose="";<br>
quiet="false"<br>
mode="autoreconf"<br>
+force=0<br>
<br>
usage()<br>
{<br>
@@ -81,6 +82,9 @@ case $1 in<br>
-c|--cl|--cle|--clea|--clean)<br>
mode="clean";<br>
shift;;<br>
+-f|--fo|--for|--forc|--force)<br>
+ force=`expr $force + 1`<br>
+ shift;;<br>
-p|--pr|--pre|--prei|--prein|--preins|--preinst)<br>
mode="preinstall";<br>
shift;;<br>
@@ -189,27 +193,58 @@ autoreconf)<br>
clean)<br>
test "$quiet" = "true" || echo "removing automake generated Makefile.in files"<br>
files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;<br>
- for i in $files; do if test -f $i; then<br>
- rm -f $i<br>
- test "$verbose" = "-v" && echo "$i"<br>
- fi; done<br>
+ for i in $files; do<br>
+ if test -f $i; then<br>
+ rm -f $i<br>
+ test "$verbose" = "-v" && echo "$i"<br>
+ fi;<br>
+ done<br>
<br>
test "$quiet" = "true" || echo "removing configure files"<br>
files=`find . -name 'configure' -print` ;<br>
- test "$verbose" = "-v" && test -n "$files" && echo "$files" ;<br>
- for i in $files; do if test -f $i; then<br>
- rm -f $i config.sub config.guess install-sh missing mkinstalldirs<br>
-# rm -f depcomp compile texinfo.tex mdate-sh<br>
- test "$verbose" = "-v" && echo "$i"<br>
- fi; done<br>
+ for i in $files; do<br>
+ if test -f $i; then<br>
+ rm -f $i<br>
+ test "$verbose" = "-v" && echo "$i"<br>
+ fi;<br>
+ done<br>
<br>
+ if test $force -gt 0; then<br>
+ needles=""<br>
+ if test $force -gt 1; then<br>
+ # Manually maintained<br>
+ needles="$needles config.sub"<br>
+ needles="$needles config.guess"<br>
+ fi<br>
+ if test $force -gt 0; then<br>
+ # Inherited from automake<br>
+ needles="$needles compile"<br>
+ needles="$needles depcomp"<br>
+ needles="$needles install-sh"<br>
+ needles="$needles missing"<br>
+ needles="$needles mdate-sh"<br>
+ needles="$needles texinfo.tex"<br>
+ fi<br>
+ for j in $needles; do<br>
+ files=`find . -name "$j" -print`<br>
+ for i in $files; do<br>
+ if test -f $i; then<br>
+ rm -f $i<br>
+ test "$verbose" = "-v" && echo "$i"<br>
+ fi;<br>
+ done<br>
+ done<br>
+ fi<br>
+<br>
test "$quiet" = "true" || echo "removing aclocal.m4 files"<br>
files=`find . -name 'aclocal.m4' -print` ;<br>
test "$verbose" = "-v" && test -n "$files" && echo "$files" ;<br>
- for i in $files; do if test -f $i; then<br>
- rm -f $i<br>
- test "$verbose" = "-v" && echo "$i"<br>
- fi; done<br>
+ for i in $files; do<br>
+ if test -f $i; then<br>
+ rm -f $i<br>
+ test "$verbose" = "-v" && echo "$i"<br>
+ fi;<br>
+ done<br>
<br>
find . -name '*~' -print | xargs rm -f<br>
find . -name '<a href="http://bspopts.h.in" target="_blank">bspopts.h.in</a>' -print | xargs rm -f<br>
<br>
_______________________________________________<br>
rtems-vc mailing list<br>
<a href="mailto:rtems-vc@rtems.org" target="_blank">rtems-vc@rtems.org</a><br>
<a href="http://www.rtems.org/mailman/listinfo/rtems-vc" target="_blank">http://www.rtems.org/mailman/listinfo/rtems-vc</a><br>
</blockquote></div><br>
</div></div></blockquote></div><br>