From 8ff5042628e685c9bc1af1652640f03ed9f6e727 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Thu, 15 Nov 1990 23:33:36 +0000 Subject: [PATCH] Change to use new system-library pathname procedures. Requires runtim 14.103 or later. --- v7/src/edwin/make.scm | 4 ++-- v7/src/edwin/paths.scm | 22 +++++++++------------- v7/src/sicp/studen.scm | 6 ++---- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/v7/src/edwin/make.scm b/v7/src/edwin/make.scm index ddca76c2f..a805564b7 100644 --- a/v7/src/edwin/make.scm +++ b/v7/src/edwin/make.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/make.scm,v 3.23 1990/11/09 08:56:28 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/make.scm,v 3.24 1990/11/15 23:32:46 cph Rel $ Copyright (c) 1989, 1990 Massachusetts Institute of Technology @@ -37,4 +37,4 @@ MIT in each case. |# (declare (usual-integrations)) (package/system-loader "edwin" '() 'QUERY) -(add-system! (make-system "Edwin" 3 23 '())) \ No newline at end of file +(add-system! (make-system "Edwin" 3 24 '())) \ No newline at end of file diff --git a/v7/src/edwin/paths.scm b/v7/src/edwin/paths.scm index f7031ea12..c52d4243c 100644 --- a/v7/src/edwin/paths.scm +++ b/v7/src/edwin/paths.scm @@ -1,8 +1,8 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/paths.scm,v 1.4 1989/08/03 23:33:15 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/paths.scm,v 1.5 1990/11/15 23:32:54 cph Exp $ -Copyright (c) 1989 Massachusetts Institute of Technology +Copyright (c) 1989, 1990 Massachusetts Institute of Technology This material was developed by the Scheme project at the Massachusetts Institute of Technology, Department of Electrical Engineering and @@ -37,20 +37,16 @@ MIT in each case. |# (declare (usual-integrations)) (define (edwin-binary-directory) - (pathname-as-directory + (system-library-directory-pathname (merge-pathnames (string->pathname "autoload") - (edwin-library-directory-pathname)))) + (string->pathname "edwin")))) (define (edwin-info-directory) - (pathname-as-directory + (system-library-directory-pathname (merge-pathnames (string->pathname "info") - (edwin-library-directory-pathname)))) + (string->pathname "edwin")))) (define (edwin-tutorial-pathname) - (merge-pathnames (string->pathname "TUTORIAL") - (edwin-library-directory-pathname))) - -(define (edwin-library-directory-pathname) - (pathname-as-directory - (merge-pathnames (string->pathname "edwin") - (system-library-directory-pathname)))) \ No newline at end of file + (system-library-pathname + (merge-pathnames (string->pathname "TUTORIAL") + (string->pathname "edwin")))) \ No newline at end of file diff --git a/v7/src/sicp/studen.scm b/v7/src/sicp/studen.scm index bf083a52b..deb7053c6 100644 --- a/v7/src/sicp/studen.scm +++ b/v7/src/sicp/studen.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sicp/studen.scm,v 1.2 1990/11/14 14:58:18 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sicp/studen.scm,v 1.3 1990/11/15 23:33:36 cph Exp $ Copyright (c) 1987, 1988, 1989, 1990 Massachusetts Institute of Technology @@ -455,9 +455,7 @@ MIT in each case. |# (set! student-band-pathname (merge-pathnames (make-pathname #f #f #f "sicp" "bin" #f) - (->pathname - (or ((make-primitive-procedure 'reload-band-name)) - ((make-primitive-procedure 'microcode-tables-filename)))))) + (system-library-directory-pathname false))) (add-event-receiver! event:after-restart (lambda () -- 2.25.1