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

diff --git a/lisp/package-net.el b/lisp/package-net.el
index d4071af..cef7ace 100644
--- a/lisp/package-net.el
+++ b/lisp/package-net.el
@@ -82,6 +82,9 @@
 (defvar package-net-win32-binary-size 0
   "The size in bytes of the win32 binary distribution.")
 
+(defvar package-net-kit-version ""
+  "XEmacs kitting revision, usually empty.")
+
 (defvar package-net-setup-version "1.0"
   "The version string of setup.")
 
@@ -90,67 +93,6 @@
   (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32)
 						     "xemacs/setup/" "setup/"))))
 
-(defun package-net-convert-index-to-ini (&optional destdir remote version)
-  "Convert the package index to ini file format in DESTDIR.
-DESTDIR defaults to the value of `data-directory'."
-  (package-get-require-base remote)
-
-  (setq destdir (file-name-as-directory (or destdir data-directory)))
-  (let ((buf (get-buffer-create "*setup.ini*")))
-    (unwind-protect
-        (save-excursion
-          (set-buffer buf)
-          (erase-buffer buf)
-          (goto-char (point-min))
-          (let ((entries package-get-base) entry plist)
-	    (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
-				    "-i386-pc-win32-"
-				    emacs-program-version ".tar.gz")
-			    package-net-win32-binary-size))
-	    ;; Cygwin version
-	    (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"
-			    (concat emacs-program-name
-				    "-i686-pc-cygwin32-"
-				    emacs-program-version ".tar.gz") 
-			    package-net-cygwin32-binary-size))
-	    ;; Standard packages
-	    (while entries
-	      (setq entry (car entries))
-	      (setq plist (car (cdr entry)))
-	      ;; ignore mule packages
-	      (unless (or (memq 'mule-base (plist-get plist 'requires))
-			  (eq 'mule-base (car entry)))
-		(insert (format "@ %s\n" (symbol-name (car entry))))
-		(insert (format "version: %s\n" (plist-get plist 'version)))
-		(insert (format "install: packages/%s %s\n" (plist-get plist 'filename)
-				(plist-get plist 'size)))
-	      ;; These are not supported as yet
-	      ;;
-	      ;; (insert (format "source: %s\n" (plist-get plist 'source)))
-	      ;; (insert "[prev]\n")
-	      ;; (insert (format "version: %s\n" (plist-get plist 'version)))
-	      ;; (insert (format "install: %s\n" (plist-get plist 'filename)))
-	      ;; (insert (format "source: %s\n" (plist-get plist 'source)))
-		(insert "\n"))
-	      (setq entries (cdr entries))))
-	  (insert "# setup.ini file ends here\n")
-	  (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*")))
@@ -167,21 +109,25 @@ DESTDIR defaults to the value of `data-directory'."
 	  (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 (format "version: %s%s\n" emacs-program-version 
+			  package-net-kit-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")
+				    emacs-program-version package-net-kit-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 (format "version: %s%s\n" emacs-program-version 
+			  package-net-kit-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") 
+				  emacs-program-version package-net-kit-version
+				  ".tar.gz") 
 			  package-net-cygwin32-binary-size))
 	  (insert "# setup.ini file ends here\n")
 	  (write-region (point-min) (point-max) "setup-bin.ini")))
@@ -190,7 +136,8 @@ DESTDIR defaults to the value of `data-directory'."
 (defun package-net-batch-generate-bin-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"))
+    (error 'invalid-operation
+	   "`package-net-batch-generate-bin-ini' is to be used only with -batch"))
   (package-net-generate-bin-ini package-net-setup-version))
 
 ;;;###autoload