summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-20 23:47:28 +0000
committerKarl Berry <karl@freefriends.org>2013-09-20 23:47:28 +0000
commit19b6b47d179f7b2c660db6143ffe15458f111ef5 (patch)
treef9760649dfb90bd534f65507f4a810b6fe55477e /Build/source
parentd7cef2e3b00fb109d35da34a7ae12974e1b1860d (diff)
mpost, luatex: consistently use TL version, not datestamps
git-svn-id: svn://tug.org/texlive/trunk@31709 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/c-auto.in3
-rwxr-xr-xBuild/source/texk/web2c/configure8
-rw-r--r--Build/source/texk/web2c/configure.ac6
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/luainit.w10
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/printing.w5
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/mplibdir/mpost.w9
9 files changed, 54 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 46ece47f950..30e1b24fde9 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-20 Karl Berry <karl@tug.org>
+
+ * configure.ac (NATIVE_TEXLIVE_BUILD): new AC_DEFINE,
+ following --enable-texlive-build. Used in LuaTeX and MetaPost.
+
2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop ACLOCAL_AMFLAGS.
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index 5c02f3bd4f3..cd1b7bafe5e 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -237,6 +237,9 @@
/* metafont: Define to include mftalk (generic server) window support. */
#undef MFTALKWIN
+/* Define to 1 if building binaries for TeX Live, else 0. */
+#undef NATIVE_TEXLIVE_BUILD
+
/* metafont: Define to include NeXT window support. */
#undef NEXTWIN
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index faabb6bc4ee..4c213987146 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18374,6 +18374,14 @@ if test -z "$WIN32_TRUE"; then :
fi
+# A compilation variable for doing a TL build so we can
+# adjust the luatex banner, maybe others.
+if test "x$enable_native_texlive_build" = xyes; then :
+
+$as_echo "#define NATIVE_TEXLIVE_BUILD 1" >>confdefs.h
+
+fi
+
case $with_editor in #(
''|yes|no) :
if test "x$kpse_cv_have_win32" = xno; then :
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 460728f3542..0464fc66479 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -61,6 +61,12 @@ KPSE_ASM_UNDERSCORE
KPSE_COND_MINGW32
KPSE_WIN32_CALL
+# A compilation variable for doing a TL build so we can
+# adjust the luatex banner, maybe others.
+AS_IF([test "x$enable_native_texlive_build" = xyes],
+ [AC_DEFINE([NATIVE_TEXLIVE_BUILD], 1,
+ [Define to 1 if building binaries for TeX Live, else 0.])])
+
AS_CASE([$with_editor],
[''|yes|no], [AS_IF([test "x$kpse_cv_have_win32" = xno],
[with_editor="vi +%d '%s'"],
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 43afaa0926c..9c8650272dd 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-20 Karl Berry <karl@tug.org>
+
+ * lua/luainit.w (lua_initialize) [NATIVE_TEXLIVE_BUILD]: omit date.
+ * tex/printing.w (print_banner) [NATIVE_TEXLIVE_BUILD]: replace
+ date with WEB2CVERSION for TL binaries.
+
2013-08-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* font/writecff.w: Fix a bug in write_cid_cff(). There was not
diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.w b/Build/source/texk/web2c/luatexdir/lua/luainit.w
index 5f8f12d5592..e86f7f8d05b 100644
--- a/Build/source/texk/web2c/luatexdir/lua/luainit.w
+++ b/Build/source/texk/web2c/luatexdir/lua/luainit.w
@@ -764,10 +764,14 @@ void lua_initialize(int ac, char **av)
banner = xmalloc(len);
sprintf(banner, fmt, luatex_version_string, buf);
} else {
- const char *fmt = "This is LuaTeX, Version %s-%s " WEB2CVERSION " (rev %d)";
+ const char *fmt = "This is LuaTeX, Version %s%s" WEB2CVERSION " (rev %d)";
size_t len;
- char buf[16];
- sprintf(buf, "%d", luatex_date_info);
+ char buf[18];
+#ifndef NATIVE_TEXLIVE_BUILD
+ sprintf(buf, "-%d", luatex_date_info);
+#else
+ buf[0] = 0; /* TL: skip datestamp provoking ever-changing binaries */
+#endif
len = strlen(fmt) + strlen(luatex_version_string) + strlen(buf) + 6;
banner = xmalloc(len);
sprintf(banner, fmt, luatex_version_string, buf, luatex_svn);
diff --git a/Build/source/texk/web2c/luatexdir/tex/printing.w b/Build/source/texk/web2c/luatexdir/tex/printing.w
index 8f948a18922..fe011fa369c 100644
--- a/Build/source/texk/web2c/luatexdir/tex/printing.w
+++ b/Build/source/texk/web2c/luatexdir/tex/printing.w
@@ -464,8 +464,13 @@ void print_banner(const char *v, int e, int ver)
if (ver < 0)
fprintf(term_out, "This is LuaTeX, Version %s-%d ", v, e);
else
+#ifndef NATIVE_TEXLIVE_BUILD
fprintf(term_out, "This is LuaTeX, Version %s-%d (rev %d) ", v, e,
ver);
+#else /* for TL binaries, replace datestamp with web2c ident */
+ fprintf(term_out, "This is LuaTeX, Version %s%s (rev %d) ", v,
+ WEB2CVERSION, ver);
+#endif
if (format_ident > 0)
print(format_ident);
print_ln();
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 86c72ec9baa..a64d5dc0dd2 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-20 Karl Berry <karl@tug.org>
+
+ * mpost.w (Set up the banner line) [NATIVE_TEXLIVE_BUILD]:
+ use WEB2CVERSION instead of kpathsea_version_string for TL.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* mpost.w (main): Use kpse_program_basename().
diff --git a/Build/source/texk/web2c/mplibdir/mpost.w b/Build/source/texk/web2c/mplibdir/mpost.w
index a3f03409e12..fb4d1967ac1 100644
--- a/Build/source/texk/web2c/mplibdir/mpost.w
+++ b/Build/source/texk/web2c/mplibdir/mpost.w
@@ -1087,11 +1087,14 @@ static int setup_var (int def, const char *var_name, boolean nokpse) {
{
char * mpversion = mp_metapost_version () ;
const char * banner = "This is MetaPost, version ";
+#ifndef NATIVE_TEXLIVE_BUILD
const char * kpsebanner_start = " (";
const char * kpsebanner_stop = ")";
+#endif
mpost_xfree(options->banner);
options->banner = mpost_xmalloc(strlen(banner)+
strlen(mpversion)+
+#ifndef NATIVE_TEXLIVE_BUILD
strlen(kpsebanner_start)+
strlen(kpathsea_version_string)+
strlen(kpsebanner_stop)+1);
@@ -1100,6 +1103,12 @@ static int setup_var (int def, const char *var_name, boolean nokpse) {
strcat (options->banner, kpsebanner_start);
strcat (options->banner, kpathsea_version_string);
strcat (options->banner, kpsebanner_stop);
+#else /* NATIVE_TEXLIVE_BUILD */
+ strlen(WEB2CVERSION)+1);
+ strcpy (options->banner, banner);
+ strcat (options->banner, mpversion);
+ strcat (options->banner, WEB2CVERSION);
+#endif /* NATIVE_TEXLIVE_BUILD */
mpost_xfree(mpversion);
}