Use WITH-LOADER-BASE-URI in all the subsystem loaders.

diff --git a/v7/src/6001/make.scm b/v7/src/6001/make.scm
index ee989296507592068bf5def962b82451e29b1e8d..78624f45d1e897fa724846232894a9500b89a386 100644 (file)
--- a/v7/src/6001/make.scm
+++ b/v7/src/6001/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 15.40 2007/01/05 21:19:20 cph Exp $
+$Id: make.scm,v 15.41 2007/06/06 20:03:24 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -29,17 +29,12 @@ USA.
 
 (declare (usual-integrations))
 
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "6001/")
   (lambda ()
-    ((access with-directory-rewriting-rule
-            (->environment '(RUNTIME COMPILER-INFO)))
-     (working-directory-pathname)
-     (pathname-as-directory "6001")
-     (lambda ()
-       (load-package-set "6001")
-       (if (and (eq? 'UNIX microcode-id/operating-system)
-               (string-ci=? "HP-UX" microcode-id/operating-system-variant))
-          (load "floppy" (->environment '(EDWIN))))))))
+    (load-package-set "6001")
+    (if (and (eq? 'UNIX microcode-id/operating-system)
+            (string-ci=? "HP-UX" microcode-id/operating-system-variant))
+       (load "floppy" (->environment '(EDWIN))))))
 (add-subsystem-identification! "6.001" '(15 31))
 
 ;;; Customize the runtime system:

diff --git a/v7/src/compiler/base/make.scm b/v7/src/compiler/base/make.scm
index d89aaa8d70427476a000271f1c6451ca6593659f..8669e03ccbe25b2a2250a02873481aef1baaad4e 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.127 2007/01/05 21:19:20 cph Exp $
+$Id: make.scm,v 4.128 2007/06/06 20:03:24 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -33,10 +33,7 @@ USA.
   architecture-name
   (load-option 'COMPRESS)
   (load-option 'RB-TREE)
-  ((access with-directory-rewriting-rule
-          (->environment '(RUNTIME COMPILER-INFO)))
-   (working-directory-pathname)
-   (pathname-as-directory "compiler")
+  (with-loader-base-uri (system-library-uri "compiler/")
    (lambda ()
      (load-package-set "compiler")))
-  (add-subsystem-identification! "LIAR" '(4 118)))
+  (add-subsystem-identification! "LIAR" '(4 118)))
\ No newline at end of file

diff --git a/v7/src/cref/make.scm b/v7/src/cref/make.scm
index ac81d669e497bf43cb1e82b9962a00e927278a6c..3c1092b2b2dcc40ad930a4a375ee05d22883ffb2 100644 (file)
--- a/v7/src/cref/make.scm
+++ b/v7/src/cref/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.32 2007/06/06 19:42:38 cph Exp $
+$Id: make.scm,v 1.33 2007/06/06 20:03:24 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -30,12 +30,7 @@ USA.
 (declare (usual-integrations))
 
 (load-option 'RB-TREE)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "cref/")
   (lambda ()
-    ((access with-directory-rewriting-rule
-            (->environment '(RUNTIME COMPILER-INFO)))
-     (working-directory-pathname)
-     (pathname-as-directory "cref")
-     (lambda ()
-       (load-package-set "cref")))))
+    (load-package-set "cref")))
 (add-subsystem-identification! "CREF" '(2 3))
\ No newline at end of file

diff --git a/v7/src/imail/load.scm b/v7/src/imail/load.scm
index f0c9d9a5db5bd7249a43d64966931499522a458e..98edaaf11e10f2ddf14cb14bd928210b509e1f38 100644 (file)
--- a/v7/src/imail/load.scm
+++ b/v7/src/imail/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.49 2007/06/06 19:42:40 cph Exp $
+$Id: load.scm,v 1.50 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -30,7 +30,7 @@ USA.
 (load-option 'REGULAR-EXPRESSION)
 (load-option 'SOS)
 (load-option 'WT-TREE)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "imail/")
   (lambda ()
     (fluid-let ((*allow-package-redefinition?* #t))
       (load-package-set "imail"))))

diff --git a/v7/src/rcs/load.scm b/v7/src/rcs/load.scm
index 8914fb92c66ef6bee671f4d5318f6b8a77134d02..5afd32e70c5d2dcb82ff31e074d73a03aa578746 100644 (file)
--- a/v7/src/rcs/load.scm
+++ b/v7/src/rcs/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.8 2007/01/05 21:19:27 cph Exp $
+$Id: load.scm,v 1.9 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -26,7 +26,7 @@ USA.
 |#
 
 (load-option 'REGULAR-EXPRESSION)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "rcs/")
   (lambda ()
     (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 32e2c0def679c87e242ac19f844f27c02b95ff4d..314d6d37a33d5e9911045176e107014440018c48 100644 (file)
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.48 2007/06/06 19:42:43 cph Exp $
+$Id: make.scm,v 4.49 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -29,15 +29,9 @@ USA.
 
 (declare (usual-integrations))
 
-(with-working-directory-pathname
-    (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "sf/")
   (lambda ()
-    ((access with-directory-rewriting-rule
-            (->environment '(RUNTIME COMPILER-INFO)))
-     (working-directory-pathname)
-     (pathname-as-directory "sf")
-     (lambda ()
-       (load-package-set "sf")))
+    (load-package-set "sf")
     ((package/reference (find-package '(SCODE-OPTIMIZER))
                        'USUAL-INTEGRATIONS/CACHE!))))
 (add-subsystem-identification! "SF" '(4 41))
\ No newline at end of file

diff --git a/v7/src/sos/load.scm b/v7/src/sos/load.scm
index 84d7cc5323ce49738ab59f7d8fdfa32f277df449..b0885c7c65a5ffcf0cf66f1e6b129467e5f6fb5f 100644 (file)
--- a/v7/src/sos/load.scm
+++ b/v7/src/sos/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.20 2007/06/06 19:42:43 cph Exp $
+$Id: load.scm,v 1.21 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -25,7 +25,7 @@ USA.
 
 |#
 
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "sos/")
   (lambda ()
     (load-package-set "sos")))
 (add-subsystem-identification! "SOS" '(1 8))
\ No newline at end of file

diff --git a/v7/src/ssp/load.scm b/v7/src/ssp/load.scm
index b1a03bb5c7760c46e1780711dea83e74c98c739d..dda0227380adf73d91a32009f3b7bda7ef055173 100644 (file)
--- a/v7/src/ssp/load.scm
+++ b/v7/src/ssp/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.10 2007/06/06 19:42:43 cph Exp $
+$Id: load.scm,v 1.11 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -30,7 +30,7 @@ USA.
 (load-option 'xml)
 (load-option 'postgresql)
 (load-option 'mime-codec)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "ssp/")
   (lambda ()
     (load-package-set "ssp")))
 (add-subsystem-identification! "SSP" '(0 4))
\ No newline at end of file

diff --git a/v7/src/star-parser/load.scm b/v7/src/star-parser/load.scm
index cb117d27bce56216ae459515a611698e1e99905e..234d0494adc5edf3fd79fd4ce7254ef508ffb434 100644 (file)
--- a/v7/src/star-parser/load.scm
+++ b/v7/src/star-parser/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.22 2007/06/06 19:42:43 cph Exp $
+$Id: load.scm,v 1.23 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -25,12 +25,7 @@ USA.
 
 |#
 
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "star-parser/")
   (lambda ()
-    ((access with-directory-rewriting-rule
-            (->environment '(RUNTIME COMPILER-INFO)))
-     (working-directory-pathname)
-     (pathname-as-directory "star-parser")
-     (lambda ()
-       (load-package-set "parser")))))
+    (load-package-set "parser")))
 (add-subsystem-identification! "*Parser" '(0 13))
\ No newline at end of file

diff --git a/v7/src/win32/make.scm b/v7/src/win32/make.scm
index 942632b14946441bbdc3b4bfc19e20cf3a424ca8..4de117789f0be816eb40f1d84bb7848426f16606 100644 (file)
--- a/v7/src/win32/make.scm
+++ b/v7/src/win32/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 1.18 2007/01/05 21:19:29 cph Exp $
+$Id: make.scm,v 1.19 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -29,12 +29,7 @@ USA.
 
 (declare (usual-integrations))
 
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "win32/")
   (lambda ()
-    ((access with-directory-rewriting-rule
-            (->environment '(RUNTIME COMPILER-INFO)))
-     (working-directory-pathname)
-     (pathname-as-directory "win32")
-     (lambda ()
-       (load-package-set "win32")))))
+    (load-package-set "win32")))
 (add-subsystem-identification! "Win32" '(1 8))
\ No newline at end of file

diff --git a/v7/src/xdoc/load.scm b/v7/src/xdoc/load.scm
index 6c97d2d9c035e49542db5d23dad437e2b5f9b5d9..285d97823f12f451f894039757436c35d841deeb 100644 (file)
--- a/v7/src/xdoc/load.scm
+++ b/v7/src/xdoc/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.7 2007/06/06 19:42:43 cph Exp $
+$Id: load.scm,v 1.8 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -45,7 +45,7 @@ USA.
     (export 'html:style-attr 'style)
     (export 'xml-attrs 'attributes)
     (export 'xml-comment 'comment)))
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "xdoc/")
   (lambda ()
     (load-package-set "xdoc")))
 (add-subsystem-identification! "XDOC" '(0 3))
\ No newline at end of file

diff --git a/v7/src/xml/load.scm b/v7/src/xml/load.scm
index 7e984ddcd3b3490f15547b0e803683866ef6bf8f..fd8a55f483777de32eb6038c4d3ed4a9b3790959 100644 (file)
--- a/v7/src/xml/load.scm
+++ b/v7/src/xml/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: load.scm,v 1.21 2007/06/06 19:42:43 cph Exp $
+$Id: load.scm,v 1.22 2007/06/06 20:03:25 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -27,7 +27,7 @@ USA.
 
 (load-option 'REGULAR-EXPRESSION)
 (load-option 'SOS)
-(with-working-directory-pathname (directory-pathname (current-load-pathname))
+(with-loader-base-uri (system-library-uri "xml/")
   (lambda ()
     (load-package-set "xml")))
 (add-subsystem-identification! "XML" '(1 0))
\ No newline at end of file