diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 8 | ||||
| -rw-r--r-- | admin/FOR-RELEASE | 2 | ||||
| -rw-r--r-- | admin/admin.el | 47 | ||||
| -rw-r--r-- | admin/notes/copyright | 2 | ||||
| -rw-r--r-- | admin/nt/README-ftp-server | 90 | ||||
| -rwxr-xr-x | admin/nt/makedist.bat | 2 |
6 files changed, 129 insertions, 22 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index b036ea11c33..7349efb1720 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,7 +1,15 @@ +2007-06-07 Glenn Morris <rgm@gnu.org> + + * admin.el (set-copyright): New function. + 2007-04-25 Nick Roberts <nickrob@snap.net.nz> * make-tarball.txt: Add note about cutting the branch. +2007-06-02 Chong Yidong <cyd@stupidchicken.com> + + * Version 22.1 released. + 2007-02-03 Eli Zaretskii <eliz@gnu.org> * nt/makedist.bat: Change EOL format to DOS. Don't use diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index e64da81cc01..d8e273c0343 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -55,7 +55,7 @@ that should be installed on the release branch after 22.1 is released. ** Changes to six pbm icons in etc/images. Sync change from trunk 2007-05-19. -** viper and tramp should not load cl at run time. +** viper should not load cl at run time. ** yamaoka@jpl.org's patch for mail-extract-address-components problem. diff --git a/admin/admin.el b/admin/admin.el index 342b40f9bde..175eb6ded1b 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -24,6 +24,8 @@ ;; add-release-logs Add ``Version X released'' change log entries. ;; set-version Change Emacs version number in source tree. +;; set-copyright Change emacs short copyright string (eg as +;; printed by --version) in source tree. ;;; Code: @@ -158,5 +160,50 @@ Root must be the root of an Emacs source tree." (rx (and (submatch (1+ (in "a-z"))) (0+ space) ?\, (0+ space) "/* development, alpha, beta, or final (release) */")))))) +;; Note this makes some assumptions about form of short copyright. +(defun set-copyright (root copyright) + "Set Emacs short copyright to COPYRIGHT in relevant files under ROOT. +Root must be the root of an Emacs source tree." + (interactive (list + (read-directory-name "Emacs root directory: " nil nil t) + (read-string + "Short copyright string: " + (format "Copyright (C) %s Free Software Foundation, Inc." + (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 "lisp/version.el" copyright + (rx (and "emacs-copyright" (0+ space) + ?\" (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 "lib-src/rcs2log" copyright + (rx (and "Copyright" (0+ space) ?= (0+ space) + ?\' (submatch (1+ nonl))))) + (set-version-in-file + root "mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings" + copyright (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space) ?\" + (1+ anything) + (submatch "Copyright" (1+ (not (in ?\"))))))) + ;; This one is a nuisance, as it needs to be split over two lines. + (string-match "\\(.*[0-9]\\{4\\} *\\)\\(.*\\)" copyright) + (let ((csign "\\0xa9") + (cyear (match-string 1 copyright)) ; "Copyright (C) 2007 " + (owner (match-string 2 copyright))) ; "Free Software Foundation, Inc." + (set-version-in-file root "mac/src/Emacs.r" + (regexp-quote + (replace-regexp-in-string "(C)" + (regexp-quote csign) cyear)) + (rx (and + (submatch "Copyright" (0+ space) (eval csign) + (0+ space) (= 4 num) + (0+ (not (in ?\")))) ?\"))) + (set-version-in-file root "mac/src/Emacs.r" owner + (rx (and ?\" + (submatch (1+ (not (in ?\")))) + ?\" (0+ space) + "/* Long version number */"))))) + ;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5 ;; admin.el ends here. diff --git a/admin/notes/copyright b/admin/notes/copyright index 6c9a7382c33..91bf87f3b08 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright @@ -131,7 +131,7 @@ mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings mac/src/Emacs.r # resource 'vers' src/emacs.c - remember to change the latest copyright year in the --version output. - [Post-release, will automate this like set-version does for version.] + `set-copyright' in admin.el will do all the above. <top-level>/install-sh lispintro/install-sh diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 15cc7db9d90..92f2920ba6c 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -35,6 +35,72 @@ old binaries. +* Files in this directory + + + emacs-22.1-bin-i386.zip + Windows binaries of Emacs-22.1, with all lisp code and documentation + included. + + Download this file if you want a single installation package, and + are not interested in the C source code for Emacs. After + unpacking, you can optionally run the file bin/addpm.exe to have + Emacs add icons to the Start Menu. + + If you need the C source code at a later date, it will be safe to + unpack the source distribution on top of this installation. + + + emacs-22.1-barebin-i386.zip + Windows binaries of Emacs-22.1, without lisp code or documentation. + + Download this file if you already have the source distribution, or + if you need to redump the emacs.exe executable. + + Unpack this over the top of either the source distribution or the + bin distribution above. It contains the bin subdirectory and etc/DOC + file, plus temacs.exe and dump.bat, which are required if you want to + redump emacs without recompiling it. + + + emacs-21.3-bin-i386.tar.gz + Windows binaries of Emacs 21.3, with compiled lisp code and some + documentation included. + + This is provided for users who require the older version. + + + emacs-21.3-leim.tar.gz + Compiled lisp input methods. This optional addition to Emacs-21.3 + is required if you want to enter languages that are not directly + supported by your keyboard. + +* Image support + + Emacs 22.1 contains support for images, however for most image formats + supporting libraries are required. This distribution has been tested + with the libraries that are distributed with GTK for Windows, and the + libraries found at http://gnuwin32.sourceforge.net/. The following image + formats are supported: + + PBM/PGM/PPM: Supported natively by Emacs. This format is used for + the black and white versions of the toolbar icons. + + XPM: requires a Windows port of the XPM library 3.4 or later, + which will be named xpm4.dll, libxpm-nox4.dll or + libxpm.dll. This format is used for the color versions of the + toolbar icons, and other images in Emacs. + + PNG: requires the PNG reference library 1.2 or later, which will + be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll + or libpng.dll. LibPNG requires zlib, which should come from the same + source as you got libpng. + + JPEG: requires the Independant JPEG Group's libjpeg 6b or later, + which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. + + TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll + or libtiff.dll. + + GIF: requires libungif or giflib 4.1 or later, which will be + called giflib4.dll, libungif4.dll or libungif.dll. + * Distributions in .tar.gz and .zip format Emacs is distributed primarily as source code in a large gzipped tar file @@ -46,23 +112,6 @@ but since there are no longer legal problems with .zip files, and the latest versions of Windows support these natively, the Windows binaries of Emacs are now distributed as .zip files. - Here are the combinations (i386 in the name indicates a zipfile contains - executables compiled for Intel-compatible x86 systems): - - + Primary precompiled distribution, including lisp source: - - emacs-22.1-bin-i386.zip - - NB: If you just want to run Emacs, get the distribution above. - - + Bare executables, useful if you want to get the complete source - release, but can't compile Emacs yourself: - - emacs-22.1-barebin-i386.zip (requires ../emacs-22.1.tar.gz) - - + The complete official source for Emacs: - - ../emacs-22.1.tar.gz * Distributions for non-x86 platforms @@ -108,7 +157,7 @@ You may be prompted to rename or overwrite directories when using djtarnt: simply type return to continue (this is harmless). - The precompiled binaries can be unpacked using unzip.exe from info-zip.org + Zip files can be unpacked using unzip.exe from info-zip.org if you do not already have other tools to do this. % unzip some.zip @@ -170,7 +219,10 @@ http://www.gnu.org/software/emacs/windows/ntemacs.html This document serves as an FAQ and a source for further information - about the Windows port and related software packages. + about the Windows port and related software packages. Note that as + of writing, most of the information in that FAQ was for Emacs-21.3 + and earlier versions, so some information may not be relevant to + Emacs-22.1. In addition to the FAQ, there is a mailing list for discussing issues related to the Windows port of Emacs. For information about the diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat index 56fca7949fa..484ab88004c 100755 --- a/admin/nt/makedist.bat +++ b/admin/nt/makedist.bat @@ -36,7 +36,7 @@ rem Info-ZIP zip seems to be broken on Windows. rem It always writes to zip.zip and treats the zipfile argument as one
rem of the files to go in it.
rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS
-7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim
+7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp
del emacs-%1\README.W32
if not (%4) == () goto end
|