[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Bison bootstrap tuneup
From: |
Paul Eggert |
Subject: |
Bison bootstrap tuneup |
Date: |
Mon, 03 May 2004 00:38:47 -0700 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) |
I installed this fix to streamline the Bison bootstrap process a bit
more: some i18n-related files were being distributed for no good
reason. This also fixes a typo in "bootstrap" in interpreting some
option combinations, and cleans up the .cvsignore files a bit.
2004-05-03 Paul Eggert <address@hidden>
* bootstrap (--gnulib-srcdir=*, --cvs-user=*):
Fix typo by replacing $1 with $option.
Remove more 'intl'-related files.
* lib/.cvsignore: Add strndup.h. Remove memchr.c, memcmp.c,
memrchr.c, strcasecmp.c, strchr.c, strrchr.c, strspn.c, strtol.c,
strtoul.c.
* m4/.cvsignore: Add exitfail.m4, extensions.m4, gnulib.m4,
hard-locale.m4, mbstate_t.m4, strerror_r.m4, strndup.m4,
xstrndup.m4. Remove glibc21.m4, intdiv0.m4, inttypes-pri.m4,
inttypes.m4, inttypes_h.m4, isc-posix.m4, lcmessage.m4,
stdint_h.m4, uintmax_t.m4, ulonglong.m4.
* src/.cvsignore: Add *.output.
Index: bootstrap
===================================================================
RCS file: /cvsroot/bison/bison/bootstrap,v
retrieving revision 1.6
diff -p -u -r1.6 bootstrap
--- bootstrap 28 Apr 2004 20:00:53 -0000 1.6
+++ bootstrap 3 May 2004 07:32:30 -0000
@@ -32,9 +32,9 @@ do
echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME]
[--skip-po]"
exit;;
--gnulib-srcdir=*)
- GNULIB_SRCDIR=`expr "$1" : '--gnulib-srcdir=\(.*\)'`;;
+ GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
--cvs-user=*)
- CVS_USER=`expr "$1" : '--cvs-user=\(.*\)'`;;
+ CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
--skip-po)
SKIP_PO=t;;
*)
@@ -169,10 +169,44 @@ esac
echo "$0: autoreconf --verbose --install --force ..."
autoreconf --verbose --install --force || exit
+
# We don't need intl, so remove it.
-echo "$0: rm -fr intl ..."
-rm -fr intl || exit
+# Remove aclocal.m4 too, so that it gets rebuilt.
+intl_files_to_remove='
+ aclocal.m4
+ intl
+ m4/codeset.m4
+ m4/glibc21.m4
+ m4/intdiv0.m4
+ m4/intmax.m4
+ m4/inttypes_h.m4
+ m4/inttypes.m4
+ m4/inttypes-pri.m4
+ m4/isc-posix.m4
+ m4/lcmessage.m4
+ m4/longdouble.m4
+ m4/longlong.m4
+ m4/printf-posix.m4
+ m4/signed.m4
+ m4/size_max.m4
+ m4/stdint_h.m4
+ m4/uintmax_t.m4
+ m4/ulonglong.m4
+ m4/wchar_t.m4
+ m4/wint_t.m4
+ m4/xsize.m4
+'
+echo $0: rm -fr $intl_files_to_remove ...
+rm -fr $intl_files_to_remove || exit
+
+echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..."
+sed '
+ /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+ AC_DEFUN([AM_INTL_SUBDIR], [])
+' m4/gettext.m4 >m4/gettext.m4t &&
+mv m4/gettext.m4t m4/gettext.m4 || exit
+echo 'AC_DEFUN([AM_INTL_SUBDIR],[])' >>m4/gettext.m4 || exit
# Patch what appears to be a bug in gettext 0.14.1;
# remove this once the bug is fixed.
Index: lib/.cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/lib/.cvsignore,v
retrieving revision 1.9
diff -p -u -r1.9 .cvsignore
--- lib/.cvsignore 28 Apr 2004 20:00:54 -0000 1.9
+++ lib/.cvsignore 3 May 2004 07:32:30 -0000
@@ -1,4 +1,3 @@
-*_.c
.deps
Makefile
Makefile.in
@@ -28,9 +27,6 @@ hash.h
malloc.c
mbswidth.c
mbswidth.h
-memchr.c
-memcmp.c
-memrchr.c
obstack.c
obstack.h
quote.c
@@ -42,16 +38,11 @@ stdbool.h
stdbool_.h
stpcpy.c
stpcpy.h
-strcasecmp.c
-strchr.c
stripslash.c
strncasecmp.c
strndup.c
+strndup.h
strnlen.c
-strrchr.c
-strspn.c
-strtol.c
-strtoul.c
unlocked-io.h
xalloc.h
xmalloc.c
Index: m4/.cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/m4/.cvsignore,v
retrieving revision 1.8
diff -p -u -r1.8 .cvsignore
--- m4/.cvsignore 28 Apr 2004 20:00:54 -0000 1.8
+++ m4/.cvsignore 3 May 2004 07:32:30 -0000
@@ -3,21 +3,19 @@ codeset.m4
dirname.m4
dos.m4
error.m4
+exitfail.m4
+extensions.m4
getopt.m4
gettext.m4
-glibc21.m4
+gnulib.m4
+hard-locale.m4
hash.m4
iconv.m4
-intdiv0.m4
-inttypes-pri.m4
-inttypes.m4
-inttypes_h.m4
-isc-posix.m4
-lcmessage.m4
lib-ld.m4
lib-link.m4
lib-prefix.m4
mbrtowc.m4
+mbstate_t.m4
mbswidth.m4
nls.m4
obstack.m4
@@ -27,10 +25,10 @@ progtest.m4
quote.m4
quotearg.m4
stdbool.m4
-stdint_h.m4
stpcpy.m4
+strerror_r.m4
+strndup.m4
strnlen.m4
-uintmax_t.m4
-ulonglong.m4
unlocked-io.m4
xalloc.m4
+xstrndup.m4
Index: src/.cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/src/.cvsignore,v
retrieving revision 1.15
diff -p -u -r1.15 .cvsignore
--- src/.cvsignore 28 Apr 2004 20:00:56 -0000 1.15
+++ src/.cvsignore 3 May 2004 07:32:30 -0000
@@ -1,5 +1,6 @@
*.flc
*.log
+*.output
.deps
Makefile
Makefile.in
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Bison bootstrap tuneup,
Paul Eggert <=