luatex, mpost: Use WEB2CVERSION string

git-svn-id: svn://tug.org/texlive/trunk@26284 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 21 insertions, 12 deletions

diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 65e5bd6e9bc..e7b2b8bae3a 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* lua/luainit.w (lua_initialize): Use WEB2CVERSION.
+	* tex/printing.w (print_banner, log_banner): Same.
+
 2012-02-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* luatex.h: Remove definition of WRITE_OUT, now in ../cpascal.h.
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w
index 6d290d04fe7..39dc6d70fbb 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w
@@ -1,6 +1,6 @@
 % luainit.w
 % 
-% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
 
 % This file is part of LuaTeX.
 
@@ -328,7 +328,7 @@ static void parse_options(int argc, char **argv)
                  "the terms of the GNU General Public License, version 2. For more\n"
                  "information about these matters, see the file named COPYING and\n"
                  "the LuaTeX source.\n\n" 
-                 "Copyright 2011 Taco Hoekwater, the LuaTeX Team.\n");
+                 "Copyright 2012 Taco Hoekwater, the LuaTeX Team.\n");
             /* *INDENT-ON* */
             uexit(0);
         } else if (ARGUMENT_IS("credits")) {
@@ -738,7 +738,7 @@ void lua_initialize(int ac, char **av)
     argc = ac;
     argv = av;
 
-    if (asprintf(&banner, "This is LuaTeX, Version %s-%d (TeX Live 2012)",
+    if (asprintf(&banner, "This is LuaTeX, Version %s-%d" WEB2CVERSION,
                  luatex_version_string, luatex_date_info) < 0) {
         exit(EXIT_FAILURE);
     }
diff --git a/Build/source/texk/web2c/luatexdir/tex/printing.w b/Build/source/texk/web2c/luatexdir/tex/printing.w
index 09362a13671..c2e9cb9a92f 100644
--- a/Build/source/texk/web2c/luatexdir/tex/printing.w
+++ b/Build/source/texk/web2c/luatexdir/tex/printing.w
@@ -1,6 +1,6 @@
 % printing.w
 
-% Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2009-2012 Taco Hoekwater <taco@@luatex.org>
 
 % This file is part of LuaTeX.
 
@@ -360,7 +360,7 @@ void print_banner(const char *v, int e, int ver)
     int callback_id;
     callback_id = callback_defined(start_run_callback);
     if (callback_id == 0) {
-        fprintf(term_out, "This is LuaTeX, Version %s-%d (TeX Live 2012)", v, e);
+        fprintf(term_out, "This is LuaTeX, Version %s-%d" WEB2CVERSION, v, e);
         if (format_ident > 0)
             slow_print(format_ident);
         print_ln();
@@ -385,7 +385,7 @@ void log_banner(const char *v, int e, int ver)
     unsigned month = (unsigned) int_par(month_code);
     if (month > 12)
         month = 0;
-    fprintf(log_file, "This is LuaTeX, Version %s-%d (TeX Live 2012)", v, e);
+    fprintf(log_file, "This is LuaTeX, Version %s-%d" WEB2CVERSION, v, e);
     slow_print(format_ident);
     print_char(' ');
     print_char(' ');
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index d3da6f8d7b5..0119b273a6f 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* lua/luainit.w: Use WEB2CVERSION.
+
 2011-10-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/libmplib.am (EXTRA_DIST): Drop lmplib.c, used by luaTeX.
diff --git a/Build/source/texk/web2c/mplibdir/mpost.w b/Build/source/texk/web2c/mplibdir/mpost.w
index a24ba12ce28..2792ef13e95 100644
--- a/Build/source/texk/web2c/mplibdir/mpost.w
+++ b/Build/source/texk/web2c/mplibdir/mpost.w
@@ -853,9 +853,9 @@ static struct option dvitomp_options[]
 {
 char *s = mp_metapost_version();
 if (dvitomp_only)
-  fprintf(stdout, "This is dvitomp %s (TeX Live 2012)\n", s);
+  fprintf(stdout, "This is dvitomp %s" WEB2CVERSION "\n", s);
 else
-  fprintf(stdout, "This is MetaPost %s (TeX Live 2012)\n", s);
+  fprintf(stdout, "This is MetaPost %s" WEB2CVERSION "\n", s);
 mpost_xfree(s);
 fprintf(stdout,
 "\n"
@@ -899,9 +899,9 @@ fprintf(stdout,
 {
 char *s = mp_metapost_version();
 if (dvitomp_only)
-  fprintf(stdout, "This is dvitomp %s (TeX Live 2012)\n", s);
+  fprintf(stdout, "This is dvitomp %s" WEB2CVERSION "\n", s);
 else
-  fprintf(stdout, "This is MetaPost %s (TeX Live 2012)\n", s);
+  fprintf(stdout, "This is MetaPost %s" WEB2CVERSION "\n", s);
 mpost_xfree(s);
 fprintf(stdout,
 "\n"
@@ -926,9 +926,9 @@ fprintf(stdout,
 {
   char *s = mp_metapost_version();
 if (dvitomp_only)
-  fprintf(stdout, "dvitomp (MetaPost) %s (TeX Live 2012)\n", s);
+  fprintf(stdout, "dvitomp (MetaPost) %s" WEB2CVERSION "\n", s);
 else
-  fprintf(stdout, "MetaPost %s (TeX Live 2012)\n", s);
+  fprintf(stdout, "MetaPost %s" WEB2CVERSION "\n", s);
 fprintf(stdout, 
 "The MetaPost source code in the public domain.\n"
 "MetaPost also uses code available under the\n"