changeset 2602:3d8cce0303fa

[xemacs-hg @ 2005-02-22 07:15:59 by stephent] xemacs-release-date <874qg56pbc.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Tue, 22 Feb 2005 07:16:16 +0000
parents 29846858dfc8
children 43ba9e13ee82
files ChangeLog configure.in lisp/ChangeLog lisp/about.el man/ChangeLog src/ChangeLog src/config.h.in src/emacs.c version.sh
diffstat 9 files changed, 85 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 21 22:51:17 2005 +0000
+++ b/ChangeLog	Tue Feb 22 07:16:16 2005 +0000
@@ -1,3 +1,9 @@
+2005-02-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* version.sh (XEMACS_RELEASE_DATE): New version info variable.
+
+	* configure.in (XEMACS_RELEASE_DATE): Use it.
+
 2005-02-18  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.19 "chives" is released.
--- a/configure.in	Mon Feb 21 22:51:17 2005 +0000
+++ b/configure.in	Tue Feb 22 07:16:16 2005 +0000
@@ -1006,6 +1006,9 @@
 if test "$xemacs_extra_name" != ""; then
   AC_DEFINE_UNQUOTED(XEMACS_EXTRA_NAME, "$xemacs_extra_name")
 fi
+if test "$xemacs_release_date" != ""; then
+  AC_DEFINE_UNQUOTED(XEMACS_RELEASE_DATE, "$xemacs_release_date")
+fi
 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
 
 if test "$with_infodock" = "yes"; then
--- a/lisp/ChangeLog	Mon Feb 21 22:51:17 2005 +0000
+++ b/lisp/ChangeLog	Tue Feb 22 07:16:16 2005 +0000
@@ -1,3 +1,8 @@
+2005-02-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* about.el (about-xemacs):
+	Compute release date from xemacs-release-date.
+
 2005-02-19  Norbert Koch  <viteno@xemacs.org>
 
 	* package-ui.el (pui-list-packages): The longest package name now
--- a/lisp/about.el	Mon Feb 21 22:51:17 2005 +0000
+++ b/lisp/about.el	Tue Feb 22 07:16:16 2005 +0000
@@ -378,8 +378,28 @@
 		  (t (format "%d.%d"
 			     emacs-major-version
 			     emacs-minor-version))))
-	   (emacs-about-version (format "version %s of September 2004"
-					emacs-short-version)))
+	   (emacs-release-date
+	    (if (and (boundp 'xemacs-release-date)
+		     (stringp xemacs-release-date)
+		     (string-match "^\\([0-9]\\{4\\}\\)-\\([0-9][0-9]\\)-"
+				   xemacs-release-date))
+		(format "%s %s"
+			(aref [ "January" "February" "March" "April"
+				"May" "June" "July" "August"
+				"September" "October" "November" "December" ]
+			      (1- (string-to-number
+				   (match-string 2 xemacs-release-date))))
+			(match-string 1 xemacs-release-date))
+	      "February 2005 (defaulted in about.el)"))
+	   (emacs-variant-info (if (and xemacs-extra-name
+					(stringp xemacs-extra-name)
+					(< 0 (length xemacs-extra-name)))
+				   (format " %s" xemacs-extra-name)
+				 ""))
+	   (emacs-about-version (format "version %s of %s%s"
+					emacs-short-version
+					emacs-release-date
+					emacs-variant-info)))
       (widget-insert (about-center emacs-about-version))
       (widget-create 'link :help-echo "What's new in XEmacs"
 		     :action 'about-news
--- a/man/ChangeLog	Mon Feb 21 22:51:17 2005 +0000
+++ b/man/ChangeLog	Tue Feb 22 07:16:16 2005 +0000
@@ -1,3 +1,15 @@
+2005-02-22  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* internals/internals.texi (The version.sh Script): New node.
+	(XEmacs from the Perspective of Building):
+	(Low-Level Modules):
+	(The Build Configuration System):
+	(Adding Configurable Features):
+	Add or update references to the version.sh node and/or file.
+
+	(XEmacs from the Perspective of Building): Improve text.
+
+
 2005-02-19  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* internals/internals.texi (Introduction to Writing C Code):
--- a/src/ChangeLog	Mon Feb 21 22:51:17 2005 +0000
+++ b/src/ChangeLog	Tue Feb 22 07:16:16 2005 +0000
@@ -1,3 +1,12 @@
+2005-02-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* emacs.c (xemacs-release-date): New version info variable.
+	* config.h.in (XEMACS_RELEASE_DATE): New config.h macro.
+
+	* emacs.c (inhibit-early-packages):
+	(inhibit-all-packages):
+	(xemacs-extra-name): Improve docstrings.
+
 2005-02-18  Jerry James  <james@xemacs.org>
 
 	* number.c: Define USED_IF_BIGFLOAT.
--- a/src/config.h.in	Mon Feb 21 22:51:17 2005 +0000
+++ b/src/config.h.in	Tue Feb 22 07:16:16 2005 +0000
@@ -110,6 +110,7 @@
 #undef EMACS_VERSION
 #undef XEMACS_CODENAME
 #undef XEMACS_EXTRA_NAME
+#undef XEMACS_RELEASE_DATE
 /* InfoDock versions, not used with XEmacs */
 #undef INFODOCK_MAJOR_VERSION
 #undef INFODOCK_MINOR_VERSION
--- a/src/emacs.c	Mon Feb 21 22:51:17 2005 +0000
+++ b/src/emacs.c	Tue Feb 22 07:16:16 2005 +0000
@@ -509,6 +509,7 @@
 Lisp_Object Vemacs_beta_version;
 Lisp_Object Vxemacs_codename;
 Lisp_Object Vxemacs_extra_name;
+Lisp_Object Vxemacs_release_date;
 #ifdef INFODOCK
 Lisp_Object Vinfodock_major_version;
 Lisp_Object Vinfodock_minor_version;
@@ -4146,15 +4147,31 @@
   Vxemacs_codename = build_string (XEMACS_CODENAME);
 
   DEFVAR_LISP ("xemacs-extra-name", &Vxemacs_extra_name /*
-Extra string to maybe put into the version string.
-
-Usually used to denote an XEmacs built from a CVS checkout between
-releases.  In that case its value would be \"(+CVS)\".
+Arbitrary string to place in the version string after the codename.
+
+Appropriate surrounding whitespace will be added, but typically looks best
+if enclosed in parentheses.
+
+A standard use is to indicate the date version.sh was last updated from
+the CVS mainline, where it is automatically given a value similar to
+\"(+CVS-20050221)\".  Developers may also use it to indicate particular
+branches, etc.
 */ );
 #ifdef XEMACS_EXTRA_NAME
   Vxemacs_extra_name = build_string (XEMACS_EXTRA_NAME);
 #endif
   
+  DEFVAR_LISP ("xemacs-release-date", &Vxemacs_release_date /*
+ISO 8601 format date string giving the date of latest release in series.
+
+The time may optionally be given.  The time zone may not be given, and
+is (implicitly) UTC.  Currently not included in the version string.
+*/ );
+#ifndef XEMACS_RELEASE_DATE
+#define XEMACS_RELEASE_DATE "2005-02-18 (defaulted in emacs.c)"
+#endif
+  Vxemacs_release_date = build_string (XEMACS_RELEASE_DATE);
+  
   /* Lisp variables which contain command line flags.
 
      The portable dumper stomps on these; they must be saved and restored
@@ -4169,12 +4186,14 @@
 */ );
 
   DEFVAR_BOOL ("inhibit-early-packages", &inhibit_early_packages /*
-Set to non-nil when the early packages should not be respected at startup.
+Set to non-nil when the early packages should be ignored at startup.
+Early package directories will not be added to `load-path', nor set up as
+autoloads, nothing.
 */ );
 
   DEFVAR_BOOL ("inhibit-all-packages", &inhibit_all_packages /*
-Set to non-nil when the no packages should not be respected at startup.
-XEmacs will utterly ignore the packages -- not in load-path, not set up as
+Set to non-nil when all packages should be ignored at startup.
+Package directories will not be added to `load-path', nor set up as
 autoloads, nothing.
 */ );
 
--- a/version.sh	Mon Feb 21 22:51:17 2005 +0000
+++ b/version.sh	Tue Feb 22 07:16:16 2005 +0000
@@ -9,3 +9,4 @@
 infodock_minor_version=0
 infodock_build_version=8
 xemacs_extra_name="(+CVS-20050221)"
+xemacs_release_date="2005-02-18"