annotate lisp/package-net.el @ 4677:8f1ee2d15784

Support full Common Lisp multiple values in C. lisp/ChangeLog 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * bytecomp.el : Update this file to support full C-level multiple values. This involves: -- Four new bytecodes, and special compiler functions to compile multiple-value-call, multiple-value-list-internal, values, values-list, and, since it now needs to pass back multiple values and is a special form, throw. -- There's a new compiler variable, byte-compile-checks-on-load, which is a list of forms that are evaluated at the very start of a file, with an error thrown if any of them give nil. -- The header is now inserted *after* compilation, giving a chance for the compilation process to influence what those checks are. There is still a check done before compilation for non-ASCII characters, to try to turn off dynamic docstrings if appopriate, in `byte-compile-maybe-reset-coding'. Space is reserved for checks; comments describing the version of the byte compiler generating the file are inserted if space remains for them. * bytecomp.el (byte-compile-version): Update this, we're a newer version of the byte compiler. * byte-optimize.el (byte-optimize-funcall): Correct a comment. * bytecomp.el (byte-compile-lapcode): Discard the arg with byte-multiple-value-call. * bytecomp.el (byte-compile-checks-and-comments-space): New variable, describe how many octets to reserve for checks at the start of byte-compiled files. * cl-compat.el: Remove the fake multiple-value implementation. Have the functions that use it use the real multiple-value implementation instead. * cl-macs.el (cl-block-wrapper, cl-block-throw): Revise the byte-compile properties of these symbols to work now we've made throw into a special form; keep the byte-compile properties as anonymous lambdas, since we don't have docstrings for them. * cl-macs.el (multiple-value-bind, multiple-value-setq) (multiple-value-list, nth-value): Update these functions to work with the C support for multiple values. * cl-macs.el (values): Modify the setf handler for this to call #'multiple-value-list-internal appropriately. * cl-macs.el (cl-setf-do-store): If the store form is a cons, treat it specially as wrapping the store value. * cl.el (cl-block-wrapper): Make this an alias of #'and, not #'identity, since it needs to pass back multiple values. * cl.el (multiple-value-apply): We no longer support this, mark it obsolete. * lisp-mode.el (eval-interactive-verbose): Remove a useless space in the docstring. * lisp-mode.el (eval-interactive): Update this function and its docstring. It now passes back a list, basically wrapping any eval calls with multiple-value-list. This allows multiple values to be printed by default in *scratch*. * lisp-mode.el (prin1-list-as-multiple-values): New function, printing a list as multiple values in the manner of Bruno Haible's clisp, separating each entry with " ;\n". * lisp-mode.el (eval-last-sexp): Call #'prin1-list-as-multiple-values on the return value of #'eval-interactive. * lisp-mode.el (eval-defun): Call #'prin1-list-as-multiple-values on the return value of #'eval-interactive. * mouse.el (mouse-eval-sexp): Deal with lists corresponding to multiple values from #'eval-interactive. Call #'cl-prettyprint, which is always available, instead of sometimes calling #'pprint and sometimes falling back to prin1. * obsolete.el (obsolete-throw): New function, called from eval.c when #'funcall encounters an attempt to call #'throw (now a special form) as a function. Only needed for compatibility with 21.4 byte-code. man/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * cl.texi (Organization): Remove references to the obsolete multiple-value emulating code. src/ChangeLog addition: 2009-08-11 Aidan Kehoe <kehoea@parhasard.net> * bytecode.c (enum Opcode /* Byte codes */): Add four new bytecodes, to deal with multiple values. (POP_WITH_MULTIPLE_VALUES): New macro. (POP): Modify this macro to ignore multiple values. (DISCARD_PRESERVING_MULTIPLE_VALUES): New macro. (DISCARD): Modify this macro to ignore multiple values. (TOP_WITH_MULTIPLE_VALUES): New macro. (TOP_ADDRESS): New macro. (TOP): Modify this macro to ignore multiple values. (TOP_LVALUE): New macro. (Bcall): Ignore multiple values where appropriate. (Breturn): Pass back multiple values. (Bdup): Preserve multiple values. Use TOP_LVALUE with most bytecodes that assign anything to anything. (Bbind_multiple_value_limits, Bmultiple_value_call, Bmultiple_value_list_internal, Bthrow): Implement the new bytecodes. (Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop, BRgotoifnonnilelsepop): Discard any multiple values. * callint.c (Fcall_interactively): Ignore multiple values when calling #'eval, in two places. * device-x.c (x_IO_error_handler): * macros.c (pop_kbd_macro_event): * eval.c (Fsignal): * eval.c (flagged_a_squirmer): Call throw_or_bomb_out, not Fthrow, now that the latter is a special form. * eval.c: Make Qthrow, Qobsolete_throw available as symbols. Provide multiple_value_current_limit, multiple-values-limit (the latter as specified by Common Lisp. * eval.c (For): Ignore multiple values when comparing with Qnil, but pass any multiple values back for the last arg. * eval.c (Fand): Ditto. * eval.c (Fif): Ignore multiple values when examining the result of the condition. * eval.c (Fcond): Ignore multiple values when comparing what the clauses give, but pass them back if a clause gave non-nil. * eval.c (Fprog2): Never pass back multiple values. * eval.c (FletX, Flet): Ignore multiple when evaluating what exactly symbols should be bound to. * eval.c (Fwhile): Ignore multiple values when evaluating the test. * eval.c (Fsetq, Fdefvar, Fdefconst): Ignore multiple values. * eval.c (Fthrow): Declare this as a special form; ignore multiple values for TAG, preserve them for VALUE. * eval.c (throw_or_bomb_out): Make this available to other files, now Fthrow is a special form. * eval.c (Feval): Ignore multiple values when calling a compiled function, a non-special-form subr, or a lambda expression. * eval.c (Ffuncall): If we attempt to call #'throw (now a special form) as a function, don't error, call #'obsolete-throw instead. * eval.c (make_multiple_value, multiple_value_aset) (multiple_value_aref, print_multiple_value, mark_multiple_value) (size_multiple_value): Implement the multiple_value type. Add a long comment describing our implementation. * eval.c (bind_multiple_value_limits): New function, used by the bytecode and by #'multiple-value-call, #'multiple-value-list-internal. * eval.c (multiple_value_call): New function, used by the bytecode and #'multiple-value-call. * eval.c (Fmultiple_value_call): New special form. * eval.c (multiple_value_list_internal): New function, used by the byte code and #'multiple-value-list-internal. * eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1): New special forms. * eval.c (Fvalues, Fvalues_list): New Lisp functions. * eval.c (values2): New function, for C code returning multiple values. * eval.c (syms_of_eval): Make our new Lisp functions and symbols available. * eval.c (multiple-values-limit): Make this available to Lisp. * event-msw.c (dde_eval_string): * event-stream.c (execute_help_form): * glade.c (connector): * glyphs-widget.c (glyph_instantiator_to_glyph): * glyphs.c (evaluate_xpm_color_symbols): * gui-x.c (wv_set_evalable_slot, button_item_to_widget_value): * gui.c (gui_item_value, gui_item_display_flush_left): * lread.c (check_if_suppressed): * menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1): * menubar-msw.c (populate_menu_add_item): * print.c (Fwith_output_to_temp_buffer): * symbols.c (Fsetq_default): Ignore multiple values when calling Feval. * symeval.h: Add the header declarations necessary for the multiple-values implementation. * inline.c: #include symeval.h, now that it has some inline functions. * lisp.h: Update Fthrow's declaration. Make throw_or_bomb_out available to all files. * lrecord.h (enum lrecord_type): Add the multiple_value type here.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 16 Aug 2009 20:55:49 +0100
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))))