Commits

youngs  committed 9038241

Sync with normal package tree.

  • Participants
  • Parent commits 964b854

Comments (0)

Files changed (2)

+2001-05-13  Adrian Aichner  <adrian@xemacs.org>
+
+	* build.el (build-from-CVS): Name buffer correctly.
+	* build.el (build-tarball-site): Update download sites from
+	XEmacs-21.4.2/etc/FTP.
+	* build.el (build-with-MS): Use version.sh of directory we build
+	in and customize build-report-version-file accordingly (without
+	saving in order to stay out of build-report's way).
+	* build.el (build-with-MS-make-commandline): Removed.
+
 2001-04-30  Adrian Aichner  <adrian@xemacs.org>
 
 	* build.el (build-version-number): Don't skip over first
   (interactive)
   (let
       ((name
-        (format "*Build XEmacs From Tarballs With %s*" build-with-what)))
+        (format "*Build XEmacs From CVS With %s*" build-with-what)))
     (kill-buffer (get-buffer-create name))
     (switch-to-buffer (get-buffer-create name))
     (kill-all-local-variables)
 (defcustom build-tarball-site
   "/ftp@ftp.xemacs.org:/pub/xemacs/"
   "The EFS path to a top-level XEmacs directory to fetch the XEmacs
-`build-tarball-set' from."
+  `build-tarball-set' from.  This list was last updated from
+  XEmacs-21.4.2/etc/FTP."
   :type '(choice
           :custom-state t
+          (const "/ftp@ftp.at.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.au.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.be.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.br.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.ca.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.ch.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.crc.ca:/pub/packages/editors/xemacs/")
+          (const "/ftp@ftp.de.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.dk.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.dti.ad.jp:/pub/unix/editor/xemacs/")
+          (const "/ftp@ftp.fi.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.fr.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.hu.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.ie.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.it.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.jaist.ac.jp:/pub/GNU/xemacs/")
+          (const "/ftp@ftp.jp.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.kr.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.no.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.pasteur.fr:/pub/computing/xemacs/")
+          (const "/ftp@ftp.pl.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.ru.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.sa.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.se.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.sk.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.tu-darmstadt.de:/pub/editors/xemacs/")
+          (const "/ftp@ftp.tw.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.twoguys.org:/pub/xemacs/")
+          (const "/ftp@ftp.uk.xemacs.org:/pub/xemacs/")
+          (const "/ftp@ftp.us.xemacs.org:/pub/xemacs/")
           (const "/ftp@ftp.xemacs.org:/pub/xemacs/")
-          (const "/ftp@ftp2.xemacs.org:/pub/xemacs/")
-          (const "/ftp@ftp.ai.mit.edu:/pub/xemacs/")
-          (const "/ftp@ftp.uu.net:/systems/gnu/xemacs/")
-          (const "/ftp@ftp.sunet.se:/pub/gnu/xemacs/")
-          (const "/ftp@ftp.cenatls.cena.dgac.fr:/pub/Emacs/xemacs/")
-          (const "/ftp@ftp.th-darmstadt.de:/pub/editors/xemacs/")
-          (const "/ftp@sunsite.doc.ic.ac.uk:/gnu/xemacs/")
-          (const "/ftp@ftp.ibp.fr:/pub/emacs/xemacs/")
-          (const "/ftp@uiarchive.cso.uiuc.edu:/pub/packages/xemacs/")
-          (const "/ftp@ftp.technion.ac.il:/pub/unsupported/gnu/xemacs/")
-          (const "/ftp@thphys.irb.hr:/pub/xemacs/")
-          (const "/ftp@sunsite.cnlab-switch.ch:/mirror/xemacs/")
-          (const "/ftp@ftp.unicamp.br:/pub/xemacs/")
-          (const "/ftp@ftp.usyd.edu.au:/pub/Xemacs/")
-          (const "/ftp@ftp.lab.kdd.co.jp:/xemacs/")
-          (const "/ftp@SunSITE.sut.ac.jp:/pub/archives/packages/xemacs/")
-          (const "/ftp@sunsite.icm.edu.pl:/pub/unix/xemacs/")
+          (const "/ftp@ftp.za.xemacs.org:/pub/xemacs/")
+          (const "/ftp@metalab.unc.edu:/pub/packages/editors/xemacs/")
+          (const "/ftp@mirror.aarnet.edu.au:/pub/xemacs/")
+          (const "/ftp@mirror.nucba.ac.jp:/mirror/xemacs/")
+          (const "/ftp@ring.aist.go.jp:/pub/text/xemacs/")
+          (const "/ftp@ring.asahi-net.or.jp:/pub/text/xemacs/")
+          (const "/ftp@sunsite.doc.ic.ac.uk:/packages/xemacs/")
+          (const "/ftp@sunsite.sut.ac.jp:/pub/archives/packages/xemacs/")
           (directory :tag "EFS Path" "/user@host.domain:/directory/"))
   :group 'build-tarball)
 
 ;;; APA: config.inc file was introduced by Ben Wing in 21.2-b32.
     (multiple-value-bind
         (major minor beta codename)
-        (build-report-version-file-data build-report-version-file)
+        (build-report-version-file-data
+         ;; Overwrite any customized setting for this build session so
+         ;; that build-report will find the right information.
+         (customize-set-variable
+          'build-report-version-file
+          (expand-file-name
+           "version.sh"
+           (expand-file-name
+            ".."
+            dir))))
       (when
           (and
            (>= (string-to-int major) 21)
     (widget-setup)
     (goto-char (point-min))))
 
-(defun build-with-MS-make-commandline ()
-  "Internal function building MS make commandline."
-  (concat
-   (mapconcat
-    'identity
-    (cons
-     build-with-MS-make-command
-     build-with-MS-make-options)
-    " ")
-;;; APA: config.inc file was introduced by Ben Wing in 21.2-b32.
-;;; use commandline options for older XEmacs version
-   (multiple-value-bind
-       (major minor beta codename)
-       (build-report-version-file-data build-report-version-file)
-     (when
-         (and
-          (>= (string-to-int major) 21)
-          (>= (string-to-int minor) 2)
-          (or (null beta)
-              (>= (string-to-int beta) 32))) ; >= 21.2 beta
-       (build-make-get-option-string)))))
-
 ;;}}}
 
 ;;{{{ Build Report