summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2012-10-04 18:20:07 +0100
committerReuben Thomas <rrt@sc3d.org>2012-10-04 18:20:07 +0100
commit49b14d86ff46b25b5399987e970dc851ac821119 (patch)
treed24b237587602bc71c9253517b1c3e1f6fdceda2
parent4d23cfb500678ffc285860bfb6dd5e2863dda6c2 (diff)
downloadlrexlib-49b14d86ff46b25b5399987e970dc851ac821119.tar.gz
Remove unnecessary version numbers and have only one source of the version.
-rw-r--r--LICENSE4
-rw-r--r--README.rst4
-rw-r--r--doc/license.html2
-rw-r--r--doc/manual.txt4
-rw-r--r--rockspecs.lua13
-rw-r--r--src/algo.h3
6 files changed, 19 insertions, 11 deletions
diff --git a/LICENSE b/LICENSE
index 5844250..6cbc664 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-License of Lrexlib release 2.6
-------------------------------
+License of Lrexlib release
+--------------------------
Copyright (C) Reuben Thomas 2000-2012
Copyright (C) Shmuel Zeigerman 2004-2012
diff --git a/README.rst b/README.rst
index 41a3f8c..e0d7ad9 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-Lrexlib 2.6
-===========
+Lrexlib
+=======
| by Reuben Thomas (rrt@sc3d.org)
| and Shmuel Zeigerman (shmuz@013net.net) [maintainer]
diff --git a/doc/license.html b/doc/license.html
index 15335ed..91c476a 100644
--- a/doc/license.html
+++ b/doc/license.html
@@ -5,7 +5,7 @@
</head>
<body>
-<h2>Lrexlib 2.6</h2>
+<h2>Lrexlib</h2>
<p>Copyright &copy; Reuben Thomas 2000-2012<br>
Copyright &copy; Shmuel Zeigerman 2004-2012
diff --git a/doc/manual.txt b/doc/manual.txt
index 72790ba..f0c379a 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -1,7 +1,7 @@
.. role:: funcdef(literal)
-Lrexlib 2.6 Reference Manual
-============================
+Lrexlib Reference Manual
+========================
.. contents:: Table of Contents
diff --git a/rockspecs.lua b/rockspecs.lua
index 8d5c06a..9ad55c8 100644
--- a/rockspecs.lua
+++ b/rockspecs.lua
@@ -45,6 +45,7 @@ PCRE = {
type = "builtin",
modules = {
rex_pcre = {
+ defines = {"VERSION=\""..version.."\""},
sources = {"src/common.c", "src/pcre/lpcre.c", "src/pcre/lpcre_f.c"},
libraries = {"pcre"},
incdirs = {"$(PCRE_INCDIR)"},
@@ -63,7 +64,10 @@ POSIX = {
build = {
type = "builtin",
modules = {
- rex_posix = {"src/common.c", "src/posix/lposix.c"}
+ rex_posix = {
+ defines = {"VERSION=\""..version.."\""},
+ sources = {"src/common.c", "src/posix/lposix.c"}
+ }
}
}
},
@@ -79,6 +83,7 @@ oniguruma = {
type = "builtin",
modules = {
rex_onig = {
+ defines = {"VERSION=\""..version.."\""},
sources = {"src/common.c", "src/oniguruma/lonig.c", "src/oniguruma/lonig_f.c"},
libraries = {"onig"},
incdirs = {"$(ONIG_INCDIR)"},
@@ -99,6 +104,7 @@ TRE = {
type = "builtin",
modules = {
rex_tre = {
+ defines = {"VERSION=\""..version.."\""},
sources = {"src/common.c", "src/tre/ltre.c" --[[, "src/tre/tre_w.c"]]},
libraries = {"tre"},
incdirs = {"$(TRE_INCDIR)"},
@@ -117,7 +123,10 @@ GNU = {
build = {
type = "builtin",
modules = {
- rex_posix = {"src/common.c", "src/gnu/lgnu.c"}
+ rex_posix = {
+ defines = {"VERSION=\""..version.."\""},
+ source = {"src/common.c", "src/gnu/lgnu.c"}
+ }
}
}
},
diff --git a/src/algo.h b/src/algo.h
index e268a02..4a0afb3 100644
--- a/src/algo.h
+++ b/src/algo.h
@@ -3,8 +3,7 @@
#include "common.h"
-/* FIXME: Get version from defaults.mak */
-#define REX_VERSION "Lrexlib 2.6.0"
+#define REX_VERSION "Lrexlib " VERSION
/* Forward declarations */
static void gmatch_pushsubject (lua_State *L, TArgExec *argE);