From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 1 Oct 2005 12:51:42 +0000 (+0000)
Subject: (set-version): Set version numbers in nt/emacs.rc.
X-Git-Tag: emacs-pretest-22.0.90~6874
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95f76284557566be55a67d2f3bffbc4456606032;p=emacs.git

(set-version): Set version numbers in nt/emacs.rc.
---

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3f6f6aee58a..df7954d73bb 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-01  Jason Rumney  <jasonr@gnu.org>
+
+	* admin.el (set-version): Set version numbers in nt/emacs.rc.
+
 2005-08-31  Romain Francoise  <romain@orebokech.com>
 
 	* FOR-RELEASE: (New features): Remove vhdl-mode.el update
diff --git a/admin/admin.el b/admin/admin.el
index 3969345cc32..2f7f085b9d9 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -87,7 +87,36 @@ Root must be the root of an Emacs source tree."
 				(submatch (1+ (in "0-9."))))))
   (set-version-in-file root "lispref/elisp.texi" version
 		       (rx (and "EMACSVER" (1+ space)
-				(submatch (1+ (in "0-9.")))))))
+				(submatch (1+ (in "0-9."))))))
+  ;; nt/emacs.rc also contains the version number, but in an awkward
+  ;; format. It must contain four components, separated by commas, and
+  ;; in two places those commas are followed by space, in two other
+  ;; places they are not.
+  (let* ((version-components (append (split-string version "\\.")
+				    '("0" "0")))
+	 (comma-version
+	  (concat (car version-components) ","
+		  (cadr version-components) ","
+		  (cadr (cdr version-components)) "," 
+		  (cadr (cdr (cdr version-components)))))
+	 (comma-space-version
+	  (concat (car version-components) ", "
+		  (cadr version-components) ", "
+		  (cadr (cdr version-components)) ", " 
+		  (cadr (cdr (cdr version-components))))))
+    (set-version-in-file root "nt/emacs.rc" comma-version
+			 (rx (and "FILEVERSION" (1+ space)
+				  (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacs.rc" comma-version
+			 (rx (and "PRODUCTVERSION" (1+ space)
+				  (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacs.rc" comma-space-version
+			 (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space)
+				  ?\" (submatch (1+ (in "0-9, "))) "\\0\"")))
+    (set-version-in-file root "nt/emacs.rc" comma-space-version
+			 (rx (and "\"ProductVersion\"" (0+ space) ?,
+				  (0+ space) ?\" (submatch (1+ (in "0-9, ")))
+				  "\\0\"")))))
 
 ;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
 ;; admin.el ends here.