From 1874796fd70daa1bdb0a9166daf548852eb1414d Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 17 Aug 2001 13:01:32 +0000 Subject: [PATCH] Rename PACKAGE/SYSTEM-LOADER to LOAD-PACKAGE-SET. That will allow us to have an operation named UNLOAD-PACKAGE-SET. --- v7/src/6001/make.scm | 9 +++++---- v7/src/compiler/base/make.scm | 4 ++-- v7/src/cref/make.scm | 4 ++-- v7/src/edwin/make.scm | 32 +++++++++++++++----------------- v7/src/imail/load.scm | 4 ++-- v7/src/rcs/load.scm | 9 +++++---- v7/src/sf/make.scm | 4 ++-- v7/src/sos/load.scm | 9 +++++---- v7/src/win32/make.scm | 9 +++++---- 9 files changed, 43 insertions(+), 41 deletions(-) diff --git a/v7/src/6001/make.scm b/v7/src/6001/make.scm index b18b56550..ed98da4f1 100644 --- 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 d0c55e16d..949948914 100644 --- 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 2988e1b5e..1646ac323 100644 --- 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 1e7580b9f..c3eeb82f2 100644 --- 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 fe03a99d8..34edd811f 100644 --- 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 6ea8c2261..249a64c61 100644 --- 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 3c53cc3da..29ac8e762 100644 --- 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 e9b0dc005..7eb0091ba 100644 --- 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 6af14c44f..9241059fa 100644 --- 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!)) -- 2.25.1