From 878bde7f07958bf0de0e580bd4f8e964e9c8cf8a Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Thu, 3 Aug 1989 23:33:15 +0000 Subject: [PATCH] Change library pathnames to be relative to `(system-library-directory-pathname)' so that they will dynamically changed depending on the microcode's defaults. --- v7/src/edwin/autold.scm | 5 +++-- v7/src/edwin/hlpcom.scm | 5 +++-- v7/src/edwin/info.scm | 9 +++++++-- v7/src/edwin/loadef.scm | 8 +++++--- v7/src/edwin/paths.scm | 24 +++++++++++++++++------- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/v7/src/edwin/autold.scm b/v7/src/edwin/autold.scm index 52111b32b..92a1676df 100644 --- a/v7/src/edwin/autold.scm +++ b/v7/src/edwin/autold.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.43 1989/04/28 22:46:55 cph Rel $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/autold.scm,v 1.44 1989/08/03 23:33:05 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989 Massachusetts Institute of Technology ;;; @@ -194,7 +194,8 @@ (define (load-edwin-file filename package #!optional purify?) (let ((pathname - (merge-pathnames (->pathname filename) edwin-binary-directory))) (temporary-message "Loading file \"" (pathname->string pathname) "\"") + (merge-pathnames (->pathname filename) (edwin-binary-directory)))) + (temporary-message "Loading file \"" (pathname->string pathname) "\"") (let ((scode (fasload pathname true))) (if (or (default-object? purify?) purify?) (purify scode)) (scode-eval scode (->environment package)))) (append-message " -- done")) diff --git a/v7/src/edwin/hlpcom.scm b/v7/src/edwin/hlpcom.scm index 41882c466..79bcdc0b9 100644 --- a/v7/src/edwin/hlpcom.scm +++ b/v7/src/edwin/hlpcom.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/hlpcom.scm,v 1.88 1989/04/28 22:50:06 cph Rel $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/hlpcom.scm,v 1.89 1989/08/03 23:32:55 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989 Massachusetts Institute of Technology ;;; @@ -265,7 +265,8 @@ If you want VALUE to be a string, you must surround it with doublequotes." (if buffer (select-buffer buffer) (let ((buffer (new-buffer (pathname->buffer-name pathname)))) - (read-buffer buffer edwin-tutorial-pathname) (set-buffer-pathname! buffer pathname) + (read-buffer buffer (edwin-tutorial-pathname)) + (set-buffer-pathname! buffer pathname) (set-buffer-truename! buffer false) (select-buffer buffer) (set-current-major-mode! (ref-mode-object fundamental)) diff --git a/v7/src/edwin/info.scm b/v7/src/edwin/info.scm index eb6d32101..e1226d3fc 100644 --- a/v7/src/edwin/info.scm +++ b/v7/src/edwin/info.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/info.scm,v 1.91 1989/08/03 01:34:05 cph Exp $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/info.scm,v 1.92 1989/08/03 23:32:45 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989 Massachusetts Institute of Technology ;;; @@ -594,7 +594,12 @@ The name may be an abbreviation of the reference name." (eq? (car directory) 'SELF))) (pathname-directory-path (current-default-pathname)) - (->pathname (ref-variable info-directory))))))) (if (file-exists? pathname) + (let ((info-directory + (ref-variable info-directory))) + (if info-directory + (->pathname info-directory) + (edwin-info-directory)))))))) + (if (file-exists? pathname) pathname (let ((pathname* (pathname-new-name diff --git a/v7/src/edwin/loadef.scm b/v7/src/edwin/loadef.scm index 5a2310d20..4d5fae749 100644 --- a/v7/src/edwin/loadef.scm +++ b/v7/src/edwin/loadef.scm @@ -1,6 +1,6 @@ ;;; -*-Scheme-*- ;;; -;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/loadef.scm,v 1.4 1989/08/03 01:32:31 cph Exp $ +;;; $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/loadef.scm,v 1.5 1989/08/03 23:32:32 cph Exp $ ;;; ;;; Copyright (c) 1986, 1989 Massachusetts Institute of Technology ;;; @@ -61,8 +61,10 @@ The Scheme code is executed when the node is selected." true) (define-variable info-directory - "Default directory pathname for Info documentation files." - edwin-info-directory) + "If not false, default directory for Info documentation files. +Otherwise the standard directory is used." + false) + (define-variable info-previous-search "Default search string for Info \\[info-search] command to search for." false) diff --git a/v7/src/edwin/paths.scm b/v7/src/edwin/paths.scm index 2bf79ddb3..f7031ea12 100644 --- a/v7/src/edwin/paths.scm +++ b/v7/src/edwin/paths.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/edwin/paths.scm,v 1.3 1989/08/02 16:18:23 cph Exp $ +$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 $ Copyright (c) 1989 Massachusetts Institute of Technology @@ -36,11 +36,21 @@ MIT in each case. |# (declare (usual-integrations)) -(define edwin-binary-directory - (string->pathname "/usr/local/lib/mit-scheme/edwin/autoload/")) +(define (edwin-binary-directory) + (pathname-as-directory + (merge-pathnames (string->pathname "autoload") + (edwin-library-directory-pathname)))) -(define edwin-info-directory - (string->pathname "/usr/local/lib/mit-scheme/edwin/info/")) +(define (edwin-info-directory) + (pathname-as-directory + (merge-pathnames (string->pathname "info") + (edwin-library-directory-pathname)))) -(define edwin-tutorial-pathname - (string->pathname "/usr/local/lib/mit-scheme/edwin/TUTORIAL")) \ No newline at end of file +(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 -- 2.25.1