Rename PACKAGE/SYSTEM-LOADER to LOAD-PACKAGE-SET. That will allow us

to have an operation named UNLOAD-PACKAGE-SET.

diff --git a/v7/src/6001/make.scm b/v7/src/6001/make.scm
index b18b5655097a6474628835657c45630fb700d59c..ed98da4f14cce811b67d576f7b5b8dac34212186 100644 (file)
--- a/v7/src/6001/make.scm
+++ b/v7/src/6001/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 15.30 1999/01/03 05:21:06 cph Exp $
+$Id: make.scm,v 15.31 2001/08/17 13:00:29 cph Exp $
 
-Copyright (c) 1991-1999 Massachusetts Institute of Technology
+Copyright (c) 1991-1999, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
 |#
 
 ;;;; 6.001: System Construction
@@ -30,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
      (working-directory-pathname)
      (pathname-as-directory "6001")
      (lambda ()
-       (package/system-loader "6001" '() 'QUERY)
+       (load-package-set "6001")
        (let ((edwin (->environment '(edwin))))
         (load "edextra" edwin)
         (if (and (eq? 'UNIX microcode-id/operating-system)

diff --git a/v7/src/compiler/base/make.scm b/v7/src/compiler/base/make.scm
index d0c55e16d67dd14989e6c07c51f06ae57ce802f9..949948914ca97752f8054e5e4974008fd28d9296 100644 (file)
--- a/v7/src/compiler/base/make.scm
+++ b/v7/src/compiler/base/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.111 2001/08/10 17:11:15 cph Exp $
+$Id: make.scm,v 4.112 2001/08/17 13:00:45 cph Exp $
 
 Copyright (c) 1988-1999, 2001 Massachusetts Institute of Technology
 
@@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
      (load-option 'COMPRESS)
      (load-option 'HASH-TABLE)
      (load-option 'RB-TREE)
-     (package/system-loader "compiler" '() 'QUERY)))
+     (load-package-set "compiler")))
   (let ((initialize-package!
         (lambda (package-name)
           ((environment-lookup (->environment package-name)

diff --git a/v7/src/cref/make.scm b/v7/src/cref/make.scm
index 2988e1b5e470c2df9406f6ba4e00cefb652c96b9..1646ac323b4cbe11197b16b30335aabd887dc6b4 100644 (file)
--- a/v7/src/cref/make.scm
+++ b/v7/src/cref/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.21 2001/08/15 02:59:50 cph Exp $
+$Id: make.scm,v 1.22 2001/08/17 13:00:53 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -33,5 +33,5 @@ USA.
      (pathname-as-directory "cref")
      (lambda ()
        (load-option 'RB-TREE)
-       (package/system-loader "cref" '() #f)))))
+       (load-package-set "cref")))))
 (add-identification! "CREF" 2 0)
\ No newline at end of file

diff --git a/v7/src/edwin/make.scm b/v7/src/edwin/make.scm
index 1e7580b9fd9c8c89342cd89f2be2a421cce40a27..c3eeb82f2598afc14df27fc879bbc723402c9680 100644 (file)
--- a/v7/src/edwin/make.scm
+++ b/v7/src/edwin/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 3.110 2001/08/15 03:07:53 cph Exp $
+$Id: make.scm,v 3.111 2001/08/17 13:00:59 cph Exp $
 
 Copyright (c) 1989-2001 Massachusetts Institute of Technology
 
@@ -33,20 +33,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
      (pathname-as-directory "edwin")
      (lambda ()
        (declare-shared-library "edwin" (lambda () #t))
-       (package/system-loader
-       "edwin"
-       (let ((package-name
-              (case microcode-id/operating-system
-                ((DOS) "edwindos")
-                ((NT) "edwinw32")
-                ((OS/2) "edwinos2")
-                ((UNIX) "edwinunx")
-                (else "edwinunk"))))
-         `((os-type . ,microcode-id/operating-system)
-           (rewrite-package-file-name
-            . ,(lambda (pathname)
-                 (pathname-new-name pathname package-name)))
-           (alternate-package-loader
-            . ,(load "edwin.bld" system-global-environment))))
-       'QUERY)))))
+       (load-package-set "edwin"
+        (let ((package-name
+               (case microcode-id/operating-system
+                 ((DOS) "edwindos")
+                 ((NT) "edwinw32")
+                 ((OS/2) "edwinos2")
+                 ((UNIX) "edwinunx")
+                 (else "edwinunk"))))
+          `((os-type . ,microcode-id/operating-system)
+            (rewrite-package-file-name
+             . ,(lambda (pathname)
+                  (pathname-new-name pathname package-name)))
+            (alternate-package-loader
+             . ,(load "edwin.bld" system-global-environment)))))))))
 (add-identification! "Edwin" 3 110)
\ No newline at end of file

diff --git a/v7/src/imail/load.scm b/v7/src/imail/load.scm
index fe03a99d859bd0d7db45c02457ab9e1c080c9c48..34edd811f3a69f42b43f4c32a9fdb422021d55b7 100644 (file)
--- a/v7/src/imail/load.scm
+++ b/v7/src/imail/load.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: load.scm,v 1.27 2001/05/07 18:03:54 cph Exp $
+;;; $Id: load.scm,v 1.28 2001/08/17 13:01:06 cph Exp $
 ;;;
 ;;; Copyright (c) 1999-2001 Massachusetts Institute of Technology
 ;;;
@@ -27,5 +27,5 @@
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
     (fluid-let ((*allow-package-redefinition?* #t))
-      (package/system-loader "imail" '() 'QUERY))))
+      (load-package-set "imail"))))
 (add-subsystem-identification! "IMAIL" '(1 11))
\ No newline at end of file

diff --git a/v7/src/rcs/load.scm b/v7/src/rcs/load.scm
index 6ea8c22613499b84329199a9348a087e5284b087..249a64c6185b1770bfe23d949be1a3eed37a2e87 100644 (file)
--- a/v7/src/rcs/load.scm
+++ b/v7/src/rcs/load.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.2 2000/08/20 04:10:57 cph Exp $
+$Id: load.scm,v 1.3 2001/08/17 13:01:13 cph Exp $
 
-Copyright (c) 2000 Massachusetts Institute of Technology
+Copyright (c) 2000, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,12 +16,13 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
 |#
 
 (load-option 'HASH-TABLE)
 (load-option 'REGULAR-EXPRESSION)
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
-    (package/system-loader "rcs" '() 'QUERY)))
+    (load-package-set "rcs")))
 (add-subsystem-identification! "RCS" '(2 2))
\ No newline at end of file

diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm
index 3c53cc3dad74cdce441a0dc365b4a4e92e75860c..29ac8e76219aac81efb5e486f986b5968c256c27 100644 (file)
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.37 2001/07/19 18:25:22 cph Exp $
+$Id: make.scm,v 4.38 2001/08/17 13:01:19 cph Exp $
 
 Copyright (c) 1988-2001 Massachusetts Institute of Technology
 
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
      (working-directory-pathname)
      (pathname-as-directory "sf")
      (lambda ()
-       (package/system-loader "sf" '() 'QUERY)))
+       (load-package-set "sf")))
     ((package/reference (find-package '(SCODE-OPTIMIZER))
                        'USUAL-INTEGRATIONS/CACHE!))))
 (add-subsystem-identification! "SF" '(4 37))
\ No newline at end of file

diff --git a/v7/src/sos/load.scm b/v7/src/sos/load.scm
index e9b0dc005975320935887d87f713fe91267f4197..7eb0091ba2f9efb65ddc040c64147058d27cdd04 100644 (file)
--- a/v7/src/sos/load.scm
+++ b/v7/src/sos/load.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: load.scm,v 1.6 1999/01/03 05:24:12 cph Exp $
+;;; $Id: load.scm,v 1.7 2001/08/17 13:01:25 cph Exp $
 ;;;
-;;; Copyright (c) 1995-1999 Massachusetts Institute of Technology
+;;; Copyright (c) 1995-1999, 2001 Massachusetts Institute of Technology
 ;;;
 ;;; This program is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
@@ -16,12 +16,13 @@
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program; if not, write to the Free Software
-;;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+;;; 02111-1307, USA.
 
 (load-option 'HASH-TABLE)
 (with-working-directory-pathname (directory-pathname (current-load-pathname))
   (lambda ()
-    (package/system-loader "sos" '() 'QUERY)))
+    (load-package-set "sos")))
 (let ((install
        (let ((environment (package/environment (find-package '(SOS MACROS)))))
         (lambda (mname tname)

diff --git a/v7/src/win32/make.scm b/v7/src/win32/make.scm
index 6af14c44f38b2d4db5e2b71640d7fb5d4910df60..9241059faefa288dd544451c33d7a7d82b093fec 100644 (file)
--- a/v7/src/win32/make.scm
+++ b/v7/src/win32/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.6 1999/01/02 06:19:10 cph Exp $
+$Id: make.scm,v 1.7 2001/08/17 13:01:32 cph Exp $
 
-Copyright (c) 1993-1999 Massachusetts Institute of Technology
+Copyright (c) 1993-1999, 2001 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+USA.
 |#
 
 ;;;; Win32 subsystem: System Construction
@@ -31,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
      (pathname-as-directory "win32")
      (lambda ()
        (load "ffimacro")
-       (package/system-loader "win32" '() 'QUERY)))))
+       (load-package-set "win32")))))
 
 ;((package/reference (find-package '(WIN32))
 ;                  'INITIALIZE-PACKAGE!))