Let's not do "Pre-Release" packages.

Having "Pre-Release" packages and "Official Release" packages was a good
idea back in the early part of 2003 when I added that to XEmacs.  There
was an incredible amount of activity happening in the packages in those
days and bugs were frequently slipping into the packages releases.  Today,
things are different.  The amount of activity in packages, and the number
of users/devs we have it should be easily possible to keep everything in
check without the need for a separate "testing" package hierarchy.

We can always reimplement something along the lines of pre-release
packages at a later date if things get out of hand.

	* lisp/menubar-items.el (default-menubar): Remove "Pre-Release"
	package menu.

	* lisp/package-ui.el (package-ui-pre-release-download-menu):
	Remove.

	* lisp/package-get.el (package-get-download-sites): Add our FTP,
	remove everyone else.
	(package-get-pre-release-download-sites): Remove.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/lisp/menubar-items.el b/lisp/menubar-items.el
index 9299c28..8650252 100644 (file)
--- a/lisp/menubar-items.el
+++ b/lisp/menubar-items.el
@@ -497,11 +497,6 @@ See also `menu-split-long-menu'."
                   (menu-split-long-menu
                    (submenu-generate-accelerator-spec
                     (package-ui-download-menu)))))
-       ("%_Pre-Releases"
-        :filter (lambda (&rest junk)
-                  (menu-split-long-menu
-                   (submenu-generate-accelerator-spec
-                    (package-ui-pre-release-download-menu)))))
        ("%_Site Releases"
         :filter (lambda (&rest junk)
                   (menu-split-long-menu

diff --git a/lisp/package-get.el b/lisp/package-get.el
index b4723e6..fc84f54 100644 (file)
--- a/lisp/package-get.el
+++ b/lisp/package-get.el
@@ -210,59 +210,14 @@ as a local directory."
 ;;;###autoload
 (defcustom package-get-download-sites
   `(,@(when package-get-have-curl
-       '(("SXEmacs XE pkg mirror"
-        "downloads.sxemacs.org" "xemacs-pkgs/packages" "http")))
-    ("US (Main XEmacs Site)"
-     "ftp.xemacs.org" "pub/xemacs/packages" "ftp")
-    ;; In alphabetical order of Country, our mirrors...
-    ;; Timing out
-    ("Belgium (be.xemacs.org)"
-     "ftp.be.xemacs.org" "xemacs/packages" "ftp")
-    ("Canada (ca.xemacs.org)"
-     "ftp.ca.xemacs.org" "pub/Mirror/xemacs/packages" "ftp")
-    ("Denmark (dk.xemacs.org)"
-     "ftp.dk.xemacs.org" "xemacs/packages" "ftp")
-    ("France (fr.xemacs.org)"
-     "ftp.fr.xemacs.org" "pub/xemacs/packages" "ftp")
-    ;; Temporary errors?
-    ("France (mirror.cict.fr)"
-     "mirror.cict.fr" "xemacs/packages" "ftp")
-    ("France (pasteur.fr)"
-     "ftp.pasteur.fr" "pub/computing/xemacs/packages" "ftp")
-    ;; Very outdated, experimental not updated since 2013
-    ("Germany (de.xemacs.org)"
-     "ftp.de.xemacs.org" "pub/ftp.xemacs.org/tux/xemacs/packages" "ftp")
-    ;; Timing out
-    ("Greece (gr.xemacs.org)"
-     "ftp.gr.xemacs.org" "mirrors/XEmacs/ftp/packages" "ftp")
-    ("Ireland (heanet.ie)"
-     "ftp.heanet.ie" "mirrors/ftp.xemacs.org/packages" "ftp")
-    ;; Timing out
-    ("Italy (it.xemacs.org)"
-     "ftp.it.xemacs.org" "unix/packages/XEMACS/packages" "ftp")
-    ;; Timing out
-    ("Japan (dti.ad.jp)"
-     "ftp.dti.ad.jp" "pub/unix/editor/xemacs/packages" "ftp")
-    ("Norway (no.xemacs.org)"
-     "ftp.no.xemacs.org" "pub/xemacs/packages" "ftp")
-    ("Portugal (pt.xemacs.org)"
-     "ftp.pt.xemacs.org" "pub/MIRRORS/ftp.xemacs.org/packages" "ftp")
-    ;; Timing out
-    ("Russia (ru.xemacs.org)"
-     "ftp.ru.xemacs.org" "pub/emacs/xemacs/packages" "ftp")
-    ("Saudi Arabia (sa.xemacs.org)"
-     "ftp.sa.xemacs.org" "pub/xemacs.org/packages" "ftp")
-    ("Sweden (se.xemacs.org)"
-     "ftp.se.xemacs.org" "pub/gnu/xemacs/packages" "ftp")
-    ("Switzerland (ch.xemacs.org)"
-     "ftp.ch.xemacs.org" "mirror/xemacs/packages" "ftp")
-    ("Taiwan (ftp.tw.xemacs.org)"
-     "ftp.tw.xemacs.org" "Unix/Editors/XEmacs/packages" "ftp")
-    ("UK (uk.xemacs.org)"
-     "ftp.uk.xemacs.org" "sites/ftp.xemacs.org/pub/xemacs/packages" "ftp")
-    ("US (ibiblio.org)"
-     "mirrors.ibiblio.org" "pub/mirrors/xemacs/packages" "ftp")
-    )
+       ;; HTTP Sites
+       '(("SXEmacs Main Site (HTTP)"
+          "downloads.sxemacs.org" "xemacs-pkgs/packages" "http")
+         ))
+      ;; FTP Sites
+      ("SXEmacs Main Site (FTP)"
+       "ftp.sxemacs.org" "pub/packages" "ftp")
+      )
   "*List of remote sites available for downloading packages.
 
 List format is '(site-description site-name directory-on-site url-scheme).
@@ -277,76 +232,6 @@ package download sites."
                       host-name directory url-scheme))
   :group 'package-get)
 
-;;;###autoload
-(defcustom package-get-pre-release-download-sites
-  `(,@(when package-get-have-curl
-       '(("SXEmacs XE pkg Pre-Releases" "downloads.sxemacs.org"
-         "xemacs-pkgs/beta/experimental/packages" "http")))
-    ("US Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org"
-     "pub/xemacs/beta/experimental/packages" "ftp")
-    ;; In alphabetical order of Country, our mirrors...
-    ;; Timing out
-    ("Belgium Pre-Releases (be.xemacs.org)" "ftp.be.xemacs.org"
-     "xemacs/beta/experimental/packages" "ftp")
-    ("Canada Pre-Releases (ca.xemacs.org)" "ftp.ca.xemacs.org"
-     "pub/Mirror/xemacs/beta/experimental/packages" "ftp")
-    ("Denmark Pre-Releases (dk.xemacs.org)" "ftp.dk.xemacs.org"
-     "xemacs/beta/experimental/packages" "ftp")
-    ("France Pre-Releases (fr.xemacs.org)" "ftp.fr.xemacs.org"
-     "pub/xemacs/beta/experimental/packages" "ftp")
-    ; Was a month out of date as of 2013-04-12, hopefully not a sign
-    ; it is no longer updating.
-    ("France Pre-Releases (mirror.cict.fr)" "mirror.cict.fr"
-     "xemacs/beta/experimental/packages" "ftp")
-    ("France Pre-Releases (pasteur.fr)" "ftp.pasteur.fr"
-     "pub/computing/xemacs/beta/experimental/packages" "ftp")
-    ;; Very outdated, experimental not updated since 2013
-    ("Germany Pre-Releases (de.xemacs.org)" "ftp.de.xemacs.org"
-     "pub/ftp.xemacs.org/tux/xemacs/beta/experimental/packages" "ftp")
-    ;; Timing out
-    ("Greece Pre-Releases (gr.xemacs.org)" "ftp.gr.xemacs.org"
-     "mirrors/XEmacs/ftp/beta/experimental/packages" "ftp")
-    ("Ireland Pre-Releases (heanet.ie)" "ftp.heanet.ie"
-     "mirrors/ftp.xemacs.org/beta/experimental/packages" "ftp")
-    ;; Timing out
-    ("Italy Pre-Releases (it.xemacs.org)" "ftp.it.xemacs.org"
-     "unix/packages/XEMACS/beta/experimental/packages" "ftp")
-    ; Was out of date as at 2013-04-12.  Hopefully not a sign they are
-    ; no longer updating.
-    ;; Timing out
-    ("Japan Pre-Releases (dti.ad.jp)" "ftp.dti.ad.jp"
-     "pub/unix/editor/xemacs/beta/experimental/packages" "ftp")
-    ("Norway Pre-Releases (no.xemacs.org)" "ftp.no.xemacs.org"
-     "pub/xemacs/beta/experimental/packages" "ftp")
-    ("Portugal Pre-Releases (pt.xemacs.org)" "ftp.pt.xemacs.org"
-     "pub/MIRRORS/ftp.xemacs.org/beta/experimental/packages" "ftp")
-    ("Saudi Arabia Pre-Releases (sa.xemacs.org)" "ftp.sa.xemacs.org"
-     "pub/xemacs.org/beta/experimental/packages" "ftp")
-    ("Sweden Pre-Releases (se.xemacs.org)" "ftp.se.xemacs.org"
-     "pub/gnu/xemacs/beta/experimental/packages" "ftp")
-    ("Switzerland Pre-Releases (ch.xemacs.org)" "ftp.ch.xemacs.org"
-     "mirror/xemacs/beta/experimental/packages" "ftp")
-    ("Taiwan Pre-Releases (ftp.tw.xemacs.org)" "ftp.tw.xemacs.org"
-     "Unix/Editors/XEmacs/beta/experimental/packages" "ftp")
-    ("UK Pre-Releases (uk.xemacs.org)" "ftp.uk.xemacs.org"
-     "sites/ftp.xemacs.org/pub/xemacs/beta/experimental/packages" "ftp")
-    ("US Pre-Releases (ibiblio.org)" "mirrors.ibiblio.org"
-     "pub/mirrors/xemacs/beta/experimental/packages" "ftp")
-    )
-  "*List of remote sites available for downloading \"Pre-Release\" packages.
-
-List format is '(site-description site-name directory-on-site url-scheme).
-SITE-DESCRIPTION is a textual description of the site.  SITE-NAME is
-the internet address of the download site.  DIRECTORY-ON-SITE is the
-directory on the site in which packages may be found.  URL-SCHEME is
-the protocol such as `http', `ftp', etc.  This variable is used to
-initialize `package-get-remote', the variable actually used to specify
-package download sites."
-  :tag "Pre-Release Package download sites"
-  :type '(repeat (list (string :tag "Name")
-                      host-name directory url-scheme))
-  :group 'package-get)
-
 ;;;###autoload
 (defcustom package-get-site-release-download-sites nil
   "*List of remote sites available for downloading \"Site Release\" packages.

diff --git a/lisp/package-ui.el b/lisp/package-ui.el
index b77e71b..403b208 100644 (file)
--- a/lisp/package-ui.el
+++ b/lisp/package-ui.el
@@ -164,21 +164,6 @@ Set this to `nil' to use the `default' face."
                    :selected `(equal package-get-remote (quote ,(cdr site)))))
          package-get-download-sites))
 
-;;;###autoload
-(defun package-ui-pre-release-download-menu ()
-  "Build the 'Pre-Release Download Sites' menu."
-  (mapcar (lambda (site)
-           (vector (car site)
-                   `(if (equal package-get-remote (quote ,(cdr site)))
-                     (setq package-get-remote nil)
-                     (package-ui-add-site (quote ,(cdr site))))
-                   ;; I've used radio buttons so that only a single
-                   ;; site can be selected, but they are in fact
-                   ;; toggles.  SY.
-                   :style 'radio
-                   :selected `(equal package-get-remote (quote ,(cdr site)))))
-         package-get-pre-release-download-sites))
-
 ;;;###autoload
 (defun package-ui-site-release-download-menu ()
   "Build the 'Site Release Download Sites' menu."