2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>

[bpt/emacs.git] / admin / admin.el

diff --git a/admin/admin.el b/admin/admin.el
index 26072ea..f4ebdc5 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -121,6 +121,20 @@ Root must be the root of an Emacs source tree."
                         (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\"")))
+    ;; Likewise for emacsclient.rc
+    (set-version-in-file root "nt/emacsclient.rc" comma-version
+                        (rx (and "FILEVERSION" (1+ space)
+                                 (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacsclient.rc" comma-version
+                        (rx (and "PRODUCTVERSION" (1+ space)
+                                 (submatch (1+ (in "0-9,"))))))
+    (set-version-in-file root "nt/emacsclient.rc" comma-space-version
+                        (rx (and "\"FileVersion\"" (0+ space) ?, (0+ space)
+                                 ?\" (submatch (1+ (in "0-9, "))) "\\0\"")))
+    (set-version-in-file root "nt/emacsclient.rc" comma-space-version
                         (rx (and "\"ProductVersion\"" (0+ space) ?,
                                  (0+ space) ?\" (submatch (1+ (in "0-9, ")))
                                  "\\0\""))))
@@ -131,8 +145,8 @@ Root must be the root of an Emacs source tree."
                     (submatch (1+ (in "0-9."))))))
   (set-version-in-file
    root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
-   version (rx (and "CFBundleShortVersionString" (1+ anything)
-                    "Version" (1+ space)
+   version (rx (and "CFBundleShortVersionString" (1+ not-newline) ?\n
+                    (0+ not-newline) "<string>" (0+ space)
                     (submatch (1+ (in "0-9."))))))
   (set-version-in-file
    root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
@@ -144,11 +158,18 @@ Root must be the root of an Emacs source tree."
    version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space)
                     ?\" (0+ space) "Emacs version" (1+ space)
                     (submatch (1+ (in "0-9."))))))
+  (set-version-in-file
+   root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
+   version (rx (and "ApplicationRelease" (0+ space) ?= (0+ space)
+                    ?\" (0+ space) (submatch (1+ (in "0-9."))))))
   (set-version-in-file
    root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
    version (rx (and "FullVersionID" (0+ space) ?= (0+ space)
                     ?\" (0+ space) "Emacs" (1+ space)
-                    (submatch (1+ (in "0-9.")))))))
+                    (submatch (1+ (in "0-9."))))))
+  (set-version-in-file
+   root "nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop"
+   version (rx (and "Version=" (submatch (1+ (in "0-9.")))))))
 
 ;; Note this makes some assumptions about form of short copyright.
 ;; FIXME add the \year in the refcards/*.tex files.