16 Commits

Author SHA1 Message Date
Jim Meyering
6a44886e24 maint: update all FSF copyright year lists to include 2010
Use this command:
git ls-files |grep -vE '^(\..*|COPYING|gnulib)$' |xargs \
env UPDATE_COPYRIGHT_USE_INTERVALS=1 build-aux/update-copyright
2010-01-01 16:18:27 +01:00
Jim Meyering
e90c254a0e maint: don't pull in gnulib's nanosleep unnecessarily
* bootstrap.conf (gnulib_modules): Remove nanosleep.  Not needed.
Spotted by Eric Blake.
2009-11-20 22:30:41 +01:00
Jim Meyering
3b828e3223 maint: add gnulib's announce-gen module
* bootstrap.conf (gnulib_modules): Add announce-gen
2009-11-20 10:20:54 +01:00
Jim Meyering
7ebb24620d build: use more gnulib modules
* bootstrap.conf (gnulib_modules): Add mktime, nanosleep, strptime
and timegm.
2009-11-20 10:20:54 +01:00
Jim Meyering
cd10d2c308 use xfreopen rather than freopen
* src/cmp.c: Include "xfreopen.h".
Use xfreopen in place of freopen.
* src/diff.c Likewise, and...
(main): Set exit_failure to EXIT_TROUBLE, rather than to 2.
* src/diff3.c: Likewise.
* bootstrap.conf (gnulib_modules): Add xfreopen.
2009-11-20 10:20:54 +01:00
Jim Meyering
163f2fa3e8 build: enable many warnings
* configure.ac: Add support for --enable-gcc-warnings.
* bootstrap.conf (gnulib_modules): Add manywarnings.
* Makefile.am (AM_CFLAGS): Add $(WARN_CFLAGS) $(WERROR_CFLAGS)
2009-11-20 10:20:54 +01:00
Jim Meyering
9b0a630024 maint: define/use PROGRAM_NAME and AUTHORS; use propername module
* bootstrap.conf (gnulib_modules): Add propername.
* src/cmp.c (PROGRAM_NAME, AUTHORS): Define.
(main): Use them in use of version_etc.
* src/diff.c (PROGRAM_NAME, AUTHORS, main): Likewise.
* src/diff3.c (PROGRAM_NAME, AUTHORS, main): Likewise.
* src/sdiff.c (PROGRAM_NAME, AUTHORS, main): Likewise.
* src/system.h: Include "propername.h".
2009-11-16 22:40:47 +01:00
Jim Meyering
3504236b28 build: generate ChangeLog (from git logs) into distribution tarball
* Makefile.am (dist-hook, gen-ChangeLog): New rules.
(gen_start_date): Define.
* bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.
2009-11-11 22:30:14 +01:00
Jim Meyering
08d9ddae59 build: rely on gnulib's progname module
* bootstrap.conf (gnulib_modules): Add progname.
* cfg.mk (local-checks-to-skip): Add sc_program_name.
* src/cmp.c: Include progname.h.
(program_name): Remove declaration.
(main): Call set_program_name.
* src/diff.c (main): Likewise.
* src/diff3.c (main): Likewise.
* src/sdiff.c (main): Likewise.
* src/diff.h (program_name): Remove extern declaration.
2009-11-11 22:18:37 +01:00
Jim Meyering
0363ae9f0f build: rely on gnulib's mbrtowc module
* bootstrap.conf (gnulib_modules): Add mbrtowc.
* src/side.c [!HAVE_MBRTOWC]: Remove now-useless code,
since gnulib guarantees working <wchar.h> and mbrtowc.
* cfg.mk (local-checks-to-skip): Remove sc_prohibit_HAVE_MBRTOWC.
2009-11-11 22:18:37 +01:00
Jim Meyering
a9a19e94fb build: update build/release infrastructure
* bootstrap: Update from gnulib.
* bootstrap.conf (gnulib-modules): Add do-release-commit-and-tag,
git-version-gen, gnu-make, gnu-web-doc-update, gnumakefile, gnupload,
maintainer-makefile, update-copyright.
* gnulib-tests/Makefile.am: New file.
* cfg.mk: New file.
(local-checks-to-skip): List currently-failing tests,
so that "syntax-check" passes initially.
(manual_title): Define.
2009-11-11 22:18:17 +01:00
Paul Eggert
8983b8d904 Don't mishandle multibyte characters in side-by-side format.
Problem reported by Erik Karlsson in
<http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00030.html>.
* bootstrap.conf (gnulib_modules): Add wcwidth.
* src/side.c: Include <wchar.h>.
(print_half_line): Compute number of bytes and print widths of
multibyte characters.  Inspired by an alternative solution from
Bruno Haible in
<http://lists.gnu.org/archive/html/bug-gnu-utils/2008-01/msg00032.html>.
2009-11-11 14:08:06 +01:00
Paul Eggert
0cb3c7ffef Break out diffseq.h into a separate file, so that gettext can use
this code.  Idea from Bruno Haible.
* bootstrap.conf (gnulib_modules): Add diffseq.
* src/analyze.c (xvec, yvec, fdiag, bdiag, too_expensive, SNAKE_LIMIT):
(struct partition, diag, compareseq): Remove; now in diffseq.h.
(ELEMENT, EQUAL, OFFSET, EXTRA_CONTEXT_FIELDS, NOTE_DELETE, NOTE_INSERT):
(USE_HEURISTIC): New macros.
Include "diffseq.h".
(diff_2_files): Rewrite to use new diffseq.h interface.
2009-11-11 14:08:06 +01:00
Paul Eggert
43e4846f11 * COPYING: New file.
* AUTHORS: Update from GPLv2 to GPLv3.
* Makefile.am: Likewise.
* NEWS: Likewise.
* README: Likewise.
* README-hacking: Likewise.
* bootstrap: Likewise.
* bootstrap.conf: Likewise.
* configure.ac: Likewise.
* exgettext: Likewise.
* doc/Makefile.am: Likewise.
* lib/Makefile.am: Likewise.
* lib/cmpbuf.c: Likewise.
* lib/cmpbuf.h: Likewise.
* lib/prepargs.c: Likewise.
* m4/vararrays.m4: Likewise.
* man/Makefile.am: Likewise.
* ms/Makefile.am: Likewise.
* ms/README: Likewise.
* ms/config.bat: Likewise.
* ms/config.sed: Likewise.
* ms/config.site: Likewise.
* po/POTFILES.in: Likewise.
* src/Makefile.am: Likewise.
* src/analyze.c: Likewise.
* src/cmp.c: Likewise.
* src/context.c: Likewise.
* src/diff.c: Likewise.
* src/diff.h: Likewise.
* src/diff3.c: Likewise.
* src/dir.c: Likewise.
* src/ed.c: Likewise.
* src/io.c: Likewise.
* src/normal.c: Likewise.
* src/sdiff.c: Likewise.
* src/system.h: Likewise.
* src/util.c: Likewise.
2007-07-19 17:45:29 +00:00
Paul Eggert
7f61a05614 * bootstrap.conf (gnulib_modules): Add inttypes. 2007-06-18 22:45:24 +00:00
Paul Eggert
2daf7bfa36 Modernize bootstrap procedure to match current gnulib.
* bootstrap: Sync with coreutils bootstrap, except check that
the directory build-aux exists before trying to copy to it.
* bootstrap.conf: New file.
(gnulib_modules): Add config-h, dup2, extensions, fcntl, fdl,
stat-macros, unistd.
* configure.ac: Invoke gl_EARLY and gl_INIT rather than
GNULIB_AUTOCONF_SNIPPET.
(AC_CONFIG_HEADER): Rename config.h to lib/config.h.
(AC_CHECK_HEADERS_ONCE): Don't check for fcntl.h, locale.h,
sys/file.h, unistd.h.  We now use the fcntl and unistd modules,
and locale.h can be assumed for any C89 compiler.
(DIFFUTILS_PREREQUISITES): Remove.  No longer needed now that
we use the stdint module.
(AC_CHECK_FUNCS_ONCE): Remove dup2, which is no longer needed
now that we use the dup2 module.
(AM_GNU_GETTEXT): Use need-formatstring-macros, and ...
(AM_GNU_GETTEXT_VERSION): specify version 0.15 instead of 0.14.5,
to be consistent with coreutils.
* lib/Makefile.am (noinst_LIBRARIES):
(lib_SOURCES, libdiffutils_a_LIBADD):
(libdiffutils_a_DEPENDENCIES, BUILT_SOURCES, EXTRA_DIST):
(MOSTLYCLEANFILES): Remove; now computed automatically.
(noinst_HEADERS, libdiffutils_a_SOURCES): Just append
our special files now.
* lib/cmpbuf.c: Include config.h unconditionally, since we
no longer define HAVE_CONFIG_H.
* lib/prepargs.c: Likewise.
* src/Makefile.am (LDADD): Use $(LIBINTL), not @LIBINTL@.
(diff_LDADD): Use $(LIB_CLOCK_GETTIME), not @LIB_CLOCK_GETTIME@.
* src/dir.c (dir_read): Use _D_EXACT_NAMLEN, not NAMELEN.
* src/system.h (volatile): Remove, since we assume C89 or better.
Include stat-macros.h.
(S_IRWXU, S_IRWXG, S_IRWXO, S_IRUSR, S_IWUSR):
Remove, since we now use stat-macros.h.
(SEEK_SET, SEEK_CUR): Remove, since we assume C89 or better.
Include unistd.h unconditionally, since we use unistd.
Likewise for fcntl.h.
(dup2): Remove, since we now use dup2.
(O_RDONLY, O_RWDR, O_BINARY): Remove, since we now use
fcntl.
Include dirent.h unconditionally.
(NAMLEN): Remove, replacing with....
(_D_EXACT_NAMLEN): New macro.
Include inttypes.h unconditionally.
(PTRDIFF_MAX, SIZE_MAX, UINTMAX_MAX, strtoumax): Remove, since
we now use inttypes.
Include locale.h unconditionally.
(setlocale): Remove, since we now assume locale.h.
2006-09-05 22:57:29 +00:00