diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2008-01-23 18:05:06 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2008-01-23 18:05:06 +0000 |
commit | b310b97104cfae5c836d5180cffb4f2473e9d635 (patch) | |
tree | 93e3a1a3a2360393881b881969175f4c480cfe03 | |
parent | 8e7585f88c3d6a99b47bfb1755f76466745fe562 (diff) | |
download | pcre-b310b97104cfae5c836d5180cffb4f2473e9d635.tar.gz |
Tidies for 7.6-RC2.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@313 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | doc/html/pcreapi.html | 6 | ||||
-rw-r--r-- | doc/html/pcresample.html | 11 | ||||
-rw-r--r-- | doc/pcre.txt | 33 |
4 files changed, 30 insertions, 32 deletions
@@ -31,14 +31,14 @@ Version 7.6 21-Jan-08 This is an attempt to solve the reported problem "pcrecpp::no_arg is not exported in the Windows port". It has not yet been confirmed that the patch solves the problem, but it does no harm. - + 6. Applied Sheri's patch to CMakeLists.txt to add NON_STANDARD_LIB_PREFIX and - NON_STANDARD_LIB_SUFFIX and correct the comment about stack recursion. - + NON_STANDARD_LIB_SUFFIX and correct the comment about stack recursion. + 7. Remove the automatic building of pcredemo from the ./configure system and - from CMakeLists.txt. The whole idea of pcredemo.c is that it is an example - of a program that users should build themselves after PCRE is installed, so - building it automatically is not really right. What is more, it gave + from CMakeLists.txt. The whole idea of pcredemo.c is that it is an example + of a program that users should build themselves after PCRE is installed, so + building it automatically is not really right. What is more, it gave trouble in some build environments. diff --git a/doc/html/pcreapi.html b/doc/html/pcreapi.html index 024418f..155873b 100644 --- a/doc/html/pcreapi.html +++ b/doc/html/pcreapi.html @@ -167,7 +167,7 @@ in a Perl-compatible manner. A sample program that demonstrates the simplest way of using them is provided in the file called <i>pcredemo.c</i> in the source distribution. The <a href="pcresample.html"><b>pcresample</b></a> -documentation describes how to run it. +documentation describes how to compile and run it. </P> <P> A second matching function, <b>pcre_dfa_exec()</b>, which is not @@ -1955,9 +1955,9 @@ Cambridge CB2 3QH, England. </P> <br><a name="SEC22" href="#TOC1">REVISION</a><br> <P> -Last updated: 26 December 2007 +Last updated: 23 January 2008 <br> -Copyright © 1997-2007 University of Cambridge. +Copyright © 1997-2008 University of Cambridge. <br> <p> Return to the <a href="index.html">PCRE index page</a>. diff --git a/doc/html/pcresample.html b/doc/html/pcresample.html index 44c5bfb..6243be6 100644 --- a/doc/html/pcresample.html +++ b/doc/html/pcresample.html @@ -33,10 +33,9 @@ string. The logic is a little bit tricky because of the possibility of matching an empty string. Comments in the code explain what is going on. </P> <P> -The demonstration program is automatically built if you use "./configure;make" -to build PCRE. Otherwise, if PCRE is installed in the standard include and -library directories for your system, you should be able to compile the -demonstration program using this command: +If PCRE is installed in the standard include and library directories for your +system, you should be able to compile the demonstration program using this +command: <pre> gcc -o pcredemo pcredemo.c -lpcre </pre> @@ -88,9 +87,9 @@ Cambridge CB2 3QH, England. REVISION </b><br> <P> -Last updated: 13 June 2007 +Last updated: 23 January 2008 <br> -Copyright © 1997-2007 University of Cambridge. +Copyright © 1997-2008 University of Cambridge. <br> <p> Return to the <a href="index.html">PCRE index page</a>. diff --git a/doc/pcre.txt b/doc/pcre.txt index 1a298f0..9be2c6f 100644 --- a/doc/pcre.txt +++ b/doc/pcre.txt @@ -869,7 +869,7 @@ PCRE API OVERVIEW a Perl-compatible manner. A sample program that demonstrates the sim- plest way of using them is provided in the file called pcredemo.c in the source distribution. The pcresample documentation describes how to - run it. + compile and run it. A second matching function, pcre_dfa_exec(), which is not Perl-compati- ble, is also provided. This uses a different algorithm for the match- @@ -2565,8 +2565,8 @@ AUTHOR REVISION - Last updated: 26 December 2007 - Copyright (c) 1997-2007 University of Cambridge. + Last updated: 23 January 2008 + Copyright (c) 1997-2008 University of Cambridge. ------------------------------------------------------------------------------ @@ -6321,29 +6321,28 @@ PCRE SAMPLE PROGRAM bility of matching an empty string. Comments in the code explain what is going on. - The demonstration program is automatically built if you use "./config- - ure;make" to build PCRE. Otherwise, if PCRE is installed in the stan- - dard include and library directories for your system, you should be - able to compile the demonstration program using this command: + If PCRE is installed in the standard include and library directories + for your system, you should be able to compile the demonstration pro- + gram using this command: gcc -o pcredemo pcredemo.c -lpcre - If PCRE is installed elsewhere, you may need to add additional options - to the command line. For example, on a Unix-like system that has PCRE - installed in /usr/local, you can compile the demonstration program + If PCRE is installed elsewhere, you may need to add additional options + to the command line. For example, on a Unix-like system that has PCRE + installed in /usr/local, you can compile the demonstration program using a command like this: gcc -o pcredemo -I/usr/local/include pcredemo.c \ -L/usr/local/lib -lpcre - Once you have compiled the demonstration program, you can run simple + Once you have compiled the demonstration program, you can run simple tests like this: ./pcredemo 'cat|dog' 'the cat sat on the mat' ./pcredemo -g 'cat|dog' 'the dog sat on the cat' - Note that there is a much more comprehensive test program, called - pcretest, which supports many more facilities for testing regular + Note that there is a much more comprehensive test program, called + pcretest, which supports many more facilities for testing regular expressions and the PCRE library. The pcredemo program is provided as a simple coding example. @@ -6351,10 +6350,10 @@ PCRE SAMPLE PROGRAM the standard library directory, you may get an error like this when you try to run pcredemo: - ld.so.1: a.out: fatal: libpcre.so.0: open failed: No such file or + ld.so.1: a.out: fatal: libpcre.so.0: open failed: No such file or directory - This is caused by the way shared library support works on those sys- + This is caused by the way shared library support works on those sys- tems. You need to add -R/usr/local/lib @@ -6371,8 +6370,8 @@ AUTHOR REVISION - Last updated: 13 June 2007 - Copyright (c) 1997-2007 University of Cambridge. + Last updated: 23 January 2008 + Copyright (c) 1997-2008 University of Cambridge. ------------------------------------------------------------------------------ PCRESTACK(3) PCRESTACK(3) |