annotate lisp/package-net.el @ 4885:6772ce4d982b

Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 24 Jan 2010 15:21:27 +0000
parents 44de306310b8
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 ;;; package-net.el --- Installation and Maintenance of XEmacs packages
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 ;; Copyright (C) 2000 Andy Piper.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 ;; Keywords: internal
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 ;; This file is part of XEmacs.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 ;; XEmacs is free software; you can redistribute it and/or modify it
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 ;; under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 ;; any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 ;; XEmacs is distributed in the hope that it will be useful, but
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 ;; General Public License for more details.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 ;; along with XEmacs; see the file COPYING. If not, write to the Free
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 ;; 02111-1307, USA.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 ;;; Synched up with: Not in FSF
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 ;;; Commentary:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 ;; Manipulate packages for the netinstall setup utility
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
30 ;; The process should be so:
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
31
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
32 ;; 1. The package maintainer or release manager makes a release
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
33 ;; announcement.
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
34 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
35 ;; 2. For a new package releases the netinstall maintainer simply
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
36 ;; needs to update `ftp://ftp.xemacs.org/pub/xemacs/setup.ini'. This is
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
37 ;; harder than it sounds because the file also includes information
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
38 ;; about the binary releases. At the moment going to the netinstall
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
39 ;; directory and typing:
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
40 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
41 ;; `make XEMACS=<current executable location> setup.ini'
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
42 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
43 ;; will do the right thing provided that:
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
44 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
45 ;; (a) `package-net-cygwin32-binary-size' and
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
46 ;; `package-net-win32-binary-size' are set correctly.
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
47 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
48 ;; (b) The binary pointed to by `XEMACS' has a current
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
49 ;; `package-index.LATEST.pgp' file. If you don't specify the XEMACS=
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
50 ;; part then you will get whatever is current for your build tree -
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
51 ;; which is probably not what you want.
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
52 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
53 ;; You can run `package-net-convert-index-to-ini' manually and specify
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
54 ;; REMOTE but I generally found that to be inconvenient and error-prone.
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
55 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
56 ;; 3. For package releases that's all you need to do. For binary
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
57 ;; releases you need to build both cygwin and win32 binaries and put
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
58 ;; them in appropriate tarballs: This can be achieved by running
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
59 ;; build-msw-release.sh
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
60 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
61
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 (require 'package-admin)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 (require 'package-get)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 ;; What path should we use from the myriad available?
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 ;; For netinstall we just want something simple, and anyway this is only to
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 ;; bootstrap the process. This will be:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 ;; <root>/setup/ for native windows
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 ;; <root>/lib/xemacs/setup for cygwin.
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
70 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
71 ;;; To Do:
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
72 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
73 ;; 1. Package update functions should also update the installed
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
74 ;; database so that running setup.exe again does not reinstall
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
75 ;; packages.
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
76 ;;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
77 ;; 2. Generating setup.ini should be more automatic.
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
78
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
79 (defvar package-net-cygwin32-binary-size 0
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
80 "The size in bytes of the cygwin32 binary distribution.")
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
81
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
82 (defvar package-net-win32-binary-size 0
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
83 "The size in bytes of the win32 binary distribution.")
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
84
707
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
85 (defvar package-net-kit-version ""
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
86 "XEmacs kitting revision, usually empty.")
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
87
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
88 (defvar package-net-setup-version "1.0"
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
89 "The version string of setup.")
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
90
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
91 ;;;###autoload
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 (defun package-net-setup-directory ()
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 "xemacs/setup/" "setup/"))))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
96 (defun package-net-generate-bin-ini (&optional version)
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
97 "Convert the package index to ini file format in the current directory."
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
98 (let ((buf (get-buffer-create "*setup-bin.ini*")))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
99 (unwind-protect
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
100 (save-excursion
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
101 (set-buffer buf)
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
102 (erase-buffer buf)
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
103 (goto-char (point-min))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
104 (insert "# This file is automatically generated. If you edit it, your\n")
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
105 (insert "# edits will be discarded next time the file is generated.\n")
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
106 (insert "#\n\n")
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
107 (insert (format "setup-timestamp: %d\n"
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
108 (+ (* (car (current-time)) 65536) (car (cdr (current-time))))))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
109 (insert (format "setup-version: %s\n\n" (or version "1.0")))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
110 ;; Native version
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
111 (insert (format "@ %s\n" "xemacs-i586-pc-win32"))
707
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
112 (insert (format "version: %s%s\n" emacs-program-version
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
113 package-net-kit-version))
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
114 (insert "type: native\n")
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
115 (insert (format "install: win32/%s %d\n\n"
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
116 (concat emacs-program-name
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
117 "-i586-pc-win32-"
707
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
118 emacs-program-version package-net-kit-version
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
119 ".tar.gz")
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
120 package-net-win32-binary-size))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
121 ;; Cygwin version
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
122 (insert (format "@ %s\n" "xemacs-i686-pc-cygwin"))
707
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
123 (insert (format "version: %s%s\n" emacs-program-version
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
124 package-net-kit-version))
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
125 (insert "type: cygwin\n")
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
126 (insert (format "install: cygwin32/%s %d\n\n"
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
127 (concat emacs-program-name
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
128 "-i686-pc-cygwin-"
707
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
129 emacs-program-version package-net-kit-version
a307f9a2021d [xemacs-hg @ 2001-12-20 05:49:28 by andyp]
andyp
parents: 673
diff changeset
130 ".tar.gz")
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
131 package-net-cygwin32-binary-size))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
132 (insert "# setup.ini file ends here\n")
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
133 (write-region (point-min) (point-max) "setup-bin.ini")))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
134 (kill-buffer buf)))
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
135
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
136 (defun package-net-batch-generate-bin-ini ()
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
137 "Convert the package index to ini file format."
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
138 (unless noninteractive
1410
44de306310b8 [xemacs-hg @ 2003-04-14 03:40:26 by youngs]
youngs
parents: 707
diff changeset
139 (error 'invalid-operation
44de306310b8 [xemacs-hg @ 2003-04-14 03:40:26 by youngs]
youngs
parents: 707
diff changeset
140 "`package-net-batch-generate-bin-ini' is to be used only with -batch"))
673
685b588e92d8 [xemacs-hg @ 2001-10-30 05:13:26 by andyp]
andyp
parents: 454
diff changeset
141 (package-net-generate-bin-ini package-net-setup-version))
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
142
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
143 ;;;###autoload
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
144 (defun package-net-update-installed-db (&optional destdir)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
145 "Write out the installed package index in a net install suitable format.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
146 If DESTDIR is non-nil then use that as the destination directory.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
147 DESTDIR defaults to the value of `package-net-setup-directory'."
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
148
454
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
149 (when (or (eq system-type 'cygwin32)
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
150 (eq system-type 'window-nt))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
151 (setq destdir (file-name-as-directory
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
152 (or destdir (package-net-setup-directory))))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
153 (let ((buf (get-buffer-create "*installed.db*")))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
154 (unwind-protect
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
155 (save-excursion
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
156 (set-buffer buf)
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
157 (erase-buffer buf)
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
158 (goto-char (point-min))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
159 ;; we use packages-package-list here as we actually want to
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
160 ;; update relative to the installed reality
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
161 (let ((entries packages-package-list) entry version)
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
162 (while entries
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
163 (setq entry (car entries))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
164 (setq version (plist-get (cdr entry) :version))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
165 ;; Unfortunately we can't read the size from this
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
166 (insert (format "%s %s-%3.2f-pkg.tar.gz 0\n" (symbol-name (car entry))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
167 (symbol-name (car entry))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
168 version))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
169 (setq entries (cdr entries))))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
170 (make-directory-path destdir)
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
171 (write-region (point-min) (point-max) (concat destdir "installed.db")))
d7a9135ec789 Import from CVS: tag r21-2-42
cvs
parents: 452
diff changeset
172 (kill-buffer buf)))))
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
173
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
174 (defun package-net-convert-download-sites-to-mirrors (&optional destdir)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
175 "Write out the download site list in a net install suitable format.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
176 If DESTDIR is non-nil then use that as the destination directory.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
177 DESTDIR defaults to the value of `data-directory'."
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
178
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
179 (setq destdir (file-name-as-directory (or destdir data-directory)))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
180 (let ((buf (get-buffer-create "*mirrors.lst*")))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
181 (unwind-protect
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
182 (save-excursion
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
183 (set-buffer buf)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
184 (erase-buffer buf)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
185 (goto-char (point-min))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
186 (let ((entries package-get-download-sites) entry)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
187 (while entries
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
188 (setq entry (car entries))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
189 (insert (format "ftp://%s/%s;%s;%s\n"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
190 (nth 1 entry) (substring (nth 2 entry) 0 -9)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
191 (nth 0 entry) (nth 0 entry)))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
192 (setq entries (cdr entries))))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
193 (write-region (point-min) (point-max) (concat destdir "mirrors.lst")))
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
194 (kill-buffer buf))))