* 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 4767cdb64fa646659eb6a2ccae4bc82ed8f0c6e4..0a5bfe0d97b6b739321723799bdfe460406339e3 100644 (file)
--- 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 b91706d8c2f7f1b7c86d6b9a3aa89edb92374a8e..b2803b007f92eeb32edfad2552646fa064668738 100644 (file)
--- 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 cd379b9141e4f6a2a62e8931ca5007156cbb633d..d7deb90ec7bc934a52b041983ce7d3c5310aec39 100644 (file)
--- 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 2cc5eccd161890510b7a2c15b4f523143603b903..72709815b8f0655347fe0274522df3f845be0273 100644 (file)
--- 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 7e5e469e8d874392b274a7a51c8295fddf251cea..37fe7c2fa773fcd676eef864b1b91615f8a8f291 100644 (file)
--- 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@";