summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShmuel Zeigerman <solomuz0@gmail.com>2012-04-10 23:58:12 +0300
committerShmuel Zeigerman <solomuz0@gmail.com>2012-04-10 23:58:12 +0300
commit76b3ee24e1b1cd48d7b414e18917a314540cbdb8 (patch)
treeeb1ba1ae60b8b142f037a2419c9060f8b7e9d4d5
parent732c0502885407e65042077436cb69c87dba4a95 (diff)
downloadlrexlib-76b3ee24e1b1cd48d7b414e18917a314540cbdb8.tar.gz
Update docs towards the release.
-rw-r--r--LICENSE6
-rw-r--r--NEWS4
-rw-r--r--README.rst10
-rw-r--r--doc/license.html6
-rw-r--r--doc/manual.txt9
-rw-r--r--src/algo.h2
-rw-r--r--windows/mingw/_mingw.mak9
7 files changed, 29 insertions, 17 deletions
diff --git a/LICENSE b/LICENSE
index 4ea0ebc..5844250 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,8 @@
-License of Lrexlib release 2.5
+License of Lrexlib release 2.6
------------------------------
-Copyright (C) Reuben Thomas 2000-2010
-Copyright (C) Shmuel Zeigerman 2004-2010
+Copyright (C) Reuben Thomas 2000-2012
+Copyright (C) Shmuel Zeigerman 2004-2012
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated
diff --git a/NEWS b/NEWS
index 4535dd1..7b0dcc5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+2012-04-?? Release 2.6.0
+
+ * Added support for Lua 5.2.
+
2010-12-15 Release 2.5.3
* Bug fix to rex.split.
diff --git a/README.rst b/README.rst
index 2ab36bb..41a3f8c 100644
--- a/README.rst
+++ b/README.rst
@@ -1,15 +1,15 @@
-Lrexlib 2.5
+Lrexlib 2.6
===========
| by Reuben Thomas (rrt@sc3d.org)
| and Shmuel Zeigerman (shmuz@013net.net) [maintainer]
**Lrexlib** provides bindings of five regular expression library APIs
-(POSIX_, PCRE_, GNU_, TRE_ and Oniguruma_) to Lua_ 5.1. The bindings
-for TRE and Oniguruma are not currently complete.
+(POSIX_, PCRE_, GNU_, TRE_ and Oniguruma_) to Lua_ 5.1 and Lua 5.2.
+The bindings for TRE and Oniguruma are not currently complete.
-**Lrexlib** is copyright Reuben Thomas 2000-2010 and copyright Shmuel
-Zeigerman 2004-2010, and is released under the same license as Lua,
+**Lrexlib** is copyright Reuben Thomas 2000-2012 and copyright Shmuel
+Zeigerman 2004-2012, and is released under the same license as Lua,
the MIT_ license (otherwise known as the revised BSD license). There
is no warranty.
diff --git a/doc/license.html b/doc/license.html
index e9287ba..15335ed 100644
--- a/doc/license.html
+++ b/doc/license.html
@@ -5,9 +5,9 @@
</head>
<body>
-<h2>Lrexlib 2.5</h2>
-<p>Copyright &copy; Reuben Thomas 2000-2010<br>
-Copyright &copy; Shmuel Zeigerman 2004-2010
+<h2>Lrexlib 2.6</h2>
+<p>Copyright &copy; Reuben Thomas 2000-2012<br>
+Copyright &copy; Shmuel Zeigerman 2004-2012
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/doc/manual.txt b/doc/manual.txt
index 1b5ea53..6af4d5f 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -1,6 +1,6 @@
.. role:: funcdef(literal)
-Lrexlib 2.5 Reference Manual
+Lrexlib 2.6 Reference Manual
============================
.. contents:: Table of Contents
@@ -832,6 +832,13 @@ This function returns a string containing the version of the used TRE library.
Incompatibilities with previous versions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Incompatibilities between versions 2.6 and 2.5:**
+
+ 1. Removed function ``plainfind``.
+ #. Global variables (e.g. *rex_posix*, *rex_pcre*, etc.) are not created
+ by default. This can be changed at the stage of compilation by adding
+ ``-DREX_CREATEGLOBALVAR`` to ``CFLAGS``.
+
**Incompatibilities between versions 2.2 and 2.1:**
1. gsub_: a special "break" return of *repl* function is deprecated.
diff --git a/src/algo.h b/src/algo.h
index 2db4c81..a1ea61c 100644
--- a/src/algo.h
+++ b/src/algo.h
@@ -4,7 +4,7 @@
#include "common.h"
/* FIXME: Get version from defaults.mak */
-#define REX_VERSION "Lrexlib 2.5.3"
+#define REX_VERSION "Lrexlib 2.6.0"
/* Forward declarations */
static void gmatch_pushsubject (lua_State *L, TArgExec *argE);
diff --git a/windows/mingw/_mingw.mak b/windows/mingw/_mingw.mak
index 07174c1..9d56927 100644
--- a/windows/mingw/_mingw.mak
+++ b/windows/mingw/_mingw.mak
@@ -5,10 +5,10 @@
# Target Lua version (51 for Lua 5.1; 52 for Lua 5.2).
LUAVERSION = 51
-# Path to install the built DLL.
-# Name of Lua DLL to link to (.dll should be omitted).
-# Name of Lua interpreter.
-# Path of Lua include files.
+# INSTALLPATH : Path to install the built DLL.
+# LUADLL : Name of Lua DLL to link to (.dll should be omitted).
+# LUAEXE : Name of Lua interpreter.
+# LUAINC : Path of Lua include files.
ifeq ($(LUAVERSION),51)
INSTALLPATH = s:\exe\lib32\lua51
@@ -21,6 +21,7 @@ else
LUADLL = lua52
LUAEXE = lua52.exe
LUAINC = s:\progr\work\system\include\lua52
+# MYCFLAGS += -DREX_CREATEGLOBALVAR
endif
# --------------------------------------------------------------------------