Skip to content

Commit

Permalink
released 4.2.0
Browse files Browse the repository at this point in the history
- add pkg-config files reflex.pc and relfexmin.pc with updated configure and makefiles
- minor update of option -p to permit empty lexer specifications #202
  • Loading branch information
genivia-inc committed Mar 27, 2024
1 parent a8dc9e3 commit b06e720
Show file tree
Hide file tree
Showing 263 changed files with 664 additions and 532 deletions.
5 changes: 4 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ SUBDIRS = lib src . tests @EXAMPLESDIR@

man1_MANS = doc/man/reflex.1

EXTRA_DIST = README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = reflex.pc reflexmin.pc

EXTRA_DIST = README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md reflex.pc.in reflexmin.pc.in

all-local: cp2bin

Expand Down
52 changes: 41 additions & 11 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# PARTICULAR PURPOSE.

@SET_MAKE@

VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
Expand Down Expand Up @@ -98,7 +99,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = doc/Doxyfile
CONFIG_CLEAN_FILES = doc/Doxyfile reflex.pc reflexmin.pc
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
Expand Down Expand Up @@ -155,9 +156,10 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"
NROFF = nroff
MANS = $(man1_MANS)
DATA = $(pkgconfig_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
Expand Down Expand Up @@ -186,6 +188,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/reflex.pc.in $(srcdir)/reflexmin.pc.in \
$(top_srcdir)/doc/Doxyfile.in INSTALL.md README.md ar-lib \
compile config.guess config.sub depcomp install-sh ltmain.sh \
missing
Expand Down Expand Up @@ -348,7 +351,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = lib src . tests @EXAMPLESDIR@
man1_MANS = doc/man/reflex.1
EXTRA_DIST = README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = reflex.pc reflexmin.pc
EXTRA_DIST = README.md LICENSE.txt CONTRIBUTING.md CODE_OF_CONDUCT.md reflex.pc.in reflexmin.pc.in

# to generate the documentation: make doc/html
libdocdir = @DOXYGEN_OUTPUT_DIRECTORY@
Expand Down Expand Up @@ -406,6 +411,10 @@ distclean-hdr:
-rm -f config.h stamp-h1
doc/Doxyfile: $(top_builddir)/config.status $(top_srcdir)/doc/Doxyfile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
reflex.pc: $(top_builddir)/config.status $(srcdir)/reflex.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
reflexmin.pc: $(top_builddir)/config.status $(srcdir)/reflexmin.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-man1: $(man1_MANS)
@$(NORMAL_INSTALL)
@list1='$(man1_MANS)'; \
Expand Down Expand Up @@ -447,6 +456,27 @@ uninstall-man1:
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
$(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
done

uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)

# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
Expand Down Expand Up @@ -752,10 +782,10 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-recursive
all-am: Makefile $(MANS) config.h all-local
all-am: Makefile $(MANS) $(DATA) config.h all-local
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(man1dir)"; do \
for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
Expand Down Expand Up @@ -809,7 +839,7 @@ info: info-recursive

info-am:

install-data-am: install-man
install-data-am: install-man install-pkgconfigDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-dvi: install-dvi-recursive
Expand Down Expand Up @@ -856,7 +886,7 @@ ps: ps-recursive

ps-am:

uninstall-am: uninstall-man
uninstall-am: uninstall-man uninstall-pkgconfigDATA

uninstall-man: uninstall-man1

Expand All @@ -873,12 +903,12 @@ uninstall-man: uninstall-man1
install-data install-data-am install-data-hook install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-man1 install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
install-man1 install-pdf install-pdf-am install-pkgconfigDATA \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-man uninstall-man1
uninstall-man uninstall-man1 uninstall-pkgconfigDATA

.PRECIOUS: Makefile

Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ its event handler requirements.*
The performance table is indicative of the impact on performance when using
PCRE2 and Boost.Regex with RE/flex. PCRE2 and Boost.Regex are optional
libraries integrated with RE/flex for Perl matching because of their
efficiency. By default, RE/flex uses DFA-based extended POSIX matching,
which is the fastest method as shown in the table.
efficiency. By default, RE/flex uses DFA-based extended regular expression
matching in linear time, the fastest method (as shown in the table).

The RE/flex matcher tracks line numbers, column numbers, and indentations,
whereas Flex does not (option noyylineno) and neither do the other regex
Expand Down Expand Up @@ -212,7 +212,7 @@ To build the examples also:
$ ./configure --enable-examples && make

After this successfully completes, you can optionally run `make install` to
install the `reflex` command and `libreflex` library:
install the `reflex` command and the `libreflex` library:

$ sudo make install

Expand Down Expand Up @@ -591,6 +591,7 @@ Changelog
- Mar 5, 2024: 4.1.0 improved lazy quantifiers for POSIX regex lazy matching in linear time using an advanced DFA transformation algorithm introduced in RE/flex in 2016.
- Mar 11, 2024: 4.1.1 minor update to correct a DFA construction problem for POSIX regex lazy quantifiers matching too much in some cases.
- Mar 17, 2024: 4.1.2 updated configure scripts; cast negative ctype function arguments (problem detected on NetBSD 10).
- Mar 27, 2024: 4.2.0 support pkg-config with `reflex.pc` (and `reflexmin.pc` minimized library) to use the reflex library `-lreflex`.

[logo-url]: https://www.genivia.com/images/reflex-logo.png
[reflex-url]: https://www.genivia.com/reflex.html
Expand Down
Binary file modified bin/win32/reflex.exe
Binary file not shown.
Binary file modified bin/win64/reflex.exe
Binary file not shown.
24 changes: 13 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for re-flex 4.1.2.
# Generated by GNU Autoconf 2.71 for re-flex 4.2.0.
#
# Report bugs to <https://github.com/Genivia/RE-flex/issues>.
#
Expand Down Expand Up @@ -612,8 +612,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='re-flex'
PACKAGE_TARNAME='reflex'
PACKAGE_VERSION='4.1.2'
PACKAGE_STRING='re-flex 4.1.2'
PACKAGE_VERSION='4.2.0'
PACKAGE_STRING='re-flex 4.2.0'
PACKAGE_BUGREPORT='https://github.com/Genivia/RE-flex/issues'
PACKAGE_URL=''

Expand Down Expand Up @@ -1339,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures re-flex 4.1.2 to adapt to many kinds of systems.
\`configure' configures re-flex 4.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1410,7 +1410,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of re-flex 4.1.2:";;
short | recursive ) echo "Configuration of re-flex 4.2.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1513,7 +1513,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
re-flex configure 4.1.2
re-flex configure 4.2.0
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1853,7 +1853,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by re-flex $as_me 4.1.2, which was
It was created by re-flex $as_me 4.2.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3338,7 +3338,7 @@ fi

# Define the identity of the package.
PACKAGE='reflex'
VERSION='4.1.2'
VERSION='4.2.0'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -6301,7 +6301,7 @@ fi
DOXYGEN_OUTPUT_DIRECTORY="doc/html"


ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile tests/Makefile examples/Makefile"
ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile tests/Makefile examples/Makefile reflex.pc reflexmin.pc"


cat >confcache <<\_ACEOF
Expand Down Expand Up @@ -6835,7 +6835,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by re-flex $as_me 4.1.2, which was
This file was extended by re-flex $as_me 4.2.0, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -6903,7 +6903,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
re-flex config.status 4.1.2
re-flex config.status 4.2.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -7040,6 +7040,8 @@ do
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"reflex.pc") CONFIG_FILES="$CONFIG_FILES reflex.pc" ;;
"reflexmin.pc") CONFIG_FILES="$CONFIG_FILES reflexmin.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([re-flex],[4.1.2],[https://github.com/Genivia/RE-flex/issues],[reflex])
AC_INIT([re-flex],[4.2.0],[https://github.com/Genivia/RE-flex/issues],[reflex])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_HEADERS([config.h])
AC_COPYRIGHT([Copyright (C) 2016-2024 Robert van Engelen, Genivia Inc.])
Expand Down Expand Up @@ -276,6 +276,6 @@ fi
DOXYGEN_OUTPUT_DIRECTORY="doc/html"
AC_SUBST(DOXYGEN_OUTPUT_DIRECTORY)

AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile tests/Makefile examples/Makefile])
AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile tests/Makefile examples/Makefile reflex.pc reflexmin.pc])

AC_OUTPUT
4 changes: 2 additions & 2 deletions doc/html/abslexer_8h.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions doc/html/absmatcher_8h.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions doc/html/annotated.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions doc/html/bits_8h.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions doc/html/boostmatcher_8h.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions doc/html/class_reflex-members.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b06e720

Please sign in to comment.