From 80117c30a07553f6a6bf008992bf4db686744156 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Tue, 21 Jun 1994 19:38:49 +0000 Subject: [PATCH] Disregard working directory when file is loaded; use directory that file is loaded from instead. --- v7/src/cref/make.scm | 4 ++-- v7/src/edwin/make.scm | 28 ++++++++++++++++------------ v7/src/sf/make.scm | 4 ++-- v8/src/sf/make.scm | 4 ++-- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/v7/src/cref/make.scm b/v7/src/cref/make.scm index a6bdfd0e6..66d4b31ce 100644 --- a/v7/src/cref/make.scm +++ b/v7/src/cref/make.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: make.scm,v 1.11 1994/06/21 19:37:33 cph Exp $ +$Id: make.scm,v 1.12 1994/06/21 19:38:49 cph Exp $ Copyright (c) 1988-94 Massachusetts Institute of Technology @@ -46,4 +46,4 @@ MIT in each case. |# (lambda () (load-option 'RB-TREE) (package/system-loader "cref" '() false))))) -(add-system! (make-system "CREF" 1 10 '())) \ No newline at end of file +(add-system! (make-system "CREF" 1 12 '())) \ No newline at end of file diff --git a/v7/src/edwin/make.scm b/v7/src/edwin/make.scm index c6ac76b2c..1453b4cda 100644 --- a/v7/src/edwin/make.scm +++ b/v7/src/edwin/make.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: make.scm,v 3.83 1994/03/16 23:43:43 cph Exp $ +$Id: make.scm,v 3.84 1994/06/21 19:38:40 cph Exp $ Copyright (c) 1989-94 Massachusetts Institute of Technology @@ -36,14 +36,18 @@ MIT in each case. |# (declare (usual-integrations)) -((access with-directory-rewriting-rule - (->environment '(RUNTIME COMPILER-INFO))) - (working-directory-pathname) - (pathname-as-directory "edwin") - (lambda () - (declare-shared-library "edwin" (lambda () true)) - (package/system-loader - "edwin" - `((os-type . ,(intern (microcode-identification-item 'OS-NAME-STRING)))) - 'QUERY))) -(add-system! (make-system "Edwin" 3 83 '())) \ No newline at end of file +(with-working-directory-pathname + (directory-pathname (current-load-pathname)) + (lambda () + ((access with-directory-rewriting-rule + (->environment '(RUNTIME COMPILER-INFO))) + (working-directory-pathname) + (pathname-as-directory "edwin") + (lambda () + (declare-shared-library "edwin" (lambda () true)) + (package/system-loader + "edwin" + `((os-type + . ,(intern (microcode-identification-item 'OS-NAME-STRING)))) + 'QUERY))))) +(add-system! (make-system "Edwin" 3 84 '())) \ No newline at end of file diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm index 6424c9782..88c9d657b 100644 --- a/v7/src/sf/make.scm +++ b/v7/src/sf/make.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: make.scm,v 4.29 1994/06/21 19:37:25 cph Exp $ +$Id: make.scm,v 4.30 1994/06/21 19:38:30 cph Exp $ Copyright (c) 1988-94 Massachusetts Institute of Technology @@ -47,4 +47,4 @@ MIT in each case. |# (package/system-loader "sf" '() 'QUERY))) ((package/reference (find-package '(SCODE-OPTIMIZER)) 'USUAL-INTEGRATIONS/CACHE!)))) -(add-system! (make-system "SF" 4 28 '())) \ No newline at end of file +(add-system! (make-system "SF" 4 30 '())) \ No newline at end of file diff --git a/v8/src/sf/make.scm b/v8/src/sf/make.scm index 6424c9782..88c9d657b 100644 --- a/v8/src/sf/make.scm +++ b/v8/src/sf/make.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: make.scm,v 4.29 1994/06/21 19:37:25 cph Exp $ +$Id: make.scm,v 4.30 1994/06/21 19:38:30 cph Exp $ Copyright (c) 1988-94 Massachusetts Institute of Technology @@ -47,4 +47,4 @@ MIT in each case. |# (package/system-loader "sf" '() 'QUERY))) ((package/reference (find-package '(SCODE-OPTIMIZER)) 'USUAL-INTEGRATIONS/CACHE!)))) -(add-system! (make-system "SF" 4 28 '())) \ No newline at end of file +(add-system! (make-system "SF" 4 30 '())) \ No newline at end of file -- 2.25.1