[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110058: Reduce the number of version
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110058: Reduce the number of versioned files storing the short copyright string |
Date: |
Sun, 16 Sep 2012 17:56:08 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110058
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-16 17:56:08 -0700
message:
Reduce the number of versioned files storing the short copyright string
* configure.ac (copyright): New output variable.
(COPYRIGHT): New AC_DEFINE.
* admin/admin.el (set-copyright): No more need to set copyrights for
nextstep, or .c files. Add configure.ac and config.nt.
* lib-src/ebrowse.c (version):
* lib-src/etags.c (print_version): Use COPYRIGHT.
* nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/InfoPlist.strings.in:
* nextstep/templates/Info.plist.in: Let configure set copyright.
* nt/config.nt (COPYRIGHT): New.
* src/emacs.c: Use COPYRIGHT.
modified:
ChangeLog
admin/ChangeLog
admin/admin.el
configure.ac
lib-src/ChangeLog
lib-src/ebrowse.c
lib-src/etags.c
nextstep/ChangeLog
nextstep/templates/Info-gnustep.plist.in
nextstep/templates/Info.plist.in
nextstep/templates/InfoPlist.strings.in
nt/ChangeLog
nt/config.nt
src/ChangeLog
src/emacs.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-16 21:43:55 +0000
+++ b/ChangeLog 2012-09-17 00:56:08 +0000
@@ -1,3 +1,8 @@
+2012-09-17 Glenn Morris <address@hidden>
+
+ * configure.ac (copyright): New output variable.
+ (COPYRIGHT): New AC_DEFINE.
+
2012-09-16 Paul Eggert <address@hidden>
Remove configure's --without-sync-input option (Bug#12450).
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2012-09-16 21:43:55 +0000
+++ b/admin/ChangeLog 2012-09-17 00:56:08 +0000
@@ -1,3 +1,8 @@
+2012-09-17 Glenn Morris <address@hidden>
+
+ * admin.el (set-copyright): No more need to set copyrights for
+ nextstep, or .c files. Add configure.ac and config.nt.
+
2012-09-16 Paul Eggert <address@hidden>
Remove configure's --without-sync-input option (Bug#12450).
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2012-09-16 18:49:00 +0000
+++ b/admin/admin.el 2012-09-17 00:56:08 +0000
@@ -140,34 +140,18 @@
(format-time-string "%Y")))))
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
(error "%s doesn't seem to be the root of an Emacs source tree" root))
- (set-version-in-file root "src/emacs.c" copyright
- (rx (and "emacs_copyright" (0+ (not (in ?\")))
- ?\" (submatch (1+ (not (in ?\")))) ?\")))
- (set-version-in-file root "lib-src/ebrowse.c" copyright
- (rx (and "emacs_copyright" (0+ (not (in ?\")))
- ?\" (submatch (1+ (not (in ?\")))) ?\")))
- (set-version-in-file root "lib-src/etags.c" copyright
- (rx (and "emacs_copyright" (0+ (not (in ?\")))
- ?\" (submatch (1+ (not (in ?\")))) ?\")))
+ (set-version-in-file root "configure.ac" copyright
+ (rx (and bol "copyright" (0+ (not (in ?\")))
+ ?\" (submatch (1+ (not (in ?\")))) ?\")))
+ (set-version-in-file root "nt/config.nt" copyright
+ (rx (and bol "#" (0+ blank) "define" (1+ blank)
+ "COPYRIGHT" (1+ blank)
+ ?\" (submatch (1+ (not (in ?\")))) ?\")))
(set-version-in-file root "lib-src/rcs2log" copyright
(rx (and "Copyright" (0+ space) ?= (0+ space)
?\' (submatch (1+ nonl)))))
;; This one is a nuisance, as it needs to be split over two lines.
(string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright)
- ;; nextstep.
- (set-version-in-file
- root "nextstep/templates/Info.plist.in"
- copyright (rx (and "CFBundleGetInfoString" (1+ anything) "Emacs" (1+ space)
- (1+ (in "0-9.")) (1+ space)
- (submatch (1+ (not (in ?\<)))))))
- (set-version-in-file
- root "nextstep/templates/InfoPlist.strings.in"
- copyright (rx (and "NSHumanReadableCopyright" (0+ space) ?\= (0+ space)
- ?\" (submatch (1+ (not (in ?\")))))))
- (set-version-in-file
- root "nextstep/templates/Info-gnustep.plist.in"
- copyright (rx (and "Copyright" (0+ space) ?\= (0+ space)
- ?\" (submatch (1+ (not (in ?\")))))))
(when (string-match "\\([0-9]\\{4\\}\\)" copyright)
(setq copyright (match-string 1 copyright))
(dolist (file (directory-files (expand-file-name "etc/refcards" root)
=== modified file 'configure.ac'
--- a/configure.ac 2012-09-16 21:43:55 +0000
+++ b/configure.ac 2012-09-17 00:56:08 +0000
@@ -3978,6 +3978,11 @@
version=$PACKAGE_VERSION
+copyright="Copyright (C) 2012 Free Software Foundation, Inc."
+AC_DEFINE_UNQUOTED(COPYRIGHT, ["$copyright"],
+ [Short copyright string for this version of Emacs.])
+AC_SUBST(copyright)
+
### Specify what sort of things we'll be editing into Makefile and config.h.
### Use configuration here uncanonicalized to avoid exceeding size limits.
AC_SUBST(version)
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-09-11 22:59:50 +0000
+++ b/lib-src/ChangeLog 2012-09-17 00:56:08 +0000
@@ -1,3 +1,8 @@
+2012-09-17 Glenn Morris <address@hidden>
+
+ * ebrowse.c (version):
+ * etags.c (print_version): Use COPYRIGHT.
+
2012-09-11 Paul Eggert <address@hidden>
* pop.c (socket_connection) [HAVE_GETADDRINFO]:
=== modified file 'lib-src/ebrowse.c'
--- a/lib-src/ebrowse.c 2012-08-09 23:53:07 +0000
+++ b/lib-src/ebrowse.c 2012-09-17 00:56:08 +0000
@@ -3516,8 +3516,7 @@
static _Noreturn void
version (void)
{
- /* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
+ char emacs_copyright[] = COPYRIGHT;
printf ("ebrowse %s\n", VERSION);
puts (emacs_copyright);
=== modified file 'lib-src/etags.c'
--- a/lib-src/etags.c 2012-08-31 16:53:48 +0000
+++ b/lib-src/etags.c 2012-09-17 00:56:08 +0000
@@ -836,8 +836,7 @@
static void
print_version (void)
{
- /* Makes it easier to update automatically. */
- char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc.";
+ char emacs_copyright[] = COPYRIGHT;
printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
puts (emacs_copyright);
=== modified file 'nextstep/ChangeLog'
--- a/nextstep/ChangeLog 2012-09-16 18:49:00 +0000
+++ b/nextstep/ChangeLog 2012-09-17 00:56:08 +0000
@@ -1,3 +1,8 @@
+2012-09-17 Glenn Morris <address@hidden>
+
+ * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in:
+ * templates/Info.plist.in: Let configure set copyright.
+
2012-09-16 Glenn Morris <address@hidden>
* Makefile.in: New file.
=== modified file 'nextstep/templates/Info-gnustep.plist.in'
--- a/nextstep/templates/Info-gnustep.plist.in 2012-09-16 18:49:00 +0000
+++ b/nextstep/templates/Info-gnustep.plist.in 2012-09-17 00:56:08 +0000
@@ -11,7 +11,7 @@
"Carl Edman (NeXTstep)",
"..see etc/NEXTSTEP"
);
- Copyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
+ Copyright = "@copyright@";
CopyrightDescription = "Released under the GNU General Public License
Version 3 or later";
FullVersionID = "Emacs @version@, NS Windowing";
NSExecutable = Emacs;
=== modified file 'nextstep/templates/Info.plist.in'
--- a/nextstep/templates/Info.plist.in 2012-09-16 18:49:00 +0000
+++ b/nextstep/templates/Info.plist.in 2012-09-17 00:56:08 +0000
@@ -553,7 +553,7 @@
<key>CFBundleExecutable</key>
<string>Emacs</string>
<key>CFBundleGetInfoString</key>
- <string>Emacs @version@ Copyright (C) 2012 Free Software Foundation,
Inc.</string>
+ <string>Emacs @version@ @copyright@</string>
<key>CFBundleIconFile</key>
<string>Emacs.icns</string>
<key>CFBundleIdentifier</key>
=== modified file 'nextstep/templates/InfoPlist.strings.in'
--- a/nextstep/templates/InfoPlist.strings.in 2012-09-16 18:49:00 +0000
+++ b/nextstep/templates/InfoPlist.strings.in 2012-09-17 00:56:08 +0000
@@ -3,4 +3,4 @@
CFBundleName = "Emacs";
CFBundleShortVersionString = "Version @version@";
CFBundleGetInfoString = "Emacs version @version@, NS Windowing";
-NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
+NSHumanReadableCopyright = "@copyright@";
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-09-15 08:45:27 +0000
+++ b/nt/ChangeLog 2012-09-17 00:56:08 +0000
@@ -1,3 +1,7 @@
+2012-09-17 Glenn Morris <address@hidden>
+
+ * config.nt (COPYRIGHT): New.
+
2012-09-15 Paul Eggert <address@hidden>
Port _setjmp fix to POSIXish hosts as well as Microsoft.
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2012-09-15 08:45:27 +0000
+++ b/nt/config.nt 2012-09-17 00:56:08 +0000
@@ -86,6 +86,9 @@
his/her Emacs. */
#undef CLASH_DETECTION
+/* Short copyright string for this version of Emacs. */
+#define COPYRIGHT "Copyright (C) 2012 Free Software Foundation, Inc."
+
/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
systems. This function is required for 'alloca.c' support on those systems.
*/
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-16 21:43:55 +0000
+++ b/src/ChangeLog 2012-09-17 00:56:08 +0000
@@ -1,3 +1,7 @@
+2012-09-17 Glenn Morris <address@hidden>
+
+ * emacs.c: Use COPYRIGHT.
+
2012-09-16 Paul Eggert <address@hidden>
Remove configure's --without-sync-input option (Bug#12450).
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2012-09-16 21:43:55 +0000
+++ b/src/emacs.c 2012-09-17 00:56:08 +0000
@@ -88,7 +88,7 @@
#endif
static const char emacs_version[] = VERSION;
-static const char emacs_copyright[] = "Copyright (C) 2012 Free Software
Foundation, Inc.";
+static const char emacs_copyright[] = COPYRIGHT;
/* Empty lisp strings. To avoid having to build any others. */
Lisp_Object empty_unibyte_string, empty_multibyte_string;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110058: Reduce the number of versioned files storing the short copyright string,
Glenn Morris <=