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

[Gedare Bloom]

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.

-Gedare

On Thu, Aug 9, 2012 at 10:34 AM, Gedare Bloom <gedare at rtems.org> wrote:

> Hi,
>
> 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 ?
>
> -Gedare
>
>
> On Mon, Aug 6, 2012 at 12:39 PM, Gedare Bloom <gedare at rtems.org> wrote:
>
>> Module:    rtems
>> Branch:    master
>> Commit:    aa96f47df12980ba786028f169b93e85563e8b39
>> Changeset:
>> http://git.rtems.org/rtems/commit/?id=aa96f47df12980ba786028f169b93e85563e8b39
>>
>> Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
>> Date:      Fri Jul 27 10:02:00 2012 +0200
>>
>> Do not remove scripts upon ./bootstrap -c. Introduce ./bootstrap -c -f.
>>
>> ---
>>
>>  bootstrap |   63
>> +++++++++++++++++++++++++++++++++++++++++++++++-------------
>>  1 files changed, 49 insertions(+), 14 deletions(-)
>>
>> diff --git a/bootstrap b/bootstrap
>> index 137b4ab..de5d626 100755
>> --- a/bootstrap
>> +++ b/bootstrap
>> @@ -16,6 +16,7 @@ top_srcdir=`dirname $0`
>>  verbose="";
>>  quiet="false"
>>  mode="autoreconf"
>> +force=0
>>
>>  usage()
>>  {
>> @@ -81,6 +82,9 @@ 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;;
>> @@ -189,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 install-sh missing mkinstalldirs
>> -# rm -f depcomp compile texinfo.tex mdate-sh
>> -    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
>>
>> _______________________________________________
>> rtems-vc mailing list
>> rtems-vc at rtems.org
>> http://www.rtems.org/mailman/listinfo/rtems-vc
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20120810/6f1b1f28/attachment-0001.html>