mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-23 22:17:52 +08:00
d83ef07ca7
This adds the new builtin 'string' which supports various string manipulation and matching algorithms, including PCRE based regular expressions. Fixes #2296 Squashed commit of the following: commit 4c3eaeb6e57d76463e9683c327142b0aeafb92b8 Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:51:30 2015 -0700 Remove testdata and doc dirs from pcre2 source commit b2a8b4b50f2398b204fb72cfe4b5ba77ece2e1ab Merge:11c8a47
7974aab
Author: ridiculousfish <corydoras@ridiculousfish.com> Date: Sat Sep 12 12:32:40 2015 -0700 Merge branch 'string' of git://github.com/msteed/fish-shell into string-test commit7974aab6d3
Author: Michael Steed <msteed@saltstack.com> Date: Fri Sep 11 13:00:02 2015 -0600 build pcre2 lib only, no docs commiteb20b43d2d
Merge:1a09e70
5f519cb
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 20:00:47 2015 -0600 Merge branch 'string' of github.com:msteed/fish-shell into string commit1a09e709d0
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:58:24 2015 -0600 rebase on master & address the fallout commita0ec9772cd
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit64c25a01e3
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commitece7f35ec5
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit9ff7477a92
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitbaf4e096b2
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit896a2c2b27
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commitefd47dcbda
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commited0850e2db
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit9492e7a7e9
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit1a60b93371
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in commit5f519cb2a2
Author: Michael Steed <msteed68@gmail.com> Date: Thu Sep 10 19:26:45 2015 -0600 use fish's wildcard_match() for glob matching commit2ecd24f795
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 27 08:19:23 2015 -0600 some fixes from review - string_get_arg_stdin(): simplify and don't discard the argument when the trailing newline is absent - fix calls to pcre2 for e.g. string match -r -a 'a*' 'b' - correct test for args coming from stdin commit45b777e4dc
Author: Michael Steed <msteed68@gmail.com> Date: Sat Aug 22 19:35:56 2015 -0600 fixes from review - Makefile.in: restore iwyu target - regex_replacer_t::replace_matches(): correct size passed to realloc() commit981cbb6ddf
Author: Michael Steed <msteed68@gmail.com> Date: Thu Aug 20 13:08:33 2015 -0600 Minor doc improvements commitddb6a2a8fd
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:29:02 2015 -0600 another attempt to fix the ci build commit1e34e3191b
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 19 18:03:49 2015 -0600 Updates after review comments - make match/replace without -a operate on the first match on each argument - use different exit codes for "no operation performed" and errors, as grep does - refactor regex compile code - use human-friendly error messages from pcre2 - improve error handling & reporting elsewhere - add a few tests - make some doc fixes - some simplification & cleanup - fix ci build failure (I hope) commit34232e152d
Author: Michael Steed <msteed68@gmail.com> Date: Wed Aug 12 00:26:07 2015 -0600 fix dependencies for parallel make commit00d7e78169
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 23:37:22 2015 -0600 Add missing pcre2 files + .gitignore commit4498aa5f57
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:44:05 2015 -0600 add pcre2-10.20 and update license.hdr commit290c58c72e
Author: Michael Steed <msteed68@gmail.com> Date: Tue Aug 11 22:41:19 2015 -0600 add string builtin files - string builtin source, tests, & docs - changes to configure.ac & Makefile.in
240 lines
6.8 KiB
Plaintext
Executable File
240 lines
6.8 KiB
Plaintext
Executable File
#/bin/sh
|
|
|
|
# Script to prepare the files for building a PCRE2 release. It does some
|
|
# processing of the documentation, detrails files, and creates pcre2.h.generic
|
|
# and config.h.generic (for use by builders who can't run ./configure).
|
|
|
|
# You must run this script before runnning "make dist". If its first argument
|
|
# is "doc", it stops after preparing the documentation. There are no other
|
|
# arguments. The script makes use of the following files:
|
|
|
|
# 132html A Perl script that converts a .1 or .3 man page into HTML. It
|
|
# "knows" the relevant troff constructs that are used in the PCRE2
|
|
# man pages.
|
|
|
|
# CheckMan A Perl script that checks man pages for typos in the mark up.
|
|
|
|
# CleanTxt A Perl script that cleans up the output of "nroff -man" by
|
|
# removing backspaces and other redundant text so as to produce
|
|
# a readable .txt file.
|
|
|
|
# Detrail A Perl script that removes trailing spaces from files.
|
|
|
|
# doc/index.html.src
|
|
# A file that is copied as index.html into the doc/html directory
|
|
# when the HTML documentation is built. It works like this so that
|
|
# doc/html can be deleted and re-created from scratch.
|
|
|
|
# README & NON-AUTOTOOLS-BUILD
|
|
# These files are copied into the doc/html directory, with .txt
|
|
# extensions so that they can by hyperlinked from the HTML
|
|
# documentation, because some people just go to the HTML without
|
|
# looking for text files.
|
|
|
|
|
|
# First, sort out the documentation. Remove pcre2demo.3 first because it won't
|
|
# pass the markup check (it is created below, using markup that none of the
|
|
# other pages use).
|
|
|
|
cd doc
|
|
echo Processing documentation
|
|
|
|
/bin/rm -f pcre2demo.3
|
|
|
|
# Check the remaining man pages
|
|
|
|
perl ../CheckMan *.1 *.3
|
|
if [ $? != 0 ] ; then exit 1; fi
|
|
|
|
# Make Text form of the documentation. It needs some mangling to make it
|
|
# tidy for online reading. Concatenate all the .3 stuff, but omit the
|
|
# individual function pages.
|
|
|
|
cat <<End >pcre2.txt
|
|
-----------------------------------------------------------------------------
|
|
This file contains a concatenation of the PCRE2 man pages, converted to plain
|
|
text format for ease of searching with a text editor, or for use on systems
|
|
that do not have a man page processor. The small individual files that give
|
|
synopses of each function in the library have not been included. Neither has
|
|
the pcre2demo program. There are separate text files for the pcre2grep and
|
|
pcre2test commands.
|
|
-----------------------------------------------------------------------------
|
|
|
|
|
|
End
|
|
|
|
echo "Making pcre2.txt"
|
|
for file in pcre2 pcre2api pcre2build pcre2callout pcre2compat pcre2jit \
|
|
pcre2limits pcre2matching pcre2partial pcre2unicode ; do
|
|
|
|
#for file in \
|
|
# pcre2syntax \
|
|
# pcre2precompile pcre2perform pcre2posix pcre2sample \
|
|
# pcre2stack ; do
|
|
|
|
echo " Processing $file.3"
|
|
nroff -c -man $file.3 >$file.rawtxt
|
|
perl ../CleanTxt <$file.rawtxt >>pcre2.txt
|
|
/bin/rm $file.rawtxt
|
|
echo "------------------------------------------------------------------------------" >>pcre2.txt
|
|
if [ "$file" != "pcre2sample" ] ; then
|
|
echo " " >>pcre2.txt
|
|
echo " " >>pcre2.txt
|
|
fi
|
|
done
|
|
|
|
# The three commands
|
|
for file in pcre2test pcre2grep pcre2-config ; do
|
|
echo Making $file.txt
|
|
nroff -c -man $file.1 >$file.rawtxt
|
|
perl ../CleanTxt <$file.rawtxt >$file.txt
|
|
/bin/rm $file.rawtxt
|
|
done
|
|
|
|
|
|
# Make pcre2demo.3 from the pcre2demo.c source file
|
|
|
|
echo "Making pcre2demo.3"
|
|
perl <<"END" >pcre2demo.3
|
|
open(IN, "../src/pcre2demo.c") || die "Failed to open src/pcre2demo.c\n";
|
|
open(OUT, ">pcre2demo.3") || die "Failed to open pcre2demo.3\n";
|
|
print OUT ".\\\" Start example.\n" .
|
|
".de EX\n" .
|
|
". nr mE \\\\n(.f\n" .
|
|
". nf\n" .
|
|
". nh\n" .
|
|
". ft CW\n" .
|
|
"..\n" .
|
|
".\n" .
|
|
".\n" .
|
|
".\\\" End example.\n" .
|
|
".de EE\n" .
|
|
". ft \\\\n(mE\n" .
|
|
". fi\n" .
|
|
". hy \\\\n(HY\n" .
|
|
"..\n" .
|
|
".\n" .
|
|
".EX\n" ;
|
|
while (<IN>)
|
|
{
|
|
s/\\/\\e/g;
|
|
print OUT;
|
|
}
|
|
print OUT ".EE\n";
|
|
close(IN);
|
|
close(OUT);
|
|
END
|
|
if [ $? != 0 ] ; then exit 1; fi
|
|
|
|
|
|
# Make HTML form of the documentation.
|
|
|
|
echo "Making HTML documentation"
|
|
/bin/rm html/*
|
|
cp index.html.src html/index.html
|
|
cp ../README html/README.txt
|
|
cp ../NON-AUTOTOOLS-BUILD html/NON-AUTOTOOLS-BUILD.txt
|
|
|
|
for file in *.1 ; do
|
|
base=`basename $file .1`
|
|
echo " Making $base.html"
|
|
perl ../132html -toc $base <$file >html/$base.html
|
|
done
|
|
|
|
# Exclude table of contents for function summaries. It seems that expr
|
|
# forces an anchored regex. Also exclude them for small pages that have
|
|
# only one section.
|
|
|
|
for file in *.3 ; do
|
|
base=`basename $file .3`
|
|
toc=-toc
|
|
if [ `expr $base : '.*_'` -ne 0 ] ; then toc="" ; fi
|
|
if [ "$base" = "pcre2sample" ] || \
|
|
[ "$base" = "pcre2stack" ] || \
|
|
[ "$base" = "pcre2compat" ] || \
|
|
[ "$base" = "pcre2limits" ] || \
|
|
[ "$base" = "pcre2perform" ] || \
|
|
[ "$base" = "pcre2unicode" ] ; then
|
|
toc=""
|
|
fi
|
|
echo " Making $base.html"
|
|
perl ../132html $toc $base <$file >html/$base.html
|
|
if [ $? != 0 ] ; then exit 1; fi
|
|
done
|
|
|
|
# End of documentation processing; stop if only documentation required.
|
|
|
|
cd ..
|
|
echo Documentation done
|
|
if [ "$1" = "doc" ] ; then exit; fi
|
|
|
|
# These files are detrailed; do not detrail the test data because there may be
|
|
# significant trailing spaces. Do not detrail RunTest.bat, because it has CRLF
|
|
# line endings and the detrail script removes all trailing white space. The
|
|
# configure files are also omitted from the detrailing.
|
|
|
|
files="\
|
|
Makefile.am \
|
|
configure.ac \
|
|
README \
|
|
LICENCE \
|
|
COPYING \
|
|
AUTHORS \
|
|
NEWS \
|
|
NON-AUTOTOOLS-BUILD \
|
|
INSTALL \
|
|
132html \
|
|
CleanTxt \
|
|
Detrail \
|
|
ChangeLog \
|
|
CMakeLists.txt \
|
|
RunGrepTest \
|
|
RunTest \
|
|
pcre2-config.in \
|
|
perltest.sh \
|
|
libpcre2-8.pc.in \
|
|
libpcre2-16.pc.in \
|
|
libpcre2-32.pc.in \
|
|
libpcre2-posix.pc.in \
|
|
src/dftables.c \
|
|
src/pcre2.h.in \
|
|
src/pcre2_auto_possess.c \
|
|
src/pcre2_compile.c \
|
|
src/pcre2_config.c \
|
|
src/pcre2_context.c \
|
|
src/pcre2_dfa_match.c \
|
|
src/pcre2_error.c \
|
|
src/pcre2_internal.h \
|
|
src/pcre2_intmodedep.h \
|
|
src/pcre2_jit_compile.c \
|
|
src/pcre2_jit_match.c \
|
|
src/pcre2_jit_misc.c \
|
|
src/pcre2_jit_test.c \
|
|
src/pcre2_maketables.c \
|
|
src/pcre2_match.c \
|
|
src/pcre2_match_data.c \
|
|
src/pcre2_newline.c \
|
|
src/pcre2_ord2utf.c \
|
|
src/pcre2_pattern_info.c \
|
|
src/pcre2_printint.c \
|
|
src/pcre2_string_utils.c \
|
|
src/pcre2_study.c \
|
|
src/pcre2_substring.c \
|
|
src/pcre2_tables.c \
|
|
src/pcre2_ucd.c \
|
|
src/pcre2_ucp.h \
|
|
src/pcre2_valid_utf.c \
|
|
src/pcre2_xclass.c \
|
|
src/pcre2demo.c \
|
|
src/pcre2grep.c \
|
|
src/pcre2posix.c \
|
|
src/pcre2posix.h \
|
|
src/pcre2test.c"
|
|
|
|
echo Detrailing
|
|
perl ./Detrail $files doc/p* doc/html/*
|
|
|
|
echo Done
|
|
|
|
#End
|