From 19b6b47d179f7b2c660db6143ffe15458f111ef5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 20 Sep 2013 23:47:28 +0000 Subject: mpost, luatex: consistently use TL version, not datestamps git-svn-id: svn://tug.org/texlive/trunk@31709 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/mplibdir/ChangeLog | 5 +++++ Build/source/texk/web2c/mplibdir/mpost.w | 9 +++++++++ 2 files changed, 14 insertions(+) (limited to 'Build/source/texk/web2c/mplibdir') 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 + + * mpost.w (Set up the banner line) [NATIVE_TEXLIVE_BUILD]: + use WEB2CVERSION instead of kpathsea_version_string for TL. + 2013-07-05 Peter Breitenlohner * 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); } -- cgit v1.2.3