From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 16 Aug 2006 21:54:55 +0000 (+0000)
Subject: 	* configure.ac: add LYX_DATE variable for release date.
X-Git-Tag: 1.6.10~12795
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f8a5da9048a4b54c4237787a1c77dbcf6fda7612;p=features.git

	* configure.ac: add LYX_DATE variable for release date.

	* config/lyxinclude.m4: reset release date for development versions.

	* src/version.C.in: make lyx_release_date a placeholder.

	* src/lyx_main.C (parse_version):
	* src/frontends/controllers/ControlAboutlyx.C (getVersion): change a
	bit the display of LyX release date.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14712 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 4767cdb64f..0a5bfe0d97 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -11,6 +11,7 @@ echo "configuring LyX version" AC_PACKAGE_VERSION
 if echo AC_PACKAGE_VERSION | grep 'svn' >/dev/null ; then
   lyx_devel_version=yes
   AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
+  LYX_DATE="not released yet"
   echo "WARNING: This is a development version. Expect bugs."
 else
   lyx_devel_version=no
diff --git a/configure.ac b/configure.ac
index b91706d8c2..b2803b007f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,1.5.0svn,[lyx-devel@lists.lyx.org],[lyx])
+AC_SUBST(LYX_DATE, [Fri, Jul 13, 2006])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AC_CONFIG_HEADERS([src/config.h])
diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index cd379b9141..d7deb90ec7 100644
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -85,9 +85,9 @@ string const ControlAboutlyx::getVersion() const
 
 	ss << _("LyX Version ")
 	   << lyx_version
-	   << _(" of ")
+	   << " ("
 	   << lyx_release_date
-	   << "\n"
+	   << ")\n"
 	   << _("Library directory: ")
 	   << makeDisplayPath(package().system_support())
 	   << "\n"
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 2cc5eccd16..72709815b8 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -943,7 +943,7 @@ int parse_help(string const &, string const &)
 int parse_version(string const &, string const &)
 {
 	lyxerr << "LyX " << lyx_version
-	       << " of " << lyx_release_date << endl;
+	       << " (" << lyx_release_date << ")" << endl;
 	lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
 
 	lyxerr << lyx_version_info << endl;
diff --git a/src/version.C.in b/src/version.C.in
index 7e5e469e8d..37fe7c2fa7 100644
--- a/src/version.C.in
+++ b/src/version.C.in
@@ -15,7 +15,7 @@
 ///
 char const * lyx_version = "@PACKAGE_VERSION@";
 ///
-char const * lyx_release_date = "Thu, Jan 30, 2003";
+char const * lyx_release_date = "@LYX_DATE@";
 
 /// This is the version information shown by 'lyx -version'
 char const * lyx_version_info = "@VERSION_INFO@";