You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pg...@apache.org on 2007/11/26 17:50:09 UTC
svn commit: r598339 [1/37] - in /httpd/httpd/vendor/pcre/current: ./ doc/
doc/html/ testdata/
Author: pgollucci
Date: Mon Nov 26 08:49:53 2007
New Revision: 598339
URL: http://svn.apache.org/viewvc?rev=598339&view=rev
Log:
import pcre 7.4
Added:
httpd/httpd/vendor/pcre/current/132html (with props)
httpd/httpd/vendor/pcre/current/CMakeLists.txt
httpd/httpd/vendor/pcre/current/CleanTxt (with props)
httpd/httpd/vendor/pcre/current/Detrail (with props)
httpd/httpd/vendor/pcre/current/HACKING
httpd/httpd/vendor/pcre/current/Makefile.am
httpd/httpd/vendor/pcre/current/PrepareRelease (with props)
httpd/httpd/vendor/pcre/current/RunGrepTest (with props)
httpd/httpd/vendor/pcre/current/RunTest (with props)
httpd/httpd/vendor/pcre/current/RunTest.bat
httpd/httpd/vendor/pcre/current/aclocal.m4
httpd/httpd/vendor/pcre/current/config-cmake.h.in
httpd/httpd/vendor/pcre/current/config.h.generic
httpd/httpd/vendor/pcre/current/config.h.in
httpd/httpd/vendor/pcre/current/configure.ac
httpd/httpd/vendor/pcre/current/depcomp (with props)
httpd/httpd/vendor/pcre/current/doc/html/pcre-config.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_compile2.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_dfa_exec.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_get_stringtable_entries.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_refcount.html
httpd/httpd/vendor/pcre/current/doc/html/pcrecpp.html
httpd/httpd/vendor/pcre/current/doc/html/pcrematching.html
httpd/httpd/vendor/pcre/current/doc/html/pcrestack.html
httpd/httpd/vendor/pcre/current/doc/html/pcresyntax.html
httpd/httpd/vendor/pcre/current/doc/index.html.src
httpd/httpd/vendor/pcre/current/doc/pcre-config.1
httpd/httpd/vendor/pcre/current/doc/pcre-config.txt
httpd/httpd/vendor/pcre/current/doc/pcre_compile2.3
httpd/httpd/vendor/pcre/current/doc/pcre_dfa_exec.3
httpd/httpd/vendor/pcre/current/doc/pcre_get_stringtable_entries.3
httpd/httpd/vendor/pcre/current/doc/pcre_refcount.3
httpd/httpd/vendor/pcre/current/doc/pcrecpp.3
httpd/httpd/vendor/pcre/current/doc/pcrematching.3
httpd/httpd/vendor/pcre/current/doc/pcrestack.3
httpd/httpd/vendor/pcre/current/doc/pcresyntax.3
httpd/httpd/vendor/pcre/current/libpcrecpp.pc.in
httpd/httpd/vendor/pcre/current/makevp_c.txt
httpd/httpd/vendor/pcre/current/makevp_l.txt
httpd/httpd/vendor/pcre/current/missing (with props)
httpd/httpd/vendor/pcre/current/pcre.h.generic
httpd/httpd/vendor/pcre/current/pcre.h.in
httpd/httpd/vendor/pcre/current/pcre_chartables.c.dist
httpd/httpd/vendor/pcre/current/pcre_compile.c
httpd/httpd/vendor/pcre/current/pcre_config.c
httpd/httpd/vendor/pcre/current/pcre_dfa_exec.c
httpd/httpd/vendor/pcre/current/pcre_exec.c
httpd/httpd/vendor/pcre/current/pcre_fullinfo.c
httpd/httpd/vendor/pcre/current/pcre_get.c
httpd/httpd/vendor/pcre/current/pcre_globals.c
httpd/httpd/vendor/pcre/current/pcre_info.c
httpd/httpd/vendor/pcre/current/pcre_internal.h
httpd/httpd/vendor/pcre/current/pcre_maketables.c
httpd/httpd/vendor/pcre/current/pcre_newline.c
httpd/httpd/vendor/pcre/current/pcre_ord2utf8.c
httpd/httpd/vendor/pcre/current/pcre_printint.src
httpd/httpd/vendor/pcre/current/pcre_refcount.c
httpd/httpd/vendor/pcre/current/pcre_scanner.cc
httpd/httpd/vendor/pcre/current/pcre_scanner.h
httpd/httpd/vendor/pcre/current/pcre_scanner_unittest.cc
httpd/httpd/vendor/pcre/current/pcre_stringpiece.cc
httpd/httpd/vendor/pcre/current/pcre_stringpiece.h.in
httpd/httpd/vendor/pcre/current/pcre_stringpiece_unittest.cc
httpd/httpd/vendor/pcre/current/pcre_study.c
httpd/httpd/vendor/pcre/current/pcre_tables.c
httpd/httpd/vendor/pcre/current/pcre_try_flipped.c
httpd/httpd/vendor/pcre/current/pcre_ucp_searchfuncs.c
httpd/httpd/vendor/pcre/current/pcre_valid_utf8.c
httpd/httpd/vendor/pcre/current/pcre_version.c
httpd/httpd/vendor/pcre/current/pcre_xclass.c
httpd/httpd/vendor/pcre/current/pcrecpp.cc
httpd/httpd/vendor/pcre/current/pcrecpp.h
httpd/httpd/vendor/pcre/current/pcrecpp_internal.h
httpd/httpd/vendor/pcre/current/pcrecpp_unittest.cc
httpd/httpd/vendor/pcre/current/pcrecpparg.h.in
httpd/httpd/vendor/pcre/current/pcregexp.pas
httpd/httpd/vendor/pcre/current/perltest.pl (with props)
httpd/httpd/vendor/pcre/current/testdata/grepinput
httpd/httpd/vendor/pcre/current/testdata/grepinput8
httpd/httpd/vendor/pcre/current/testdata/grepinputv
httpd/httpd/vendor/pcre/current/testdata/grepinputx
Removed:
httpd/httpd/vendor/pcre/current/RunTest.in
httpd/httpd/vendor/pcre/current/config.in
httpd/httpd/vendor/pcre/current/configure.in
httpd/httpd/vendor/pcre/current/dll.mk
httpd/httpd/vendor/pcre/current/doc/Tech.Notes
httpd/httpd/vendor/pcre/current/doc/pcre.html
httpd/httpd/vendor/pcre/current/doc/pcregrep.html
httpd/httpd/vendor/pcre/current/doc/pcreposix.html
httpd/httpd/vendor/pcre/current/doc/pcreposix.txt
httpd/httpd/vendor/pcre/current/doc/pcretest.html
httpd/httpd/vendor/pcre/current/get.c
httpd/httpd/vendor/pcre/current/internal.h
httpd/httpd/vendor/pcre/current/libpcre.def
httpd/httpd/vendor/pcre/current/libpcreposix.def
httpd/httpd/vendor/pcre/current/maketables.c
httpd/httpd/vendor/pcre/current/mkinstalldirs
httpd/httpd/vendor/pcre/current/pcre.c
httpd/httpd/vendor/pcre/current/pcre.def
httpd/httpd/vendor/pcre/current/pcre.in
httpd/httpd/vendor/pcre/current/perltest
httpd/httpd/vendor/pcre/current/perltest8
httpd/httpd/vendor/pcre/current/printint.c
httpd/httpd/vendor/pcre/current/study.c
httpd/httpd/vendor/pcre/current/ucp.c
httpd/httpd/vendor/pcre/current/ucptable.c
httpd/httpd/vendor/pcre/current/ucptypetable.c
Modified:
httpd/httpd/vendor/pcre/current/AUTHORS
httpd/httpd/vendor/pcre/current/COPYING
httpd/httpd/vendor/pcre/current/ChangeLog
httpd/httpd/vendor/pcre/current/INSTALL
httpd/httpd/vendor/pcre/current/LICENCE
httpd/httpd/vendor/pcre/current/Makefile.in
httpd/httpd/vendor/pcre/current/NEWS
httpd/httpd/vendor/pcre/current/NON-UNIX-USE
httpd/httpd/vendor/pcre/current/README
httpd/httpd/vendor/pcre/current/config.guess
httpd/httpd/vendor/pcre/current/config.sub
httpd/httpd/vendor/pcre/current/configure
httpd/httpd/vendor/pcre/current/dftables.c
httpd/httpd/vendor/pcre/current/doc/html/index.html
httpd/httpd/vendor/pcre/current/doc/html/pcre.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_compile.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_config.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_copy_substring.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_exec.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_fullinfo.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_get_named_substring.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_get_stringnumber.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring.html
httpd/httpd/vendor/pcre/current/doc/html/pcre_get_substring_list.html
httpd/httpd/vendor/pcre/current/doc/html/pcreapi.html
httpd/httpd/vendor/pcre/current/doc/html/pcrebuild.html
httpd/httpd/vendor/pcre/current/doc/html/pcrecallout.html
httpd/httpd/vendor/pcre/current/doc/html/pcrecompat.html
httpd/httpd/vendor/pcre/current/doc/html/pcregrep.html
httpd/httpd/vendor/pcre/current/doc/html/pcrepartial.html
httpd/httpd/vendor/pcre/current/doc/html/pcrepattern.html
httpd/httpd/vendor/pcre/current/doc/html/pcreperform.html
httpd/httpd/vendor/pcre/current/doc/html/pcreposix.html
httpd/httpd/vendor/pcre/current/doc/html/pcreprecompile.html
httpd/httpd/vendor/pcre/current/doc/html/pcresample.html
httpd/httpd/vendor/pcre/current/doc/html/pcretest.html
httpd/httpd/vendor/pcre/current/doc/pcre.3
httpd/httpd/vendor/pcre/current/doc/pcre.txt
httpd/httpd/vendor/pcre/current/doc/pcre_compile.3
httpd/httpd/vendor/pcre/current/doc/pcre_config.3
httpd/httpd/vendor/pcre/current/doc/pcre_copy_named_substring.3
httpd/httpd/vendor/pcre/current/doc/pcre_copy_substring.3
httpd/httpd/vendor/pcre/current/doc/pcre_exec.3
httpd/httpd/vendor/pcre/current/doc/pcre_free_substring.3
httpd/httpd/vendor/pcre/current/doc/pcre_free_substring_list.3
httpd/httpd/vendor/pcre/current/doc/pcre_fullinfo.3
httpd/httpd/vendor/pcre/current/doc/pcre_get_named_substring.3
httpd/httpd/vendor/pcre/current/doc/pcre_get_stringnumber.3
httpd/httpd/vendor/pcre/current/doc/pcre_get_substring.3
httpd/httpd/vendor/pcre/current/doc/pcre_get_substring_list.3
httpd/httpd/vendor/pcre/current/doc/pcre_info.3
httpd/httpd/vendor/pcre/current/doc/pcre_maketables.3
httpd/httpd/vendor/pcre/current/doc/pcre_study.3
httpd/httpd/vendor/pcre/current/doc/pcre_version.3
httpd/httpd/vendor/pcre/current/doc/pcreapi.3
httpd/httpd/vendor/pcre/current/doc/pcrebuild.3
httpd/httpd/vendor/pcre/current/doc/pcrecallout.3
httpd/httpd/vendor/pcre/current/doc/pcrecompat.3
httpd/httpd/vendor/pcre/current/doc/pcregrep.1
httpd/httpd/vendor/pcre/current/doc/pcregrep.txt
httpd/httpd/vendor/pcre/current/doc/pcrepartial.3
httpd/httpd/vendor/pcre/current/doc/pcrepattern.3
httpd/httpd/vendor/pcre/current/doc/pcreperform.3
httpd/httpd/vendor/pcre/current/doc/pcreposix.3
httpd/httpd/vendor/pcre/current/doc/pcreprecompile.3
httpd/httpd/vendor/pcre/current/doc/pcresample.3
httpd/httpd/vendor/pcre/current/doc/pcretest.1
httpd/httpd/vendor/pcre/current/doc/pcretest.txt
httpd/httpd/vendor/pcre/current/doc/perltest.txt
httpd/httpd/vendor/pcre/current/install-sh
httpd/httpd/vendor/pcre/current/libpcre.pc.in
httpd/httpd/vendor/pcre/current/ltmain.sh
httpd/httpd/vendor/pcre/current/makevp.bat
httpd/httpd/vendor/pcre/current/pcre-config.in
httpd/httpd/vendor/pcre/current/pcredemo.c
httpd/httpd/vendor/pcre/current/pcregrep.c
httpd/httpd/vendor/pcre/current/pcreposix.c
httpd/httpd/vendor/pcre/current/pcreposix.h
httpd/httpd/vendor/pcre/current/pcretest.c
httpd/httpd/vendor/pcre/current/testdata/testinput1
httpd/httpd/vendor/pcre/current/testdata/testinput2
httpd/httpd/vendor/pcre/current/testdata/testinput3
httpd/httpd/vendor/pcre/current/testdata/testinput4
httpd/httpd/vendor/pcre/current/testdata/testinput5
httpd/httpd/vendor/pcre/current/testdata/testinput6
httpd/httpd/vendor/pcre/current/testdata/testoutput1
httpd/httpd/vendor/pcre/current/testdata/testoutput2
httpd/httpd/vendor/pcre/current/testdata/testoutput3
httpd/httpd/vendor/pcre/current/testdata/testoutput4
httpd/httpd/vendor/pcre/current/testdata/testoutput5
httpd/httpd/vendor/pcre/current/testdata/testoutput6
httpd/httpd/vendor/pcre/current/ucp.h
httpd/httpd/vendor/pcre/current/ucpinternal.h
Added: httpd/httpd/vendor/pcre/current/132html
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/132html?rev=598339&view=auto
==============================================================================
--- httpd/httpd/vendor/pcre/current/132html (added)
+++ httpd/httpd/vendor/pcre/current/132html Mon Nov 26 08:49:53 2007
@@ -0,0 +1,296 @@
+#! /usr/bin/perl -w
+
+# Script to turn PCRE man pages into HTML
+
+
+# Subroutine to handle font changes and other escapes
+
+sub do_line {
+my($s) = $_[0];
+
+$s =~ s/</</g; # Deal with < and >
+$s =~ s/>/>/g;
+$s =~ s"\\fI(.*?)\\f[RP]"<i>$1</i>"g;
+$s =~ s"\\fB(.*?)\\f[RP]"<b>$1</b>"g;
+$s =~ s"\\e"\\"g;
+$s =~ s/(?<=Copyright )\(c\)/©/g;
+$s;
+}
+
+# Subroutine to ensure not in a paragraph
+
+sub end_para {
+if ($inpara)
+ {
+ print TEMP "</PRE>\n" if ($inpre);
+ print TEMP "</P>\n";
+ }
+$inpara = $inpre = 0;
+$wrotetext = 0;
+}
+
+# Subroutine to start a new paragraph
+
+sub new_para {
+&end_para();
+print TEMP "<P>\n";
+$inpara = 1;
+}
+
+
+# Main program
+
+$innf = 0;
+$inpara = 0;
+$inpre = 0;
+$wrotetext = 0;
+$toc = 0;
+$ref = 1;
+
+while ($#ARGV >= 0 && $ARGV[0] =~ /^-/)
+ {
+ $toc = 1 if $ARGV[0] eq "-toc";
+ shift;
+ }
+
+# Initial output to STDOUT
+
+print <<End ;
+<html>
+<head>
+<title>$ARGV[0] specification</title>
+</head>
+<body bgcolor="#FFFFFF" text="#00005A" link="#0066FF" alink="#3399FF" vlink="#2222BB">
+<h1>$ARGV[0] man page</h1>
+<p>
+Return to the <a href="index.html">PCRE index page</a>.
+</p>
+<p>
+This page is part of the PCRE HTML documentation. It was generated automatically
+from the original man page. If there is any nonsense in it, please consult the
+man page, in case the conversion went wrong.
+<br>
+End
+
+print "<ul>\n" if ($toc);
+
+open(TEMP, ">/tmp/$$") || die "Can't open /tmp/$$ for output\n";
+
+while (<STDIN>)
+ {
+ # Handle lines beginning with a dot
+
+ if (/^\./)
+ {
+ # Some of the PCRE man pages used to contain instances of .br. However,
+ # they should have all been removed because they cause trouble in some
+ # (other) automated systems that translate man pages to HTML. Complain if
+ # we find .br or .in (another macro that is deprecated).
+
+ if (/^\.br/ || /^\.in/)
+ {
+ print STDERR "\n*** Deprecated macro encountered - rewrite needed\n";
+ print STDERR "*** $_\n";
+ die "*** Processing abandoned\n";
+ }
+
+ # Instead of .br, relevent "literal" sections are enclosed in .nf/.fi.
+
+ elsif (/^\.nf/)
+ {
+ $innf = 1;
+ }
+
+ elsif (/^\.fi/)
+ {
+ $innf = 0;
+ }
+
+ # Handling .sp is subtle. If it is inside a literal section, do nothing if
+ # the next line is a non literal text line; similarly, if not inside a
+ # literal section, do nothing if a literal follows. The point being that
+ # the <pre> and </pre> that delimit literal sections will do the spacing.
+ # Always skip if no previous output.
+
+ elsif (/^\.sp/)
+ {
+ if ($wrotetext)
+ {
+ $_ = <STDIN>;
+ if ($inpre)
+ {
+ print TEMP "\n" if (/^[\s.]/);
+ }
+ else
+ {
+ print TEMP "<br>\n<br>\n" if (!/^[\s.]/);
+ }
+ redo; # Now process the lookahead line we just read
+ }
+ }
+ elsif (/^\.TP/ || /^\.PP/ || /^\.P/)
+ {
+ &new_para();
+ }
+ elsif (/^\.SH\s*("?)(.*)\1/)
+ {
+ # Ignore the NAME section
+ if ($2 =~ /^NAME\b/)
+ {
+ <STDIN>;
+ next;
+ }
+
+ &end_para();
+ my($title) = &do_line($2);
+ if ($toc)
+ {
+ printf("<li><a name=\"TOC%d\" href=\"#SEC%d\">$title</a>\n",
+ $ref, $ref);
+ printf TEMP ("<br><a name=\"SEC%d\" href=\"#TOC1\">$title</a><br>\n",
+ $ref, $ref);
+ $ref++;
+ }
+ else
+ {
+ print TEMP "<br><b>\n$title\n</b><br>\n";
+ }
+ }
+ elsif (/^\.SS\s*("?)(.*)\1/)
+ {
+ &end_para();
+ my($title) = &do_line($2);
+ print TEMP "<br><b>\n$title\n</b><br>\n";
+ }
+ elsif (/^\.B\s*(.*)/)
+ {
+ &new_para() if (!$inpara);
+ $_ = &do_line($1);
+ s/"(.*?)"/$1/g;
+ print TEMP "<b>$_</b>\n";
+ $wrotetext = 1;
+ }
+ elsif (/^\.I\s*(.*)/)
+ {
+ &new_para() if (!$inpara);
+ $_ = &do_line($1);
+ s/"(.*?)"/$1/g;
+ print TEMP "<i>$_</i>\n";
+ $wrotetext = 1;
+ }
+
+ # A comment that starts "HREF" takes the next line as a name that
+ # is turned into a hyperlink, using the text given, which might be
+ # in a special font. If it ends in () or (digits) or punctuation, they
+ # aren't part of the link.
+
+ elsif (/^\.\\"\s*HREF/)
+ {
+ $_=<STDIN>;
+ chomp;
+ $_ = &do_line($_);
+ $_ =~ s/\s+$//;
+ $_ =~ /^(?:<.>)?([^<(]+)(?:\(\))?(?:<\/.>)?(?:\(\d+\))?[.,;:]?$/;
+ print TEMP "<a href=\"$1.html\">$_</a>\n";
+ }
+
+ # A comment that starts "HTML" inserts literal HTML
+
+ elsif (/^\.\\"\s*HTML\s*(.*)/)
+ {
+ print TEMP $1;
+ }
+
+ # A comment that starts < inserts that HTML at the end of the
+ # *next* input line - so as not to get a newline between them.
+
+ elsif (/^\.\\"\s*(<.*>)/)
+ {
+ my($markup) = $1;
+ $_=<STDIN>;
+ chomp;
+ $_ = &do_line($_);
+ $_ =~ s/\s+$//;
+ print TEMP "$_$markup\n";
+ }
+
+ # A comment that starts JOIN joins the next two lines together, with one
+ # space between them. Then that line is processed. This is used in some
+ # displays where two lines are needed for the "man" version. JOINSH works
+ # the same, except that it assumes this is a shell command, so removes
+ # continuation backslashes.
+
+ elsif (/^\.\\"\s*JOIN(SH)?/)
+ {
+ my($one,$two);
+ $one = <STDIN>;
+ $two = <STDIN>;
+ $one =~ s/\s*\\e\s*$// if (defined($1));
+ chomp($one);
+ $two =~ s/^\s+//;
+ $_ = "$one $two";
+ redo; # Process the joined lines
+ }
+
+ # Ignore anything not recognized
+
+ next;
+ }
+
+ # Line does not begin with a dot. Replace blank lines with new paragraphs
+
+ if (/^\s*$/)
+ {
+ &end_para() if ($wrotetext);
+ next;
+ }
+
+ # Convert fonts changes and output an ordinary line. Ensure that indented
+ # lines are marked as literal.
+
+ $_ = &do_line($_);
+ &new_para() if (!$inpara);
+
+ if (/^\s/)
+ {
+ if (!$inpre)
+ {
+ print TEMP "<pre>\n";
+ $inpre = 1;
+ }
+ }
+ elsif ($inpre)
+ {
+ print TEMP "</pre>\n";
+ $inpre = 0;
+ }
+
+ # Add <br> to the end of a non-literal line if we are within .nf/.fi
+
+ $_ .= "<br>\n" if (!$inpre && $innf);
+
+ print TEMP;
+ $wrotetext = 1;
+ }
+
+# The TOC, if present, will have been written - terminate it
+
+print "</ul>\n" if ($toc);
+
+# Copy the remainder to the standard output
+
+close(TEMP);
+open(TEMP, "/tmp/$$") || die "Can't open /tmp/$$ for input\n";
+
+print while (<TEMP>);
+
+print <<End ;
+<p>
+Return to the <a href="index.html">PCRE index page</a>.
+</p>
+End
+
+close(TEMP);
+unlink("/tmp/$$");
+
+# End
Propchange: httpd/httpd/vendor/pcre/current/132html
------------------------------------------------------------------------------
svn:executable = *
Modified: httpd/httpd/vendor/pcre/current/AUTHORS
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/AUTHORS?rev=598339&r1=598338&r2=598339&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/AUTHORS (original)
+++ httpd/httpd/vendor/pcre/current/AUTHORS Mon Nov 26 08:49:53 2007
@@ -1,6 +1,23 @@
-Written by: Philip Hazel <ph...@cam.ac.uk>
+THE MAIN PCRE LIBRARY
+---------------------
+
+Written by: Philip Hazel
+Email local part: ph10
+Email domain: cam.ac.uk
University of Cambridge Computing Service,
-Cambridge, England. Phone: +44 1223 334714.
+Cambridge, England.
+
+Copyright (c) 1997-2007 University of Cambridge
+All rights reserved
+
+
+THE C++ WRAPPER LIBRARY
+-----------------------
+
+Written by: Google Inc.
+
+Copyright (c) 2007 Google Inc
+All rights reserved
-Copyright (c) 1997-2004 University of Cambridge
+####
Added: httpd/httpd/vendor/pcre/current/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/CMakeLists.txt?rev=598339&view=auto
==============================================================================
--- httpd/httpd/vendor/pcre/current/CMakeLists.txt (added)
+++ httpd/httpd/vendor/pcre/current/CMakeLists.txt Mon Nov 26 08:49:53 2007
@@ -0,0 +1,356 @@
+# CMakeLists.txt
+#
+#
+# This file allows building PCRE with the CMake configuration and build
+# tool. Download CMake in source or binary form from http://www.cmake.org/
+#
+# Original listfile by Christian Ehrlicher <Ch...@gmx.de>
+# Refined and expanded by Daniel Richard G. <sk...@iSKUNK.ORG>
+# 2007-09-14 mod by Sheri so 7.4 supported configuration options can be entered
+# 2007-09-19 Adjusted by PH to retain previous default settings
+#
+
+PROJECT(PCRE C CXX)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)
+
+# Configuration checks
+
+INCLUDE(CheckIncludeFile)
+INCLUDE(CheckIncludeFileCXX)
+INCLUDE(CheckFunctionExists)
+INCLUDE(CheckTypeSize)
+
+CHECK_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
+CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
+
+CHECK_INCLUDE_FILE_CXX(type_traits.h HAVE_TYPE_TRAITS_H)
+CHECK_INCLUDE_FILE_CXX(bits/type_traits.h HAVE_BITS_TYPE_TRAITS_H)
+
+CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY)
+CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
+CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
+
+CHECK_TYPE_SIZE("long long" LONG_LONG)
+CHECK_TYPE_SIZE("unsigned long long" UNSIGNED_LONG_LONG)
+
+# User-configurable options
+#
+# (Note: CMakeSetup displays these in alphabetical order, regardless of
+# the order we use here)
+
+SET(BUILD_SHARED_LIBS OFF CACHE BOOL
+ "Build shared libraries instead of static ones.")
+
+OPTION(PCRE_BUILD_PCRECPP "Build the PCRE C++ library (pcrecpp)." ON)
+
+SET(PCRE_EBCDIC OFF CACHE BOOL
+ "Use EBCDIC coding instead of ASCII. (This is rarely used outside of mainframe systems)")
+
+SET(PCRE_LINK_SIZE "2" CACHE STRING
+ "Internal link size (2, 3 or 4 allowed). See LINK_SIZE in config.h.in for details.")
+
+SET(PCRE_MATCH_LIMIT "10000000" CACHE STRING
+ "Default limit on internal looping. See MATCH_LIMIT in config.h.in for details.")
+
+SET(PCRE_MATCH_LIMIT_RECURSION "MATCH_LIMIT" CACHE STRING
+ "Default limit on internal recursion. See MATCH_LIMIT_RECURSION in config.h.in for details.")
+
+SET(PCRE_NEWLINE "LF" CACHE STRING
+ "What to recognize as a newline (one of CR, LF, CRLF, ANY, ANYCRLF).")
+
+SET(PCRE_NO_RECURSE OFF CACHE BOOL
+ "If ON, then don't use stack recursion when matching. See NO_RECURSE in config.h.in for details.")
+
+SET(PCRE_POSIX_MALLOC_THRESHOLD "10" CACHE STRING
+ "Threshold for malloc() usage. See POSIX_MALLOC_THRESHOLD in config.h.in for details.")
+
+SET(PCRE_SUPPORT_UNICODE_PROPERTIES OFF CACHE BOOL
+ "Enable support for Unicode properties. (If set, UTF-8 support will be enabled as well)")
+
+SET(PCRE_SUPPORT_UTF8 OFF CACHE BOOL
+ "Enable support for the Unicode UTF-8 encoding.")
+
+SET(PCRE_SUPPORT_BSR_ANYCRLF OFF CACHE BOOL
+ "ON=Backslash-R matches only LF CR and CRLF, OFF=Backslash-R matches all Unicode Linebreaks")
+
+# Prepare build configuration
+
+SET(pcre_have_type_traits 0)
+SET(pcre_have_bits_type_traits 0)
+
+IF(HAVE_TYPE_TRAITS_H)
+ SET(pcre_have_type_traits 1)
+ENDIF(HAVE_TYPE_TRAITS_H)
+
+IF(HAVE_BITS_TYPE_TRAITS_H)
+ SET(pcre_have_bits_type_traits 1)
+ENDIF(HAVE_BITS_TYPE_TRAITS_H)
+
+SET(pcre_have_long_long 0)
+SET(pcre_have_ulong_long 0)
+
+IF(HAVE_LONG_LONG)
+ SET(pcre_have_long_long 1)
+ENDIF(HAVE_LONG_LONG)
+
+IF(HAVE_UNSIGNED_LONG_LONG)
+ SET(pcre_have_ulong_long 1)
+ENDIF(HAVE_UNSIGNED_LONG_LONG)
+
+IF(NOT BUILD_SHARED_LIBS)
+ SET(PCRE_STATIC 1)
+ENDIF(NOT BUILD_SHARED_LIBS)
+
+IF(PCRE_SUPPORT_BSR_ANYCRLF)
+ SET(BSR_ANYCRLF 1)
+ENDIF(PCRE_SUPPORT_BSR_ANYCRLF)
+
+IF(PCRE_SUPPORT_UTF8 OR PCRE_SUPPORT_UNICODE_PROPERTIES)
+ SET(SUPPORT_UTF8 1)
+ENDIF(PCRE_SUPPORT_UTF8 OR PCRE_SUPPORT_UNICODE_PROPERTIES)
+
+IF(PCRE_SUPPORT_UNICODE_PROPERTIES)
+ SET(SUPPORT_UCP 1)
+ENDIF(PCRE_SUPPORT_UNICODE_PROPERTIES)
+
+SET(NEWLINE "")
+
+IF(PCRE_NEWLINE STREQUAL "LF")
+ SET(NEWLINE "10")
+ENDIF(PCRE_NEWLINE STREQUAL "LF")
+IF(PCRE_NEWLINE STREQUAL "CR")
+ SET(NEWLINE "13")
+ENDIF(PCRE_NEWLINE STREQUAL "CR")
+IF(PCRE_NEWLINE STREQUAL "CRLF")
+ SET(NEWLINE "3338")
+ENDIF(PCRE_NEWLINE STREQUAL "CRLF")
+IF(PCRE_NEWLINE STREQUAL "ANY")
+ SET(NEWLINE "-1")
+ENDIF(PCRE_NEWLINE STREQUAL "ANY")
+IF(PCRE_NEWLINE STREQUAL "ANYCRLF")
+ SET(NEWLINE "-2")
+ENDIF(PCRE_NEWLINE STREQUAL "ANYCRLF")
+
+IF(NEWLINE STREQUAL "")
+ MESSAGE(FATAL_ERROR "The PCRE_NEWLINE variable must be set to one of the following values: \"LF\", \"CR\", \"CRLF\", \"ANY\", \"ANYCRLF\".")
+ENDIF(NEWLINE STREQUAL "")
+
+IF(PCRE_EBCDIC)
+ SET(EBCDIC 1)
+ENDIF(PCRE_EBCDIC)
+
+IF(PCRE_NO_RECURSE)
+ SET(NO_RECURSE 1)
+ENDIF(PCRE_NO_RECURSE)
+
+# Output files
+
+CONFIGURE_FILE(config-cmake.h.in
+ ${CMAKE_BINARY_DIR}/config.h
+ @ONLY)
+
+CONFIGURE_FILE(pcre.h.generic
+ ${CMAKE_BINARY_DIR}/pcre.h
+ COPYONLY)
+
+# What about pcre-config and libpcre.pc?
+
+IF(PCRE_BUILD_PCRECPP)
+ CONFIGURE_FILE(pcre_stringpiece.h.in
+ ${CMAKE_BINARY_DIR}/pcre_stringpiece.h
+ @ONLY)
+
+ CONFIGURE_FILE(pcrecpparg.h.in
+ ${CMAKE_BINARY_DIR}/pcrecpparg.h
+ @ONLY)
+ENDIF(PCRE_BUILD_PCRECPP)
+
+# Character table generation
+
+ADD_EXECUTABLE(dftables dftables.c)
+
+GET_TARGET_PROPERTY(DFTABLES_EXE dftables LOCATION)
+
+ADD_CUSTOM_COMMAND(
+ COMMENT "Generating character tables (pcre_chartables.c) for current locale"
+ DEPENDS dftables
+ COMMAND ${DFTABLES_EXE}
+ ARGS ${CMAKE_BINARY_DIR}/pcre_chartables.c
+ OUTPUT ${CMAKE_BINARY_DIR}/pcre_chartables.c
+)
+
+# Source code
+
+SET(PCRE_HEADERS ${CMAKE_BINARY_DIR}/pcre.h)
+
+SET(PCRE_SOURCES
+ ${CMAKE_BINARY_DIR}/pcre_chartables.c
+ pcre_compile.c
+ pcre_config.c
+ pcre_dfa_exec.c
+ pcre_exec.c
+ pcre_fullinfo.c
+ pcre_get.c
+ pcre_globals.c
+ pcre_info.c
+ pcre_newline.c
+ pcre_maketables.c
+ pcre_ord2utf8.c
+ pcre_refcount.c
+ pcre_study.c
+ pcre_tables.c
+ pcre_try_flipped.c
+ pcre_ucp_searchfuncs.c
+ pcre_valid_utf8.c
+ pcre_version.c
+ pcre_xclass.c
+)
+
+SET(PCREPOSIX_HEADERS pcreposix.h)
+
+SET(PCREPOSIX_SOURCES pcreposix.c)
+
+SET(PCRECPP_HEADERS
+ pcrecpp.h
+ pcre_scanner.h
+ ${CMAKE_BINARY_DIR}/pcrecpparg.h
+ ${CMAKE_BINARY_DIR}/pcre_stringpiece.h
+)
+
+SET(PCRECPP_SOURCES
+ pcrecpp.cc
+ pcre_scanner.cc
+ pcre_stringpiece.cc
+)
+
+# Build setup
+
+ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+
+IF(WIN32)
+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
+ENDIF(WIN32)
+
+SET(CMAKE_INCLUDE_CURRENT_DIR 1)
+
+#SET(CMAKE_DEBUG_POSTFIX "d")
+
+# Libraries
+
+ADD_LIBRARY(pcre ${PCRE_HEADERS} ${PCRE_SOURCES})
+
+ADD_LIBRARY(pcreposix ${PCREPOSIX_HEADERS} ${PCREPOSIX_SOURCES})
+TARGET_LINK_LIBRARIES(pcreposix pcre)
+
+SET_TARGET_PROPERTIES(pcre pcreposix
+ PROPERTIES PREFIX ""
+)
+
+IF(PCRE_BUILD_PCRECPP)
+ ADD_LIBRARY(pcrecpp ${PCRECPP_HEADERS} ${PCRECPP_SOURCES})
+ TARGET_LINK_LIBRARIES(pcrecpp pcre)
+ IF(MINGW)
+ SET_TARGET_PROPERTIES(pcrecpp PROPERTIES PREFIX "mingw-")
+ ENDIF(MINGW)
+ENDIF(PCRE_BUILD_PCRECPP)
+
+# Executables
+
+ADD_EXECUTABLE(pcretest pcretest.c)
+TARGET_LINK_LIBRARIES(pcretest pcreposix)
+
+ADD_EXECUTABLE(pcregrep pcregrep.c)
+TARGET_LINK_LIBRARIES(pcregrep pcreposix)
+
+IF(PCRE_BUILD_PCRECPP)
+ ADD_EXECUTABLE(pcrecpp_unittest pcrecpp_unittest.cc)
+ TARGET_LINK_LIBRARIES(pcrecpp_unittest pcrecpp)
+
+ ADD_EXECUTABLE(pcre_scanner_unittest pcre_scanner_unittest.cc)
+ TARGET_LINK_LIBRARIES(pcre_scanner_unittest pcrecpp)
+
+ ADD_EXECUTABLE(pcre_stringpiece_unittest pcre_stringpiece_unittest.cc)
+ TARGET_LINK_LIBRARIES(pcre_stringpiece_unittest pcrecpp)
+ENDIF(PCRE_BUILD_PCRECPP)
+
+# Testing
+
+ENABLE_TESTING()
+
+GET_TARGET_PROPERTY(PCREGREP_EXE pcregrep DEBUG_LOCATION)
+GET_TARGET_PROPERTY(PCRETEST_EXE pcretest DEBUG_LOCATION)
+
+# Write out a CTest configuration file that sets some needed environment
+# variables for the test scripts.
+#
+FILE(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.ctest
+"# This is a generated file.
+SET(ENV{srcdir} ${CMAKE_SOURCE_DIR})
+SET(ENV{pcregrep} ${PCREGREP_EXE})
+SET(ENV{pcretest} ${PCRETEST_EXE})
+")
+
+IF(UNIX)
+ ADD_TEST(pcre_test ${CMAKE_SOURCE_DIR}/RunTest)
+ ADD_TEST(pcre_grep_test ${CMAKE_SOURCE_DIR}/RunGrepTest)
+ENDIF(UNIX)
+IF(WIN32)
+ ADD_TEST(pcre_test cmd /C ${CMAKE_SOURCE_DIR}/RunTest.bat)
+ENDIF(WIN32)
+
+GET_TARGET_PROPERTY(PCRECPP_UNITTEST_EXE
+ pcrecpp_unittest
+ DEBUG_LOCATION)
+
+GET_TARGET_PROPERTY(PCRE_SCANNER_UNITTEST_EXE
+ pcre_scanner_unittest
+ DEBUG_LOCATION)
+
+GET_TARGET_PROPERTY(PCRE_STRINGPIECE_UNITTEST_EXE
+ pcre_stringpiece_unittest
+ DEBUG_LOCATION)
+
+ADD_TEST(pcrecpp_test ${PCRECPP_UNITTEST_EXE})
+ADD_TEST(pcre_scanner_test ${PCRE_SCANNER_UNITTEST_EXE})
+ADD_TEST(pcre_stringpiece_test ${PCRE_STRINGPIECE_UNITTEST_EXE})
+
+# Installation
+
+SET(CMAKE_INSTALL_ALWAYS 1)
+
+INSTALL(TARGETS pcre pcreposix pcregrep pcretest
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+
+INSTALL(FILES ${PCRE_HEADERS} ${PCREPOSIX_HEADERS} DESTINATION include)
+
+FILE(GLOB html ${CMAKE_SOURCE_DIR}/doc/html/*.html)
+FILE(GLOB man1 ${CMAKE_SOURCE_DIR}/doc/*.1)
+FILE(GLOB man3 ${CMAKE_SOURCE_DIR}/doc/*.3)
+
+IF(PCRE_BUILD_PCRECPP)
+ INSTALL(TARGETS pcrecpp
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
+ INSTALL(FILES ${PCRECPP_HEADERS} DESTINATION include)
+ELSE(PCRE_BUILD_PCRECPP)
+ # Remove pcrecpp.3
+ FOREACH(man ${man3})
+ GET_FILENAME_COMPONENT(man_tmp ${man} NAME)
+ IF(NOT man_tmp STREQUAL "pcrecpp.3")
+ SET(man3_new ${man3} ${man})
+ ENDIF(NOT man_tmp STREQUAL "pcrecpp.3")
+ ENDFOREACH(man ${man3})
+ SET(man3 ${man3_new})
+ENDIF(PCRE_BUILD_PCRECPP)
+
+INSTALL(FILES ${man1} DESTINATION man/man1)
+INSTALL(FILES ${man3} DESTINATION man/man3)
+INSTALL(FILES ${html} DESTINATION share/doc/pcre/html)
+
+# end CMakeLists.txt
Modified: httpd/httpd/vendor/pcre/current/COPYING
URL: http://svn.apache.org/viewvc/httpd/httpd/vendor/pcre/current/COPYING?rev=598339&r1=598338&r2=598339&view=diff
==============================================================================
--- httpd/httpd/vendor/pcre/current/COPYING (original)
+++ httpd/httpd/vendor/pcre/current/COPYING Mon Nov 26 08:49:53 2007
@@ -1,45 +1,5 @@
PCRE LICENCE
-------------
-PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-Release 5 of PCRE is distributed under the terms of the "BSD" licence, as
-specified below. The documentation for PCRE, supplied in the "doc"
-directory, is distributed under the same terms as the software itself.
-
-Written by: Philip Hazel <ph...@cam.ac.uk>
-
-University of Cambridge Computing Service,
-Cambridge, England. Phone: +44 1223 334714.
-
-Copyright (c) 1997-2004 University of Cambridge
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the name of the University of Cambridge nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Please see the file LICENCE in the PCRE distribution for licensing details.
End