From 78f83752f50a2aa9944e60a5aceac4015eb3ca58 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 16 Sep 2012 17:56:08 -0700 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ admin/ChangeLog | 5 +++++ admin/admin.el | 28 +++++------------------- configure.ac | 5 +++++ lib-src/ChangeLog | 5 +++++ lib-src/ebrowse.c | 3 +-- lib-src/etags.c | 3 +-- nextstep/ChangeLog | 5 +++++ nextstep/templates/Info-gnustep.plist.in | 2 +- nextstep/templates/Info.plist.in | 2 +- nextstep/templates/InfoPlist.strings.in | 2 +- nt/ChangeLog | 4 ++++ nt/config.nt | 3 +++ src/ChangeLog | 4 ++++ src/emacs.c | 2 +- 15 files changed, 48 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bdca0c914..5edcd767b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-09-17 Glenn Morris + + * configure.ac (copyright): New output variable. + (COPYRIGHT): New AC_DEFINE. + 2012-09-16 Paul Eggert Remove configure's --without-sync-input option (Bug#12450). diff --git a/admin/ChangeLog b/admin/ChangeLog index 8fe16b9e76..6d3118d8ba 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2012-09-17 Glenn Morris + + * 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 Remove configure's --without-sync-input option (Bug#12450). diff --git a/admin/admin.el b/admin/admin.el index b076bb67dd..4d68fca97b 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -140,34 +140,18 @@ Root must be the root of an Emacs source tree." (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 ?\"))) + (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) diff --git a/configure.ac b/configure.ac index 569b367371..d09d22bcbb 100644 --- a/configure.ac +++ b/configure.ac @@ -3978,6 +3978,11 @@ fi 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) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f584665770..3f1e287db3 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2012-09-17 Glenn Morris + + * ebrowse.c (version): + * etags.c (print_version): Use COPYRIGHT. + 2012-09-11 Paul Eggert * pop.c (socket_connection) [HAVE_GETADDRINFO]: diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index f8569fe374..056ed471fd 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3516,8 +3516,7 @@ usage (int error) 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); diff --git a/lib-src/etags.c b/lib-src/etags.c index e65082de53..ec415e9905 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -836,8 +836,7 @@ etags --help --lang=ada."); 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); diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index be73bc1f16..53f42c9771 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,8 @@ +2012-09-17 Glenn Morris + + * templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in: + * templates/Info.plist.in: Let configure set copyright. + 2012-09-16 Glenn Morris * Makefile.in: New file. diff --git a/nextstep/templates/Info-gnustep.plist.in b/nextstep/templates/Info-gnustep.plist.in index 6da5af489f..4ac97e5cde 100644 --- a/nextstep/templates/Info-gnustep.plist.in +++ b/nextstep/templates/Info-gnustep.plist.in @@ -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; diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in index df9708eae7..25c73916e5 100644 --- a/nextstep/templates/Info.plist.in +++ b/nextstep/templates/Info.plist.in @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs @version@ Copyright (C) 2012 Free Software Foundation, Inc. + Emacs @version@ @copyright@ CFBundleIconFile Emacs.icns CFBundleIdentifier diff --git a/nextstep/templates/InfoPlist.strings.in b/nextstep/templates/InfoPlist.strings.in index ce9779c7ac..f38d892501 100644 --- a/nextstep/templates/InfoPlist.strings.in +++ b/nextstep/templates/InfoPlist.strings.in @@ -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@"; diff --git a/nt/ChangeLog b/nt/ChangeLog index 197ce0cf85..f2a5281d1f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-09-17 Glenn Morris + + * config.nt (COPYRIGHT): New. + 2012-09-15 Paul Eggert Port _setjmp fix to POSIXish hosts as well as Microsoft. diff --git a/nt/config.nt b/nt/config.nt index 82b7da430a..96217a8c58 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -86,6 +86,9 @@ along with GNU Emacs. If not, see . */ 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. */ diff --git a/src/ChangeLog b/src/ChangeLog index f21395d963..3c0799d14b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-09-17 Glenn Morris + + * emacs.c: Use COPYRIGHT. + 2012-09-16 Paul Eggert Remove configure's --without-sync-input option (Bug#12450). diff --git a/src/emacs.c b/src/emacs.c index 233c0e68a1..d4b52ab64e 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -88,7 +88,7 @@ extern void moncontrol (int mode); #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; -- 2.20.1