Changeset 22fb90e4 in rtems


Ignore:
Timestamp:
Jul 27, 2012, 1:38:04 PM (7 years ago)
Author:
Ralf Corsépius <ralf.corsepius@…>
Branches:
4.11, master
Children:
fd71610
Parents:
06e1086
git-author:
Ralf Corsépius <ralf.corsepius@…> (07/27/12 13:38:04)
git-committer:
Ralf Corsépius <ralf.corsepius@…> (10/09/12 17:26:51)
Message:

Misc. cosmetic changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bootstrap

    r06e1086 r22fb90e4  
    1 #! /bin/sh
     1#!/bin/sh
    22#
    33# helps bootstrapping, when checked out from CVS
     
    1414top_srcdir=`dirname $0`
    1515
    16 verbose="";
     16verbose=""
    1717quiet="false"
    1818mode="autoreconf"
     
    3131  echo "        -v .. verbose, pass -v to autotools"
    3232  echo
    33   exit 1;
     33  exit 1
    3434}
    3535
     
    5757EOF
    5858if cmp -s acinclude.m4 acinclude.m4~ 2>/dev/null; then
    59   echo "acinclude.m4 is unchanged";
     59  echo "acinclude.m4 is unchanged"
    6060else
    6161  cp acinclude.m4~ acinclude.m4
     
    6767  echo "${progname}:"
    6868  echo "        Installation problem: Can't find file aclocal/version.m4"
    69   exit 1;
     69  exit 1
    7070fi
    7171
     
    7575  usage ;;
    7676-q|--qu|--qui|--quie|--quiet)
    77   quiet="true";
     77  quiet="true"
    7878  shift;;
    7979-v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
    80   verbose="-v";
     80  verbose="-v"
    8181  shift;;
    8282-c|--cl|--cle|--clea|--clean)
    83   mode="clean";
     83  mode="clean"
    8484  shift;;
    8585-f|--fo|--for|--forc|--force)
     
    8787  shift;;
    8888-p|--pr|--pre|--prei|--prein|--preins|--preinst)
    89   mode="preinstall";
     89  mode="preinstall"
    9090  shift;;
    9191-r|--re|--rec|--reco|--recon|--reconf)
    92   mode="autoreconf";
     92  mode="autoreconf"
    9393  shift;;
    9494-g|--ge|--gen|--gene|--gener|--genera|--generat|--generate)
    95   mode="generate";
    96   shift;;
    97 -*) echo "unknown option $1" ;
     95  mode="generate"
     96  shift;;
     97-*) echo "unknown option $1"
    9898  usage ;;
    99 *) echo "invalid parameter $1" ;
     99*) echo "invalid parameter $1"
    100100  usage ;;
    101101esac
     
    106106  confs=`find . -name Makefile.am -exec grep -l 'include .*/preinstall\.am' {} \;`
    107107  for i in $confs; do
    108     dir=$(dirname $i);
     108    dir=$(dirname $i)
    109109    test "$quite" = "true" || echo "Generating $dir/preinstall.am"
    110110    ${top_srcdir}/ampolish3 "$dir/Makefile.am" > "$dir/preinstall.am"
     
    118118    exit 1
    119119  fi
    120  
     120
    121121  AUTOHEADER=${AUTOHEADER-autoheader}
    122122  if test -z "$AUTOHEADER"; then
     
    124124    exit 1
    125125  fi
    126  
     126
    127127  AUTOMAKE=${AUTOMAKE-automake}
    128128  if test -z "$AUTOMAKE"; then
     
    130130    exit 1
    131131  fi
    132  
     132
    133133  ACLOCAL=${ACLOCAL-aclocal}
    134134  if test -z "$ACLOCAL"; then
     
    146146  confs=`find . \( -name 'configure.in' -o -name 'configure.ac' \) -print`
    147147  for i in $confs; do
    148   dir=`dirname $i`;
    149   configure=`basename $i`;
    150   ( test "$quiet" = "true" || echo "$dir";
    151     cd $dir;
     148  dir=`dirname $i`
     149  configure=`basename $i`
     150  ( test "$quiet" = "true" || echo "$dir"
     151    cd $dir
    152152    test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \
    153       generate_bspdir_acinclude;
     153      generate_bspdir_acinclude
    154154    pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
    155155    aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
    156       sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
     156      sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat `
    157157    test "$verbose" = "-v" && echo "${ACLOCAL} $aclocal_args"
    158     ${ACLOCAL} $aclocal_args;
     158    ${ACLOCAL} $aclocal_args
    159159    test -n "`grep CONFIG_HEADER ${configure}`" && ${AUTOHEADER} \
    160       && test "$verbose" = "-v" && echo "${AUTOHEADER}";
     160      && test "$verbose" = "-v" && echo "${AUTOHEADER}"
    161161    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && ${AUTOHEADER} \
    162       && test "$verbose" = "-v" && echo "${AUTOHEADER}";
    163     test -f Makefile.am && ${AUTOMAKE} -a -c $verbose ;
    164     ${AUTOCONF};
     162      && test "$verbose" = "-v" && echo "${AUTOHEADER}"
     163    test -f Makefile.am && ${AUTOMAKE} -a -c $verbose
     164    ${AUTOCONF}
    165165    test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
    166166      && echo timestamp > stamp-h.in
     
    178178  confs=`find . -name 'configure.ac' -print`
    179179  for i in $confs; do
    180   dir=`dirname $i`;
    181   configure=`basename $i`;
    182   ( test "$quiet" = "true" || echo "$dir";
    183     cd $dir;
     180  dir=`dirname $i`
     181  configure=`basename $i`
     182  ( test "$quiet" = "true" || echo "$dir"
     183    cd $dir
    184184    test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \
    185       generate_bspdir_acinclude;
    186     ${AUTORECONF} -i --no-recursive $verbose;
     185      generate_bspdir_acinclude
     186    ${AUTORECONF} -i --no-recursive $verbose
    187187    test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
    188188      && echo timestamp > stamp-h.in
     
    193193clean)
    194194  test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
    195   files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
    196   for i in $files; do
    197     if test -f $i; then
    198       rm -f $i
    199       test "$verbose" = "-v" && echo "$i"   
    200     fi;
    201   done
    202 
    203   test "$quiet" = "true" || echo "removing configure files"
    204   files=`find . -name 'configure' -print` ;
    205   for i in $files; do
     195  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'`
     196  for i in $files; do
    206197    if test -f $i; then
    207198      rm -f $i
    208199      test "$verbose" = "-v" && echo "$i"
    209     fi;
    210   done
    211  
     200    fi
     201  done
     202
     203  test "$quiet" = "true" || echo "removing configure files"
     204  files=`find . -name 'configure' -print`
     205  for i in $files; do
     206    if test -f $i; then
     207      rm -f $i
     208      test "$verbose" = "-v" && echo "$i"
     209    fi
     210  done
     211
    212212  if test $force -gt 0; then
    213213    needles=""
     
    228228    for j in $needles; do
    229229      files=`find . -name "$j" -print`
    230       for i in $files; do 
     230      for i in $files; do
    231231        if test -f $i; then
    232232          rm -f $i
    233233          test "$verbose" = "-v" && echo "$i"
    234         fi;
     234        fi
    235235      done
    236236    done
     
    238238
    239239  test "$quiet" = "true" || echo "removing aclocal.m4 files"
    240   files=`find . -name 'aclocal.m4' -print` ;
    241   test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
    242   for i in $files; do 
     240  files=`find . -name 'aclocal.m4' -print`
     241  test "$verbose" = "-v" && test -n "$files" && echo "$files"
     242  for i in $files; do
    243243    if test -f $i; then
    244244      rm -f $i
    245       test "$verbose" = "-v" && echo "$i"   
    246     fi;
     245      test "$verbose" = "-v" && echo "$i"
     246    fi
    247247  done
    248248
Note: See TracChangeset for help on using the changeset viewer.