procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce the number of versioned files storing the short copyright string

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2012-09-16 17:56:08 -07:00
parent 48093eb9bc
commit 78f83752f5
15 changed files with 48 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-17 Glenn Morris <rgm@gnu.org>
* configure.ac (copyright): New output variable.
(COPYRIGHT): New AC_DEFINE.
2012-09-16 Paul Eggert <eggert@cs.ucla.edu>
Remove configure's --without-sync-input option (Bug#12450).

5
admin/ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-17 Glenn Morris <rgm@gnu.org>
* 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 <eggert@cs.ucla.edu>
Remove configure's --without-sync-input option (Bug#12450).

28
admin/admin.el
View file

@ -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)

5
configure.ac
View file

@ -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)

5
lib-src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-17 Glenn Morris <rgm@gnu.org>
* ebrowse.c (version):
* etags.c (print_version): Use COPYRIGHT.
2012-09-11 Paul Eggert <eggert@cs.ucla.edu>
* pop.c (socket_connection) [HAVE_GETADDRINFO]:

3
lib-src/ebrowse.c
View file

@ -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);

3
lib-src/etags.c
View file

@ -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);

5
nextstep/ChangeLog
View file

@ -1,3 +1,8 @@
2012-09-17 Glenn Morris <rgm@gnu.org>
* templates/Info-gnustep.plist.in, templates/InfoPlist.strings.in:
* templates/Info.plist.in: Let configure set copyright.
2012-09-16 Glenn Morris <rgm@gnu.org>
* Makefile.in: New file.

2
nextstep/templates/Info-gnustep.plist.in
View file

@ -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;

2
nextstep/templates/Info.plist.in
View file

@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<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>

2
nextstep/templates/InfoPlist.strings.in
View file

@ -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@";

4
nt/ChangeLog
View file

@ -1,3 +1,7 @@
2012-09-17 Glenn Morris <rgm@gnu.org>
* config.nt (COPYRIGHT): New.
2012-09-15 Paul Eggert <eggert@cs.ucla.edu>
Port _setjmp fix to POSIXish hosts as well as Microsoft.

3
nt/config.nt
View file

@ -86,6 +86,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
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.
*/

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-09-17 Glenn Morris <rgm@gnu.org>
* emacs.c: Use COPYRIGHT.
2012-09-16 Paul Eggert <eggert@cs.ucla.edu>
Remove configure's --without-sync-input option (Bug#12450).

2
src/emacs.c
View file

@ -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;