Remove unnecessary version numbers and have only one source of the ve…

…rsion.
LuaDist · Oct 4, 2012 · 49b14d8 · 49b14d8
1 parent 4d23cfb
commit 49b14d8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);