mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-11-16 12:34:45 +00:00
67077a1b46
that addresses the following:
* Duplicate variables in Makefiles (many Makefile.ams below c/src/test
are affected systematically)
* Erroniously using local.am instead of host.am in host-Makefile.am
(Only host Makefile.ams should be affected; Erroniously using local.am
in host-Makefiles doesn't desturb much)
* use '.' instead of '$pwd' in ./bootstrap (using $pwd does not work if
$pwd is a symlink on linux).
* Broken CVS Ids somewhere
* Removing redundant/obsolete make variables from *.cfg files.
Except of the last item from the list above, most parts of this patch
are fairly harmless, sometimes even cosmetical.
As mentioned before, this patch also contains a new ampolish script.
This script features:
* Pretty printing of Makefile.ams (eg. removal of trailing spaces,
removal of duplicate empty lines, pretty printing make variables, etc.).
* Some syntactical checks on the contents of Makefiles.am
* Proper handling of Automake conditionals
FYI:
* Applying tools/update/rtems-polish.sh -am completely reformats all
Makefile.am resulting into a very large (~500k) diff.
* Applying tools/update/rtems-polish.sh -am twice, finally does not
reformat the Makefile.ams anymore.
* Many parts of the patch above result from merging back issues which
have shown when applying this new ampolish (i.e. partially result from
extracting the essentials of reformating being proposed by applying it
on Makefile.ams).
Though this ampolish is a very nice tool, IMHO, I am hestitant if you
should apply (i.e. run tools/update/rtems-polish.sh -am) it to the
sources before the release, because
* the resulting diff is fairly large
* I am not 100% sure it doesn't break anything.
However, applying it after the release would result into compatibility
problems in applying patches ;)
I would suggest that you might consider trying it locally, then to
examine the diff and then to decide whether to apply it in general or
not.
Joel's Comments:
As Ralf points out, this patch is problematic in that applying it before
a release could break things but applying it afterwards will result in
patches being unusable for Makefiles. My inclination is to forge ahead
and apply it.
115 lines
2.9 KiB
Bash
Executable File
115 lines
2.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# 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
|
|
|
|
progname=`basename $0`
|
|
verbose="";
|
|
quiet="false"
|
|
mode="generate"
|
|
|
|
usage()
|
|
{
|
|
echo
|
|
echo "usage: ${progname} [-h|-q|-v]"
|
|
echo
|
|
echo "options:"
|
|
echo " -h .. display this message and exit";
|
|
echo " -q .. quiet, don't display directories";
|
|
echo " -v .. verbose, pass -v to automake when invoking automake"
|
|
echo " -c .. clean, remove all aclocal/autoconf/automake generated files"
|
|
echo
|
|
exit 1;
|
|
}
|
|
|
|
if test ! -f VERSION; then
|
|
echo "${progname}:"
|
|
echo " Please change directory to RTEMS's toplevel directory"
|
|
exit 1;
|
|
fi
|
|
|
|
while test $# -gt 0; do
|
|
case $1 in
|
|
-h|--he|--hel|--help)
|
|
usage ;;
|
|
-q|--qu|--qui|--quie|--quiet)
|
|
quiet="true";
|
|
shift;;
|
|
-v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
|
|
verbose="-v";
|
|
shift;;
|
|
-c|--cl|--cle|--clea|--clean)
|
|
mode="clean";
|
|
shift;;
|
|
-*) echo "unknown option $1" ;
|
|
usage ;;
|
|
*) echo "invalid parameter $1" ;
|
|
usage ;;
|
|
esac
|
|
done
|
|
|
|
pwd=`pwd`;
|
|
|
|
case $mode in
|
|
generate)
|
|
confs=`find . -name 'configure.in' -print`
|
|
aclocal_dir=$pwd/aclocal
|
|
for i in $confs; do
|
|
dir=`dirname $i`;
|
|
( test "$quiet" = "true" || echo "$dir";
|
|
cd $dir;
|
|
aclocal -I $aclocal_dir;
|
|
autoconf;
|
|
test -f Makefile.am && automake $verbose ;
|
|
test -n "`grep CONFIG_HEADER configure.in`" && autoheader ;
|
|
test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
|
|
&& echo timestamp > stamp-h.in
|
|
)
|
|
done
|
|
;;
|
|
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
|
|
|
|
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
|
|
test "$verbose" = "-v" && echo "$i"
|
|
fi; done
|
|
|
|
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
|
|
|
|
find . -name '*~' -print | xargs rm -f
|
|
find . -name '*.orig' -print | xargs rm -f
|
|
find . -name '*.rej' -print | xargs rm -f
|
|
find . -name 'config.status' -print | xargs rm -f
|
|
find . -name 'config.log' -print | xargs rm -f
|
|
find . -name 'config.cache' -print | xargs rm -f
|
|
find . -name 'Makefile' -print | xargs rm -f
|
|
find . -name '.deps' -print | xargs rm -rf
|
|
find . -name '.libs' -print | xargs rm -rf
|
|
find . -name 'stamp-h.in' | xargs rm -rf
|
|
;;
|
|
esac
|