Skip to content

Commit 8702bf6

Browse files
committed
released 6.0
1 parent 145db11 commit 8702bf6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+9740
-3651
lines changed

Makefile.am

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SUBDIRS += lzma/C
44
endif
55
SUBDIRS += src
66

7-
man1_MANS = man/ugrep.1
7+
man1_MANS = man/ugrep.1 man/ugrep-indexer.1
88

99
EXTRA_DIST = README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md
1010

@@ -31,10 +31,11 @@ all-local: cp2bin
3131
.PHONY: cp2bin
3232

3333
# to copy the ugrep binary to the local ugrep/bin/ugrep and ugrep/bin/ug (symlinks DO NOT WORK for ug with bash when installed)
34-
cp2bin: $(top_builddir)/src/ugrep$(EXEEXT)
34+
cp2bin: $(top_builddir)/src/ugrep$(EXEEXT) $(top_builddir)/src/ugrep-indexer$(EXEEXT)
3535
@rm -f $(top_builddir)/bin/ugrep$(EXEEXT)
36+
@rm -f $(top_builddir)/bin/ugrep-indexer$(EXEEXT)
3637
@mkdir -p $(top_builddir)/bin && \
37-
cp -f $< $(top_builddir)/bin/ugrep$(EXEEXT) && \
38+
cp -f $^ $(top_builddir)/bin/ && \
3839
cd $(top_builddir)/bin && \
3940
rm -f ug$(EXEEXT) && \
4041
cp -f ugrep$(EXEEXT) ug$(EXEEXT)
@@ -117,6 +118,7 @@ install-data-hook:
117118

118119
uninstall-hook:
119120
@rm -f $(DESTDIR)$(bindir)/ug$(EXEEXT) $(DESTDIR)$(bindir)/ugrep$(EXEEXT)
121+
@rm -f $(DESTDIR)$(bindir)/ugrep-indexer$(EXEEXT)
120122
@rm -f $(DESTDIR)$(bindir)/ug+ $(DESTDIR)$(bindir)/ugrep+
121123
@rm -rf $(DESTDIR)$(datadir)/ugrep
122124

Makefile.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,14 +284,12 @@ DEPDIR = @DEPDIR@
284284
ECHO_C = @ECHO_C@
285285
ECHO_N = @ECHO_N@
286286
ECHO_T = @ECHO_T@
287-
EGREP = @EGREP@
288287
ETAGS = @ETAGS@
289288
EXEEXT = @EXEEXT@
290289
EXTRA_CFLAGS = @EXTRA_CFLAGS@
291290
FISH_COMPLETION_CFLAGS = @FISH_COMPLETION_CFLAGS@
292291
FISH_COMPLETION_DIR = @FISH_COMPLETION_DIR@
293292
FISH_COMPLETION_LIBS = @FISH_COMPLETION_LIBS@
294-
GREP = @GREP@
295293
GREP_PATH = @GREP_PATH@
296294
HAVE_CXX11 = @HAVE_CXX11@
297295
INSTALL = @INSTALL@
@@ -388,7 +386,7 @@ top_build_prefix = @top_build_prefix@
388386
top_builddir = @top_builddir@
389387
top_srcdir = @top_srcdir@
390388
SUBDIRS = lib $(am__append_1) src
391-
man1_MANS = man/ugrep.1
389+
man1_MANS = man/ugrep.1 man/ugrep-indexer.1
392390
EXTRA_DIST = README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md
393391
UGREP = $(shell pwd)/$(top_builddir)/bin/ugrep$(EXEEXT)
394392
CONFIGH = $(shell pwd)/$(top_builddir)/config.h
@@ -1005,10 +1003,11 @@ all-local: cp2bin
10051003
.PHONY: cp2bin
10061004

10071005
# to copy the ugrep binary to the local ugrep/bin/ugrep and ugrep/bin/ug (symlinks DO NOT WORK for ug with bash when installed)
1008-
cp2bin: $(top_builddir)/src/ugrep$(EXEEXT)
1006+
cp2bin: $(top_builddir)/src/ugrep$(EXEEXT) $(top_builddir)/src/ugrep-indexer$(EXEEXT)
10091007
@rm -f $(top_builddir)/bin/ugrep$(EXEEXT)
1008+
@rm -f $(top_builddir)/bin/ugrep-indexer$(EXEEXT)
10101009
@mkdir -p $(top_builddir)/bin && \
1011-
cp -f $< $(top_builddir)/bin/ugrep$(EXEEXT) && \
1010+
cp -f $^ $(top_builddir)/bin/ && \
10121011
cd $(top_builddir)/bin && \
10131012
rm -f ug$(EXEEXT) && \
10141013
cp -f ugrep$(EXEEXT) ug$(EXEEXT)
@@ -1091,6 +1090,7 @@ install-data-hook:
10911090

10921091
uninstall-hook:
10931092
@rm -f $(DESTDIR)$(bindir)/ug$(EXEEXT) $(DESTDIR)$(bindir)/ugrep$(EXEEXT)
1093+
@rm -f $(DESTDIR)$(bindir)/ugrep-indexer$(EXEEXT)
10941094
@rm -f $(DESTDIR)$(bindir)/ug+ $(DESTDIR)$(bindir)/ugrep+
10951095
@rm -rf $(DESTDIR)$(datadir)/ugrep
10961096

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ Development roadmap
2424

2525
- #1 priority is quality assurance to continue to make sure ugrep has no bugs and is reliable
2626

27-
- make ugrep run even faster, see for example [#385](https://github.com/Genivia/ugrep/issues/385)
28-
29-
- add new and updated features, such as [indexing (beta release)](https://github.com/Genivia/ugrep-indexer)
27+
- make ugrep run even faster, see [#385](https://github.com/Genivia/ugrep/issues/385)
3028

3129
- share [reproducible performance results](https://github.com/Genivia/ugrep-benchmarks)
3230

@@ -5395,15 +5393,15 @@ in markdown:
53955393
have reasonable copyright terms permitting free redistribution. This
53965394
includes the ability to reuse all or parts of the ugrep source tree.
53975395

5396+
SEE ALSO
5397+
ugrep-indexer(1), grep(1), zgrep(1).
5398+
53985399
BUGS
53995400
Report bugs at: <https://github.com/Genivia/ugrep/issues>
54005401

5401-
SEE ALSO
5402-
grep(1).
5403-
54045402

54055403

5406-
ugrep 5.1.4 April 9, 2024 UGREP(1)
5404+
ugrep 6.0.0 May 6, 2024 UGREP(1)
54075405

54085406
🔝 [Back to table of contents](#toc)
54095407

aclocal.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515
m4_ifndef([AC_AUTOCONF_VERSION],
1616
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17-
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
18-
[m4_warning([this file was generated for autoconf 2.71.
17+
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
18+
[m4_warning([this file was generated for autoconf 2.72.
1919
You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically 'autoreconf'.])])

bin/win32/ug.exe

33.5 KB
Binary file not shown.

bin/win32/ugrep-indexer.exe

588 KB
Binary file not shown.

bin/win32/ugrep.exe

33.5 KB
Binary file not shown.

bin/win64/ug.exe

35.5 KB
Binary file not shown.

bin/win64/ugrep-indexer.exe

673 KB
Binary file not shown.

bin/win64/ugrep.exe

35.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)