;;
;; 2. Generating setup.ini should be more automatic.
-(defvar package-net-cygwin32-binary-size 6917126
+(defvar package-net-cygwin32-binary-size 7559692
"The size in bytes of the cygwin32 binary distribution.")
-(defvar package-net-win32-binary-size 6563941
+(defvar package-net-win32-binary-size 7421788
"The size in bytes of the win32 binary distribution.")
;;;###autoload
(insert (format "@ %s\n" "xemacs-i386-pc-win32"))
(insert (format "version: %s\n" emacs-program-version))
(insert "type: native\n")
- (insert (format "install: binaries/win32/%s %d\n\n"
+ (insert (format "install: win32/%s %d\n\n"
(concat emacs-program-name
"-i386-pc-win32-"
emacs-program-version ".tar.gz")
(insert (format "@ %s\n" "xemacs-i686-pc-cygwin32"))
(insert (format "version: %s\n" emacs-program-version))
(insert "type: cygwin\n")
- (insert (format "install: binaries/cygwin32/%s %d\n\n"
+ (insert (format "install: cygwin32/%s %d\n\n"
(concat emacs-program-name
"-i686-pc-cygwin32-"
emacs-program-version ".tar.gz")
(write-region (point-min) (point-max) (concat destdir "setup.ini")))
(kill-buffer buf))))
-(defun package-net-batch-convert-index-to-ini ()
+(defun package-net-generate-bin-ini (&optional destdir version)
+ "Convert the package index to ini file format in DESTDIR.
+DESTDIR defaults to the value of `data-directory'."
+
+ (setq destdir (file-name-as-directory (or destdir data-directory)))
+ (let ((buf (get-buffer-create "*setup-bin.ini*")))
+ (unwind-protect
+ (save-excursion
+ (set-buffer buf)
+ (erase-buffer buf)
+ (goto-char (point-min))
+ (insert "# This file is automatically generated. If you edit it, your\n")
+ (insert "# edits will be discarded next time the file is generated.\n")
+ (insert "#\n\n")
+ (insert (format "setup-timestamp: %d\n"
+ (+ (* (car (current-time)) 65536) (car (cdr (current-time))))))
+ (insert (format "setup-version: %s\n\n" (or version "1.0")))
+ ;; Native version
+ (insert (format "@ %s\n" "xemacs-i386-pc-win32"))
+ (insert (format "version: %s\n" emacs-program-version))
+ (insert "type: native\n")
+ (insert (format "install: win32/%s %d\n\n"
+ (concat emacs-program-name
+ "-i586-pc-win32-"
+ emacs-program-version ".tar.gz")
+ package-net-win32-binary-size))
+ ;; Cygwin version
+ (insert (format "@ %s\n" "xemacs-i686-pc-cygwin"))
+ (insert (format "version: %s\n" emacs-program-version))
+ (insert "type: cygwin\n")
+ (insert (format "install: cygwin32/%s %d\n\n"
+ (concat emacs-program-name
+ "-i686-pc-cygwin-"
+ emacs-program-version ".tar.gz")
+ package-net-cygwin32-binary-size))
+ (insert "# setup.ini file ends here\n")
+ (write-region (point-min) (point-max) (concat destdir "setup-bin.ini")))
+ (kill-buffer buf))))
+
+(defun package-net-batch-generate-bin-ini ()
"Convert the package index to ini file format."
(unless noninteractive
- (error "`package-net-batch-convert-index-to-ini' is to be used only with -batch"))
+ (error "`package-net-batch-generate-bin-ini' is to be used only with -batch"))
(let ((dir (car command-line-args-left))
- (version (car (cdr command-line-args-left)))
- (package-get-require-signed-base-updates nil))
- (package-net-convert-index-to-ini dir nil version)))
+ (version (car (cdr command-line-args-left))))
+ (package-net-generate-bin-ini dir version)))
;;;###autoload
(defun package-net-update-installed-db (&optional destdir)
"Write out the installed package index in a net install suitable format.
If DESTDIR is non-nil then use that as the destination directory.
DESTDIR defaults to the value of `package-net-setup-directory'."
- ;; Need the local version
- (package-get-require-base)
- (setq destdir (file-name-as-directory
- (or destdir (package-net-setup-directory))))
- (let ((buf (get-buffer-create "*installed.db*")))
- (unwind-protect
- (save-excursion
- (set-buffer buf)
- (erase-buffer buf)
- (goto-char (point-min))
- (let ((entries package-get-base) entry plist)
- (while entries
- (setq entry (car entries))
- (setq plist (car (cdr entry)))
- (insert (format "%s %s %s\n" (symbol-name (car entry))
- (plist-get plist 'filename)
- (plist-get plist 'size)))
- (setq entries (cdr entries))))
- (make-directory-path destdir)
- (write-region (point-min) (point-max) (concat destdir "installed.db")))
- (kill-buffer buf))))
+ (when (or (eq system-type 'cygwin32)
+ (eq system-type 'window-nt))
+ (setq destdir (file-name-as-directory
+ (or destdir (package-net-setup-directory))))
+ (let ((buf (get-buffer-create "*installed.db*")))
+ (unwind-protect
+ (save-excursion
+ (set-buffer buf)
+ (erase-buffer buf)
+ (goto-char (point-min))
+ ;; we use packages-package-list here as we actually want to
+ ;; update relative to the installed reality
+ (let ((entries packages-package-list) entry version)
+ (while entries
+ (setq entry (car entries))
+ (setq version (plist-get (cdr entry) :version))
+ ;; Unfortunately we can't read the size from this
+ (insert (format "%s %s-%3.2f-pkg.tar.gz 0\n" (symbol-name (car entry))
+ (symbol-name (car entry))
+ version))
+ (setq entries (cdr entries))))
+ (make-directory-path destdir)
+ (write-region (point-min) (point-max) (concat destdir "installed.db")))
+ (kill-buffer buf)))))
(defun package-net-convert-download-sites-to-mirrors (&optional destdir)
"Write out the download site list in a net install suitable format.