Mercurial > hg > xemacs-beta
annotate lisp/package-net.el @ 5882:bbe4146603db
Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp
lisp/ChangeLog addition:
2015-04-01 Aidan Kehoe <kehoea@parhasard.net>
When calling #'string-match with a REGEXP without regular
expression special characters, call #'search, #'mismatch, #'find,
etc. instead, making our code less likely to side-effect other
functions' match data and a little faster.
* apropos.el (apropos-command):
* apropos.el (apropos):
Call (position ?\n ...) rather than (string-match "\n" ...) here.
* buff-menu.el:
* buff-menu.el (buffers-menu-omit-invisible-buffers):
Don't fire up the regexp engine just to check if a string starts
with a space.
* buff-menu.el (select-buffers-tab-buffers-by-mode):
Don't fire up the regexp engine just to compare mode basenames.
* buff-menu.el (format-buffers-tab-line):
* buff-menu.el (build-buffers-tab-internal): Moved to being a
label within the following.
* buff-menu.el (buffers-tab-items): Use the label.
* bytecomp.el (byte-compile-log-1):
Don't fire up the regexp engine just to look for a newline.
* cus-edit.el (get):
Ditto.
* cus-edit.el (custom-variable-value-create):
Ditto, but for a colon.
* descr-text.el (describe-text-sexp):
Ditto.
* descr-text.el (describe-char-unicode-data):
Use #'split-string-by-char given that we're just looking for a
semicolon.
* descr-text.el (describe-char):
Don't fire up the regexp engine just to look for a newline.
* disass.el (disassemble-internal):
Ditto.
* files.el (file-name-sans-extension):
Implement this using #'position.
* files.el (file-name-extension):
Correct this function's docstring, implement it in terms of
#'position.
* files.el (insert-directory):
Don't fire up the regexp engine to split a string by space; don't
reverse the list of switches, this is actually a longstand bug as
far as I can see.
* gnuserv.el (gnuserv-process-filter):
Use #'position here, instead of consing inside #'split-string
needlessly.
* gtk-file-dialog.el (gtk-file-dialog-update-dropdown):
Use #'split-string-by-char here, don't fire up #'split-string for
directory-sep-char.
* gtk-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* hyper-apropos.el (hyper-apropos-grok-functions):
* hyper-apropos.el (hyper-apropos-grok-variables):
Look for a newline using #'position rather than #'string-match in
these functions.
* info.el (Info-insert-dir):
* info.el (Info-insert-file-contents):
* info.el (Info-follow-reference):
* info.el (Info-extract-menu-node-name):
* info.el (Info-menu):
Look for fixed strings using #'position or #'search as appropriate
in this file.
* ldap.el (ldap-decode-string):
* ldap.el (ldap-encode-string):
#'encode-coding-string, #'decode-coding-string are always
available, don't check if they're fboundp.
* ldap.el (ldap-decode-address):
* ldap.el (ldap-encode-address):
Use #'split-string-by-char in these functions.
* lisp-mnt.el (lm-creation-date):
* lisp-mnt.el (lm-last-modified-date):
Don't fire up the regexp engine just to look for spaces in this file.
* menubar-items.el (default-menubar):
Use (not (mismatch ...)) rather than #'string-match here, for
simple regexp.
Use (search "beta" ...) rather than (string-match "beta" ...)
* menubar-items.el (sort-buffers-menu-alphabetically):
* menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically):
* menubar-items.el (group-buffers-menu-by-mode-then-alphabetically):
Don't fire up the regexp engine to check if a string starts with
a space or an asterisk.
Use the more fine-grained results of #'compare-strings; compare
case-insensitively for the buffer menu.
* menubar-items.el (list-all-buffers):
* menubar-items.el (tutorials-menu-filter):
Use #'equal rather than #'string-equal, which, in this context,
has the drawback of not having a bytecode, and no redeeming
features.
* minibuf.el:
* minibuf.el (un-substitute-in-file-name):
Use #'count, rather than counting the occurences of $ using the
regexp engine.
* minibuf.el (read-file-name-internal-1):
Don't fire up the regexp engine to search for ?=.
* mouse.el (mouse-eval-sexp):
Check for newline with #'find.
* msw-font-menu.el (mswindows-reset-device-font-menus):
Split a string by newline with #'split-string-by-char.
* mule/japanese.el:
* mule/japanese.el ("Japanese"):
Use #'search rather than #'string-match; canoncase before
comparing; fix a bug I had introduced where I had been making case
insensitive comparisons where the case mattered.
* mule/korea-util.el (default-korean-keyboard):
Look for ?3 using #'find, not #'string-march.
* mule/korea-util.el (quail-hangul-switch-hanja):
Search for a fixed string using #'search.
* mule/mule-cmds.el (set-locale-for-language-environment):
#'position, #'substitute rather than #'string-match,
#'replace-in-string.
* newcomment.el (comment-make-extra-lines):
Use #'search rather than #'string-match for a simple string.
* package-get.el (package-get-remote-filename):
Use #'position when looking for ?@
* process.el (setenv):
* process.el (read-envvar-name):
Use #'position when looking for ?=.
* replace.el (map-query-replace-regexp):
Use #'split-string-by-char instead of using an inline
implementation of it.
* select.el (select-convert-from-cf-text):
* select.el (select-convert-from-cf-unicodetext):
Use #'position rather than #'string-match in these functions.
* setup-paths.el (paths-emacs-data-root-p):
Use #'search when looking for simple string.
* sound.el (load-sound-file):
Use #'split-string-by-char rather than an inline reimplementation
of same.
* startup.el (splash-screen-window-body):
* startup.el (splash-screen-tty-body):
Search for simple strings using #'search.
* version.el (emacs-version):
Ditto.
* x-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* x-font-menu.el (x-reset-device-font-menus-core):
Use #'split-string-by-char here.
* x-init.el (x-initialize-keyboard):
Search for a simple string using #'search.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 01 Apr 2015 14:28:20 +0100 |
parents | 308d34e9f07d |
children |
rev | line source |
---|---|
448 | 1 ;;; package-net.el --- Installation and Maintenance of XEmacs packages |
2 | |
3 ;; Copyright (C) 2000 Andy Piper. | |
4 | |
5 ;; Keywords: internal | |
6 | |
7 ;; This file is part of XEmacs. | |
8 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
9 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
10 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
11 ;; Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
12 ;; option) any later version. |
448 | 13 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
14 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
15 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
16 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
17 ;; for more details. |
448 | 18 |
19 ;; You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
1410
diff
changeset
|
20 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
448 | 21 |
22 ;;; Synched up with: Not in FSF | |
23 | |
24 ;;; Commentary: | |
25 | |
26 ;; Manipulate packages for the netinstall setup utility | |
27 | |
452 | 28 ;; The process should be so: |
29 | |
30 ;; 1. The package maintainer or release manager makes a release | |
31 ;; announcement. | |
32 ;; | |
33 ;; 2. For a new package releases the netinstall maintainer simply | |
34 ;; needs to update `ftp://ftp.xemacs.org/pub/xemacs/setup.ini'. This is | |
35 ;; harder than it sounds because the file also includes information | |
36 ;; about the binary releases. At the moment going to the netinstall | |
37 ;; directory and typing: | |
38 ;; | |
39 ;; `make XEMACS=<current executable location> setup.ini' | |
40 ;; | |
41 ;; will do the right thing provided that: | |
42 ;; | |
43 ;; (a) `package-net-cygwin32-binary-size' and | |
44 ;; `package-net-win32-binary-size' are set correctly. | |
45 ;; | |
46 ;; (b) The binary pointed to by `XEMACS' has a current | |
47 ;; `package-index.LATEST.pgp' file. If you don't specify the XEMACS= | |
48 ;; part then you will get whatever is current for your build tree - | |
49 ;; which is probably not what you want. | |
50 ;; | |
51 ;; You can run `package-net-convert-index-to-ini' manually and specify | |
52 ;; REMOTE but I generally found that to be inconvenient and error-prone. | |
53 ;; | |
54 ;; 3. For package releases that's all you need to do. For binary | |
55 ;; releases you need to build both cygwin and win32 binaries and put | |
673 | 56 ;; them in appropriate tarballs: This can be achieved by running |
57 ;; build-msw-release.sh | |
452 | 58 ;; |
59 | |
448 | 60 (require 'package-admin) |
61 (require 'package-get) | |
62 | |
63 ;; What path should we use from the myriad available? | |
64 ;; For netinstall we just want something simple, and anyway this is only to | |
65 ;; bootstrap the process. This will be: | |
66 ;; <root>/setup/ for native windows | |
67 ;; <root>/lib/xemacs/setup for cygwin. | |
452 | 68 ;; |
69 ;;; To Do: | |
70 ;; | |
71 ;; 1. Package update functions should also update the installed | |
72 ;; database so that running setup.exe again does not reinstall | |
73 ;; packages. | |
74 ;; | |
75 ;; 2. Generating setup.ini should be more automatic. | |
76 | |
673 | 77 (defvar package-net-cygwin32-binary-size 0 |
452 | 78 "The size in bytes of the cygwin32 binary distribution.") |
79 | |
673 | 80 (defvar package-net-win32-binary-size 0 |
452 | 81 "The size in bytes of the win32 binary distribution.") |
82 | |
707 | 83 (defvar package-net-kit-version "" |
84 "XEmacs kitting revision, usually empty.") | |
85 | |
673 | 86 (defvar package-net-setup-version "1.0" |
87 "The version string of setup.") | |
88 | |
452 | 89 ;;;###autoload |
448 | 90 (defun package-net-setup-directory () |
91 (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32) | |
92 "xemacs/setup/" "setup/")))) | |
93 | |
673 | 94 (defun package-net-generate-bin-ini (&optional version) |
95 "Convert the package index to ini file format in the current directory." | |
96 (let ((buf (get-buffer-create "*setup-bin.ini*"))) | |
97 (unwind-protect | |
98 (save-excursion | |
99 (set-buffer buf) | |
100 (erase-buffer buf) | |
101 (goto-char (point-min)) | |
102 (insert "# This file is automatically generated. If you edit it, your\n") | |
103 (insert "# edits will be discarded next time the file is generated.\n") | |
104 (insert "#\n\n") | |
105 (insert (format "setup-timestamp: %d\n" | |
106 (+ (* (car (current-time)) 65536) (car (cdr (current-time)))))) | |
107 (insert (format "setup-version: %s\n\n" (or version "1.0"))) | |
108 ;; Native version | |
109 (insert (format "@ %s\n" "xemacs-i586-pc-win32")) | |
707 | 110 (insert (format "version: %s%s\n" emacs-program-version |
111 package-net-kit-version)) | |
673 | 112 (insert "type: native\n") |
113 (insert (format "install: win32/%s %d\n\n" | |
114 (concat emacs-program-name | |
115 "-i586-pc-win32-" | |
707 | 116 emacs-program-version package-net-kit-version |
117 ".tar.gz") | |
673 | 118 package-net-win32-binary-size)) |
119 ;; Cygwin version | |
120 (insert (format "@ %s\n" "xemacs-i686-pc-cygwin")) | |
707 | 121 (insert (format "version: %s%s\n" emacs-program-version |
122 package-net-kit-version)) | |
673 | 123 (insert "type: cygwin\n") |
124 (insert (format "install: cygwin32/%s %d\n\n" | |
125 (concat emacs-program-name | |
126 "-i686-pc-cygwin-" | |
707 | 127 emacs-program-version package-net-kit-version |
128 ".tar.gz") | |
673 | 129 package-net-cygwin32-binary-size)) |
130 (insert "# setup.ini file ends here\n") | |
131 (write-region (point-min) (point-max) "setup-bin.ini"))) | |
132 (kill-buffer buf))) | |
133 | |
134 (defun package-net-batch-generate-bin-ini () | |
452 | 135 "Convert the package index to ini file format." |
136 (unless noninteractive | |
1410 | 137 (error 'invalid-operation |
138 "`package-net-batch-generate-bin-ini' is to be used only with -batch")) | |
673 | 139 (package-net-generate-bin-ini package-net-setup-version)) |
452 | 140 |
141 ;;;###autoload | |
448 | 142 (defun package-net-update-installed-db (&optional destdir) |
143 "Write out the installed package index in a net install suitable format. | |
144 If DESTDIR is non-nil then use that as the destination directory. | |
145 DESTDIR defaults to the value of `package-net-setup-directory'." | |
146 | |
454 | 147 (when (or (eq system-type 'cygwin32) |
148 (eq system-type 'window-nt)) | |
149 (setq destdir (file-name-as-directory | |
150 (or destdir (package-net-setup-directory)))) | |
151 (let ((buf (get-buffer-create "*installed.db*"))) | |
152 (unwind-protect | |
153 (save-excursion | |
154 (set-buffer buf) | |
155 (erase-buffer buf) | |
156 (goto-char (point-min)) | |
157 ;; we use packages-package-list here as we actually want to | |
158 ;; update relative to the installed reality | |
159 (let ((entries packages-package-list) entry version) | |
160 (while entries | |
161 (setq entry (car entries)) | |
162 (setq version (plist-get (cdr entry) :version)) | |
163 ;; Unfortunately we can't read the size from this | |
164 (insert (format "%s %s-%3.2f-pkg.tar.gz 0\n" (symbol-name (car entry)) | |
165 (symbol-name (car entry)) | |
166 version)) | |
167 (setq entries (cdr entries)))) | |
168 (make-directory-path destdir) | |
169 (write-region (point-min) (point-max) (concat destdir "installed.db"))) | |
170 (kill-buffer buf))))) | |
448 | 171 |
172 (defun package-net-convert-download-sites-to-mirrors (&optional destdir) | |
173 "Write out the download site list in a net install suitable format. | |
174 If DESTDIR is non-nil then use that as the destination directory. | |
175 DESTDIR defaults to the value of `data-directory'." | |
176 | |
177 (setq destdir (file-name-as-directory (or destdir data-directory))) | |
178 (let ((buf (get-buffer-create "*mirrors.lst*"))) | |
179 (unwind-protect | |
180 (save-excursion | |
181 (set-buffer buf) | |
182 (erase-buffer buf) | |
183 (goto-char (point-min)) | |
184 (let ((entries package-get-download-sites) entry) | |
185 (while entries | |
186 (setq entry (car entries)) | |
187 (insert (format "ftp://%s/%s;%s;%s\n" | |
188 (nth 1 entry) (substring (nth 2 entry) 0 -9) | |
189 (nth 0 entry) (nth 0 entry))) | |
190 (setq entries (cdr entries)))) | |
191 (write-region (point-min) (point-max) (concat destdir "mirrors.lst"))) | |
192 (kill-buffer buf)))) |