X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fpackage-net.el;h=015c9900621c7d97d4bc4c0586f2e01201231cb6;hb=e47437dbf7b5331e93c4a2c5de17a3544060d806;hp=d4071af156819282d4b39b1d028a3756263d638c;hpb=426fe636212336bb32a5e6f187c4d623709fa57d;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/package-net.el b/lisp/package-net.el
index d4071af..015c990 100644
--- a/lisp/package-net.el
+++ b/lisp/package-net.el
@@ -55,9 +55,32 @@
 ;;
 ;; 3. For package releases that's all you need to do. For binary
 ;; releases you need to build both cygwin and win32 binaries and put
-;; them in appropriate tarballs: This can be achieved by running
-;; build-msw-release.sh
+;; them in appropriate tarballs:
 ;;
+;; For cygwin, configure, make and install and then do (this is for
+;; 21.1.13):
+;;
+;;   cd <install dir>
+;;   tar cvzf xemacs-i686-pc-cygwin32-21.1.13.tar.gz \
+;;      ./bin/i686-pc-cygwin32 ./lib/xemacs-21.1.13 \
+;;      ./lib/xemacs/lock ./man/man1/xemacs.1 \
+;;      ./man/man1/ctags.1 ./man/man1/gnu*.1'
+;;
+;;  Note that the naming of the package is important. Don't be tempted
+;;  to change the order in any way.
+;;
+;; For win32 build and install the release and then (again for
+;; 21.1.13):
+;;
+;;   cd <install dir>
+;;   tar cvzf xemacs-i386-pc-win32-21.1.13.tar.gz ./XEmacs-21.1.13
+;; 
+;; The binaries should be uploaded to
+;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/cygwin32' and
+;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/win32' respectively. Take
+;; a note of their sizes and set `package-net-cygwin32-binary-size'
+;; and `package-net-win32-binary-size' appropriately in this file and
+;; then follow step 2.
 
 (require 'package-admin)
 (require 'package-get)
@@ -76,15 +99,12 @@
 ;;
 ;; 2. Generating setup.ini should be more automatic.
 
-(defvar package-net-cygwin32-binary-size 0
+(defvar package-net-cygwin32-binary-size 6917126
   "The size in bytes of the cygwin32 binary distribution.")
 
-(defvar package-net-win32-binary-size 0
+(defvar package-net-win32-binary-size 6563941
   "The size in bytes of the win32 binary distribution.")
 
-(defvar package-net-setup-version "1.0"
-  "The version string of setup.")
-
 ;;;###autoload
 (defun package-net-setup-directory ()
   (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32)
@@ -113,7 +133,7 @@ DESTDIR defaults to the value of `data-directory'."
 	    (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"
+	    (insert (format "install: binaries/win32/%s %d\n\n"
 			    (concat emacs-program-name
 				    "-i386-pc-win32-"
 				    emacs-program-version ".tar.gz")
@@ -122,7 +142,7 @@ DESTDIR defaults to the value of `data-directory'."
 	    (insert (format "@ %s\n" "xemacs-i686-pc-cygwin32"))
 	    (insert (format "version: %s\n" emacs-program-version))
 	    (insert "type: cygwin\n")
-	    (insert (format "install: cygwin32/%s %d\n\n"
+	    (insert (format "install: binaries/cygwin32/%s %d\n\n"
 			    (concat emacs-program-name
 				    "-i686-pc-cygwin32-"
 				    emacs-program-version ".tar.gz") 
@@ -151,47 +171,14 @@ DESTDIR defaults to the value of `data-directory'."
 	  (write-region (point-min) (point-max) (concat destdir "setup.ini")))
       (kill-buffer buf))))
 
-(defun package-net-generate-bin-ini (&optional version)
-  "Convert the package index to ini file format in the current 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-i586-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) "setup-bin.ini")))
-    (kill-buffer buf)))
-
-(defun package-net-batch-generate-bin-ini ()
+(defun package-net-batch-convert-index-to-ini ()
   "Convert the package index to ini file format."
   (unless noninteractive
-    (error "`package-net-batch-generate-bin-ini' is to be used only with -batch"))
-  (package-net-generate-bin-ini package-net-setup-version))
+    (error "`package-net-batch-convert-index-to-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)))
 
 ;;;###autoload
 (defun package-net-update-installed-db (&optional destdir)