Revision: 319
http://vcs.pcre.org/viewvc?view=rev&revision=319
Author: ph10
Date: 2008-01-28 15:27:45 +0000 (Mon, 28 Jan 2008)
Log Message:
-----------
File tidy-up for 7.6 release.
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/NEWS
code/trunk/NON-UNIX-USE
code/trunk/configure.ac
code/trunk/pcredemo.c
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2008-01-28 15:27:17 UTC (rev 318)
+++ code/trunk/ChangeLog 2008-01-28 15:27:45 UTC (rev 319)
@@ -1,7 +1,7 @@
ChangeLog for PCRE
------------------
-Version 7.6 21-Jan-08
+Version 7.6 28-Jan-08
---------------------
1. A character class containing a very large number of characters with
@@ -37,7 +37,7 @@
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 for dll names built with mingw when configured
+ NON_STANDARD_LIB_SUFFIX for dll names built with mingw when configured
with CMake, and also correct the comment about stack recursion.
7. Remove the automatic building of pcredemo from the ./configure system and
@@ -46,7 +46,9 @@
building it automatically is not really right. What is more, it gave
trouble in some build environments.
+8. Further tidies to CMakeLists.txt from Sheri and Christian.
+
Version 7.5 10-Jan-08
---------------------
Modified: code/trunk/NEWS
===================================================================
--- code/trunk/NEWS 2008-01-28 15:27:17 UTC (rev 318)
+++ code/trunk/NEWS 2008-01-28 15:27:45 UTC (rev 319)
@@ -1,7 +1,7 @@
News about PCRE releases
------------------------
-Release 7.6 21-Jan-08
+Release 7.6 28-Jan-08
---------------------
The main reason for having this release so soon after 7.5 is because it fixes a
Modified: code/trunk/NON-UNIX-USE
===================================================================
--- code/trunk/NON-UNIX-USE 2008-01-28 15:27:17 UTC (rev 318)
+++ code/trunk/NON-UNIX-USE 2008-01-28 15:27:45 UTC (rev 319)
@@ -8,7 +8,7 @@
The C++ wrapper functions
Building for virtual Pascal
Stack size in Windows environments
- Linking programs in Windows environments
+ Linking programs in Windows environments
Comments about Win32 builds
Building PCRE on Windows with CMake
Use of relative paths with CMake on Windows
@@ -38,7 +38,7 @@
build system, as found in many Unix-like environments. There is also support
support for CMake, which some users prefer, in particular in Windows
environments. There are some instructions for CMake under Windows in the
-section entitled "Building PCRE with CMake" below. CMake can also be used to
+section entitled "Building PCRE with CMake" below. CMake can also be used to
build PCRE in Unix-like systems.
@@ -184,7 +184,7 @@
LINKING PROGRAMS IN WINDOWS ENVIRONMENTS
-If you want to statically link a program against a PCRE library in the form of
+If you want to statically link a program against a PCRE library in the form of
a non-dll .a file, you must define PCRE_STATIC before including pcre.h,
otherwise the pcre_malloc() and pcre_free() exported functions will be declared
__declspec(dllimport), with unwanted results.
@@ -195,8 +195,8 @@
There are two ways of building PCRE using the "configure, make, make install"
paradigm on Windows systems: using MinGW or using Cygwin. These are not at all
the same thing; they are completely different from each other. There is also
-support for building using CMake, which some users find a more straightforward
-way of building PCRE under Windows. However, the tests are not run
+support for building using CMake, which some users find a more straightforward
+way of building PCRE under Windows. However, the tests are not run
automatically when CMake is used.
The MinGW home page (
http://www.mingw.org/) says this:
@@ -230,7 +230,7 @@
longer happens.)
A user submitted a special-purpose patch that makes it easy to create
-"pcre.dll" under mingw32 using the "msys" environment. It provides "pcre.dll"
+"pcre.dll" under mingw32 using the "msys" environment. It provides "pcre.dll"
as a special target. If you use this target, no other files are built, and in
particular, the pcretest and pcregrep programs are not built. An example of how
this might be used is:
@@ -277,26 +277,26 @@
1. Download CMake 2.4.7 or above from http://www.cmake.org/, install and ensure
that cmake\bin is on your path.
-
+
2. Unzip (retaining folder structure) the PCRE source tree into a source
directory such as C:\pcre.
-
+
3. Create a new, empty build directory: C:\pcre\build\
-
+
4. Run CMakeSetup from the Shell envirornment of your build tool, e.g., Msys
for Msys/MinGW or Visual Studio Command Prompt for VC/VC++
-
+
5. Enter C:\pcre\pcre-xx and C:\pcre\build for the source and build
directories, respectively
-
+
6. Hit the "Configure" button.
-
+
7. Select the particular IDE / build tool that you are using (Visual Studio,
MSYS makefiles, MinGW makefiles, etc.)
-
+
8. The GUI will then list several configuration options. This is where you can
enable UTF-8 support, etc.
-
+
9. Hit "Configure" again. The adjacent "OK" button should now be active.
10. Hit "OK".
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2008-01-28 15:27:17 UTC (rev 318)
+++ code/trunk/configure.ac 2008-01-28 15:27:45 UTC (rev 319)
@@ -8,8 +8,8 @@
m4_define(pcre_major, [7])
m4_define(pcre_minor, [6])
-m4_define(pcre_prerelease, [-RC2])
-m4_define(pcre_date, [2008-01-23])
+m4_define(pcre_prerelease, [])
+m4_define(pcre_date, [2008-01-28])
# Libtool shared library interface versions (current:revision:age)
m4_define(libpcre_version, [0:1:0])
Modified: code/trunk/pcredemo.c
===================================================================
--- code/trunk/pcredemo.c 2008-01-28 15:27:17 UTC (rev 318)
+++ code/trunk/pcredemo.c 2008-01-28 15:27:45 UTC (rev 319)
@@ -4,7 +4,7 @@
/* This is a demonstration program to illustrate the most straightforward ways
of calling the PCRE regular expression library from a C program. See the
-pcresample documentation for a short discussion ("man pcresample" if you have
+pcresample documentation for a short discussion ("man pcresample" if you have
the PCRE man pages installed).
In Unix-like environments, compile this program thuswise:
