mirror/diffutils
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/diffutils.git synced 2026-01-29 10:54:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
797 Commits 1 Branch 20 Tags
Commit Graph

797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Meyering
66f2f2d60a version 2.9 
* NEWS: Record release date.
v2.9 		2010-02-11 10:45:20 +01:00
Jim Meyering
fecd0079fe doc: document the release procedure 
* README-release: New file.
 2010-02-11 10:43:14 +01:00
Jim Meyering
9f735dd16a maint: change use of "|" to more maintainable "||" (no semantic change) 
* src/analyze.c (diff_2_files): Using the "||" operator happens to
be equivalent to using "|" in this case.  It is also clearer and
less prone to inadvertent bug introduction, in case the variable,
"changes" were ever to take on a value not in {0,1}.
Patch by Tim Waugh, via Mike Frysinger.
 2010-02-10 11:38:56 +01:00
Jim Meyering
b50a16567a portability: avoid "diff - ..." failure at least on *BSD and Solaris 
The new "stdin" test was failing on many types of systems.
* src/diff.c (compare_files): Guard use of xfreopen (NULL, "rb", ...
also with O_BINARY, so as to avoid this unnecessary call on
systems where it's not needed (on some it fails with "Bad address".
 2010-02-10 09:11:33 +01:00
Jim Meyering
b22f6671d7 tests: honor VERBOSE 
* tests/basic: Enable "set -x" if $VERBOSE.
* tests/help-version: Likewise.
* tests/label-vs-func: Likewise.
* tests/stdin: Likewise.
 2010-02-10 08:55:59 +01:00
Jim Meyering
a1dcb61f03 build: update gnulib submodule to latest 2010-02-05 07:46:44 +01:00
Jim Meyering
3c0aac1e7e sync with gnulib 
* gl/lib/regcomp.c.diff: Adjust to apply to the latest in gnulib.
* gnulib: Update submodule to latest.
 2010-02-05 07:43:37 +01:00
Jim Meyering
6bb6713807 build: do not override gnulib-provided AM_CFLAGS options 
Avoid a warning from automake:
lib/Makefile.am:23: AM_CFLAGS multiply defined in condition TRUE ...
lib/gnulib.mk:30: ... `AM_CFLAGS' previously defined here
lib/Makefile.am:18:   `lib/gnulib.mk' included from here

* lib/Makefile.am (AM_CFLAGS): Append $(WARN_CFLAGS) and
$(WERROR_CFLAGS), i.e., use "+=", not "=".
This was introduced via 2009-12-17 commit e58efa5b
"build: enable warnings and -Werror.",
but fortunately is not a bug, because the definition
it would have overridden was always empty.
 2010-02-04 20:03:03 +01:00
Jim Meyering
f51320402b maint: add to .gitignore 
* .gitignore: Ignore more.
 2010-01-17 11:16:24 +01:00
Jim Meyering
ef2251a3e5 doc: add to TODO 
* TODO: Add an item, suggested by Dan Jacobson.
 2010-01-16 08:32:06 +01:00
Jim Meyering
07e844a96d tests: ensure that an argument of "-" is treated as standard input 
* tests/stdin: New test.
* tests/Makefile.am (TESTS): Add it.
 2010-01-13 13:54:55 +01:00
Jim Meyering
2d648ae3fe tests: now "make distcheck" runs more tests, incl. syntax-check 
* cfg.mk: Include dist-check.mk, from coreutils.
* Makefile.am (distcheck-hook): Define rule, to hook to...
* dist-check.mk: New file.
 2010-01-10 11:45:20 +01:00
Jim Meyering
617600b422 build: update gnulib to latest, for fixed syntax-check rule 2010-01-09 11:48:57 +01:00
Jim Meyering
a5188c6f72 maint: record updated NEWS hash 
* cfg.mk (old_NEWS_hash): Update to account for GFDL change.
 2010-01-09 11:18:46 +01:00
Jim Meyering
a9d7c6d1a5 build: update gnulib submodule to latest 2010-01-09 11:07:25 +01:00
Jim Meyering
4e1233f063 tests: add a test of basic functionality 
* tests/basic: Start adding tests.
* tests/Makefile.am (TESTS): Add it.
 2010-01-09 11:07:25 +01:00
Jim Meyering
cadd497e27 maint: udpate GFDL license to 1.3 
* doc/diff.texi: Update to use GFDL version 1.3.
 2010-01-09 11:06:17 +01:00
Eric Blake
cb251009d3 build: allow compilation on cygwin 
* src/Makefile.am (cmp_LDADD): Move LIBICONV...
(LDADD): ...into global flags, since all programs need it.
 2010-01-04 05:56:43 -07:00
Jim Meyering
b20ae152dd maint: record update-copyright options for this package 
* cfg.mk: Next time, just run "make update-copyright".
 2010-01-03 18:54:21 +01:00
Jim Meyering
a6b73e6dd7 tests: prepend ../src, not "." to PATH 
* tests/help-version: Correct PATH.
 2010-01-03 18:40:33 +01:00
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
10d11122ea maint: newer gnulib; don't hard-code my GPG key ID 
* cfg.mk (gpg_key_ID): Remove definition, now that maint.mk automates it.
* gnulib: Update to latest.
 2009-12-31 17:30:54 +01:00
Jim Meyering
9fe26edf84 tests: exercise diff -p's function-name matching 
* tests/label-vs-func: New file.
* tests/Makefile.am (TESTS): Add label-vs-func.
Reported by Simon Arlott <simon@fire.lp0.eu>
http://article.gmane.org/gmane.linux.kernel.janitors/14260
 2009-12-31 17:30:50 +01:00
Jim Meyering
e0fc06c5ce tests: use gnulib's init.sh 
* tests/Makefile.am (EXTRA_DIST): Add init.sh.
Remove test-lib.sh.
* tests/init.sh: New file.
* tests/test-lib.sh: Remove file.
* tests/help-version: Use init.sh, not test-lib.sh.
 2009-12-31 17:29:55 +01:00
Jim Meyering
37abff282f maint: don't let trailing spaces in diffs perturb make syntax-check 
* .x-sc_space_tab: New file.
 2009-11-28 19:43:36 +01:00
Jim Meyering
e58efa5bd2 build: enable warnings and -Werror. 
* src/Makefile.am (AM_CFLAGS): Enable warnings and -Werror.
Set to this: $(WARN_CFLAGS) $(WERROR_CFLAGS)
* lib/Makefile.am (AM_CFLAGS): Similarly, but use this:
$(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
* configure.ac (GNULIB_WARN_CFLAGS): Don't turn off -Wuninitialized.
 2009-11-22 17:16:25 +01:00
Jim Meyering
8c3d25a63a build: avoid a warning from gnulib's sh-quote.c 
* gl/lib/sh-quote.c.diff: New file, to avoid a warning.
 2009-11-22 17:15:41 +01:00
Jim Meyering
f4bde95cc1 maint: avoid warnings via patched versions of gnulib's regex functions 
* gl/lib/regcomp.c.diff: New file.
* gl/lib/regex_internal.c.diff: Likewise.
* gl/lib/regex_internal.h.diff: Likewise.
* gl/lib/regexec.c.diff: Likewise.
 2009-11-22 17:15:37 +01:00
Jim Meyering
f8435aeffe build: update gnulib submodule to latest 2009-11-22 17:15:30 +01:00
Eric Blake
4c048db1c7 build: ignore more files 
* .gitignore: Add config.cache, *.exe.

Signed-off-by: Eric Blake <ebb9@byu.net>
 2009-11-20 14:55:05 -07:00
Eric Blake
e5b1ef85fb build: fix test run on cygwin 
This, plus a gnulib update for xalloc-die-tests, are necessary
for make check to pass on cygwin.

* tests/Makefile.am (built_programs): Ignore $(EXEEXT).
* src/Makefile.am (paths.h): Add missing dependency.
 2009-11-20 14:53:32 -07:00
Jim Meyering
25742fce0a maint: remove vestiges of nanosleep 
* src/Makefile.am (LDADD): Remove $(LIB_NANOSLEEP), now
that we no longer use the nanosleep module.
Spotted by Eric Blake.
 2009-11-20 22:49:00 +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
3f7fe0297c maint: cfg.mk: remove factored-out ftp host/dir definitions 
* cfg.mk (gnu_ftp_host-alpha, gnu_ftp_host-beta gnu_ftp_host-stable):
(gnu_rel_host, url_dir_list): Remove definitions.  The defaults,
now provided by maint.mk, are the same.
* gnulib: Update for latest, including those maint.mk additions.
 2009-11-20 17:07:59 +01:00
Jim Meyering
2fe6784a35 build: link with now-required libraries 
* src/Makefile.am (LDADD): Add gnulib-required libraries.
(cmp_LDADD): Add $(LIBICONV), for cmp's use of proper_name_utf8.
 2009-11-20 10:36:54 +01:00
Jim Meyering
4fe5ec326f maint: lib/xfreopen.c contains translatable strings 
* po/POTFILES.in: Add lib/xfreopen.c.
 2009-11-20 10:26:48 +01:00
Jim Meyering
788645f184 maint: remove hard-coded macro definitions provided by intprops.h 
* lib/cmpbuf.c: Include "intprops.h" rather than open-coding macros
like TYPE_SIGNED and TYPE_MINIMUM.
 2009-11-20 10:20:54 +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
975a1e0418 build: suppress warnings about bindtextdomain and textdomain 
* src/system.h (bindtextdomain, textdomain) [!ENABLE_NLS]: Define away.
 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
3eee17bbbe build: update gnulib submodule to latest 2009-11-20 10:20:54 +01:00
Jim Meyering
d837c269ea maint: add an assertion to suppress clang-detected warning 
The clang static analyzer reported that a NULL parent could be
dereferenced.  However, that cannot happen, because for all callers,
the parameter, parent, is always non-NULL at that point.
* src/diff.c: Include <assert.h>.
Assert that parent is not NULL.
 2009-11-20 10:18:33 +01:00
Jim Meyering
7af115552a maint: remove dead assignment from diff3.c 
* src/diff3.c (make_3way_diff): Remove dead assignment.
 2009-11-20 10:18:33 +01:00
Jim Meyering
6be6358708 build: update gnulib submodule to latest 2009-11-18 07:58:54 +01:00
Jim Meyering
2514ec6973 maint: hide build commands behind $(AM_V_GEN) 
* src/Makefile.am (paths.h): Use $(AM_V_GEN), and split a long line.
* man/Makefile.am ($(dist_man1_MANS)): Use $(AM_V_GEN) here, too.
 2009-11-18 07:58:29 +01:00
Jim Meyering
a401664d47 build: let automake generate better man-installation rules 
* man/Makefile.am (dist_man1_MANS): Rename from dist_man_MANS,
to enable better automake-generated installation rules.
 2009-11-16 22:41:02 +01:00
Jim Meyering
5f93400251 admin: ignore all of gnulib-tests 
* .gitignore: Add gnulib-tests
 2009-11-16 22:40:47 +01:00
Eric Blake
8fbbf26925 build: avoid link failure when libsigsegv is used 
* src/Makefile.am (LDADD): Link against LIBSIGSEGV.
 2009-11-16 22:40:47 +01:00