JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ylwrap: Revert to previous version.

Browse Source
This commit is contained in:
DJ Delorie 2004-09-24 13:21:46 +00:00
parent a638588d7c
commit 5e2121862a
2 changed files with 84 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2004-09-24 Kelley Cook <kcook@gcc.gnu.org>
* ylwrap: Revert to previous version.
2004-09-23 H.J. Lu <hongjiu.lu@intel.com> 2004-09-23 H.J. Lu <hongjiu.lu@intel.com>
PR bootstrap/17369
* Makefile.tpl (REALLY_SET_LIB_PATH): Add @SET_GCC_LIB_PATH@. * Makefile.tpl (REALLY_SET_LIB_PATH): Add @SET_GCC_LIB_PATH@.
(HOST_EXPORTS]): Add @SET_GCC_LIB_PATH@. Set and export (HOST_EXPORTS]): Add @SET_GCC_LIB_PATH@. Set and export
SET_GCC_LIB_PATH_CMD. SET_GCC_LIB_PATH_CMD.

187
ylwrap
View File

@ -1,11 +1,6 @@
#! /bin/sh #! /bin/sh
# ylwrap - wrapper for lex/yacc invocations. # ylwrap - wrapper for lex/yacc invocations.
# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
scriptversion=2004-09-10.20
# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
#
# Written by Tom Tromey <tromey@cygnus.com>. # Written by Tom Tromey <tromey@cygnus.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -22,62 +17,46 @@ scriptversion=2004-09-10.20
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you # Usage:
# distribute this file as part of a program that contains a # ylwrap PROGRAM INPUT [OUTPUT DESIRED]... -- [ARGS]...
# configuration script generated by Autoconf, you may include it under # * PROGRAM is program to run.
# the same distribution terms that you use for the rest of that program. # * INPUT is the input file
# * OUTPUT is file PROG generates
# * DESIRED is file we actually want
# * ARGS are passed to PROG
# Any number of OUTPUT,DESIRED pairs may be used.
# This file is maintained in Automake, please report # The program to run.
# bugs to <bug-automake@gnu.org> or send patches to prog="$1"
# <automake-patches@gnu.org>. shift
# Make any relative path in $prog absolute.
case "$1" in case "$prog" in
'') /* | [A-Za-z]:\\*) ;;
echo "$0: No files given. Try \`$0 --help' for more information." 1>&2 */*) prog="`pwd`/$prog" ;;
exit 1
;;
--basedir)
basedir=$2
shift 2
;;
-h|--h*)
cat <<\EOF
Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
Wrapper for lex/yacc invocations, renaming files as desired.
INPUT is the input file
OUTPUT is one file PROG generates
DESIRED is the file we actually want instead of OUTPUT
PROGRAM is program to run
ARGS are passed to PROG
Any number of OUTPUT,DESIRED pairs may be used.
Report bugs to <bug-automake@gnu.org>.
EOF
exit 0
;;
-v|--v*)
echo "ylwrap $scriptversion"
exit 0
;;
esac esac
# The input. # The input.
input="$1" input="$1"
shift shift
case "$input" in case "$input" in
[\\/]* | ?:[\\/]*) /* | [A-Za-z]:\\*)
# Absolute path; do nothing. # Absolute path; do nothing.
;; ;;
*) *)
# Relative path. Make it absolute. # Relative path. Make it absolute. Why? Because otherwise any
# debugging info in the generated file will point to the wrong
# place. This is really gross.
input="`pwd`/$input" input="`pwd`/$input"
;; ;;
esac esac
# We don't want to use the absolute path if the input in the current
# directory like when making a tar ball.
input_base=`echo $input | sed -e 's|.*/||'`
if test -f $input_base && cmp $input_base $input >/dev/null 2>&1; then
input=$input_base
fi
pairlist= pairlist=
while test "$#" -ne 0; do while test "$#" -ne 0; do
if test "$1" = "--"; then if test "$1" = "--"; then
@ -88,15 +67,6 @@ while test "$#" -ne 0; do
shift shift
done done
# The program to run.
prog="$1"
shift
# Make any relative path in $prog absolute.
case "$prog" in
[\\/]* | ?:[\\/]*) ;;
*[\\/]*) prog="`pwd`/$prog" ;;
esac
# FIXME: add hostname here for parallel makes that run commands on # FIXME: add hostname here for parallel makes that run commands on
# other machines. But that might take us over the 14-char limit. # other machines. But that might take us over the 14-char limit.
dirname=ylwrap$$ dirname=ylwrap$$
@ -104,98 +74,38 @@ trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
mkdir $dirname || exit 1 mkdir $dirname || exit 1
cd $dirname cd $dirname
case "$input" in
case $# in /* | [A-Za-z]:\\*)
0) $prog "$input" ;; # Absolute path; do nothing.
*) $prog "$@" "$input" ;; ;;
*)
# Make a symbolic link, hard link or hardcopy.
ln -s ../"$input" . > /dev/null 2>&1 || ln ../"$input" . > /dev/null 2>&1 || cp ../"$input" .
;;
esac esac
ret=$? $prog ${1+"$@"} "$input"
status=$?
if test $ret -eq 0; then if test $status -eq 0; then
set X $pairlist set X $pairlist
shift shift
first=yes first=yes
# Since DOS filename conventions don't allow two dots,
# the DOS version of Bison writes out y_tab.c instead of y.tab.c
# and y_tab.h instead of y.tab.h. Test to see if this is the case.
y_tab_nodot="no"
if test -f y_tab.c || test -f y_tab.h; then
y_tab_nodot="yes"
fi
# The directory holding the input.
input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
# Quote $INPUT_DIR so we can use it in a regexp.
# FIXME: really we should care about more than `.' and `\'.
input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
while test "$#" -ne 0; do while test "$#" -ne 0; do
from="$1" if test -f "$1"; then
# Handle y_tab.c and y_tab.h output by DOS
if test $y_tab_nodot = "yes"; then
if test $from = "y.tab.c"; then
from="y_tab.c"
else
if test $from = "y.tab.h"; then
from="y_tab.h"
fi
fi
fi
if test -f "$from"; then
# If $2 is an absolute path name, then just use that, # If $2 is an absolute path name, then just use that,
# otherwise prepend `../'. # otherwise prepend `../'.
case "$2" in case "$2" in
[\\/]* | ?:[\\/]*) target="$2";; /* | [A-Za-z]:\\*) target="$2";;
*) target="../$2";; *) target="../$2";;
esac esac
mv "$1" "$target" || status=$?
# We do not want to overwrite a header file if it hasn't
# changed. This avoid useless recompilations. However the
# parser itself (the first file) should always be updated,
# because it is the destination of the .y.c rule in the
# Makefile. Divert the output of all other files to a temporary
# file so we can compare them to existing versions.
if test $first = no; then
realtarget="$target"
target="tmp-`echo $target | sed s/.*[\\/]//g`"
fi
# Edit out `#line' or `#' directives.
#
# We don't want the resulting debug information to point at
# an absolute srcdir; it is better for it to just mention the
# .y file with no path.
#
# We want to use the real output file name, not yy.lex.c for
# instance.
#
# We want the include guards to be adjusted too.
FROM=`echo "$from" | sed \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
TARGET=`echo "$2" | sed \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
-e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
# Check whether header files must be updated.
if test $first = no; then
if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
echo "$2" is unchanged
rm -f "$target"
else
echo updating "$2"
mv -f "$target" "$realtarget"
fi
fi
else else
# A missing file is only an error for the first file. This # A missing file is only an error for the first file. This
# is a blatant hack to let us support using "yacc -d". If -d # is a blatant hack to let us support using "yacc -d". If -d
# is not specified, we don't want an error when the header # is not specified, we don't want an error when the header
# file is "missing". # file is "missing".
if test $first = yes; then if test $first = yes; then
ret=1 status=1
fi fi
fi fi
shift shift
@ -203,20 +113,11 @@ if test $ret -eq 0; then
first=no first=no
done done
else else
ret=$? status=$?
fi fi
# Remove the directory. # Remove the directory.
cd .. cd ..
rm -rf $dirname rm -rf $dirname
exit $ret exit $status
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End: