Change 4-character suffixes used by package system to be 3-character

suffixes.  This is done by defaulting the output file on the call to
SF, which now generates the correct 3-character suffix.

diff --git a/v7/src/6001/6001.sf b/v7/src/6001/6001.sf
index e1c3e67e326d8484af8b81b8029bd6b107afffbe..5ff7c538198a4e11804a5f58b68e0544892cc2a4 100644 (file)
--- a/v7/src/6001/6001.sf
+++ b/v7/src/6001/6001.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: 6001.sf,v 1.8 1993/11/09 21:23:57 adams Exp $
+$Id: 6001.sf,v 1.9 1995/01/06 18:37:50 cph Exp $
 
-Copyright (c) 1991-92 Massachusetts Institute of Technology
+Copyright (c) 1991-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and

diff --git a/v7/src/compiler/machines/C/compiler.sf b/v7/src/compiler/machines/C/compiler.sf
index b7ab7d9495629ef181d1afb7fd065f7c63ca62ac..42668327f79e91bc8cb144f2a372088653ac03b3 100644 (file)
--- a/v7/src/compiler/machines/C/compiler.sf
+++ b/v7/src/compiler/machines/C/compiler.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.4 1994/02/02 01:22:56 gjr Exp $
+$Id: compiler.sf,v 1.5 1995/01/06 18:37:44 cph Exp $
 
-Copyright (c) 1992-1994 Massachusetts Institute of Technology
+Copyright (c) 1992-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,21 +34,19 @@ MIT in each case. |#
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -86,5 +84,5 @@ MIT in each case. |#
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/compiler/machines/alpha/compiler.sf b/v7/src/compiler/machines/alpha/compiler.sf
index f615b74c16e60887811abebf6260fd6196faa9b1..e8350cde99dc31a556c50a8ecb278d7af033ca18 100644 (file)
--- a/v7/src/compiler/machines/alpha/compiler.sf
+++ b/v7/src/compiler/machines/alpha/compiler.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.4 1994/02/02 01:21:58 gjr Exp $
+$Id: compiler.sf,v 1.5 1995/01/06 18:37:38 cph Exp $
 
-Copyright (c) 1992-1994 Digital Equipment Corporation (D.E.C.)
+Copyright (c) 1992-95 Digital Equipment Corporation (D.E.C.)
 
 This software was developed at the Digital Equipment Corporation
 Cambridge Research Laboratory.  Permission to copy this software, to
@@ -36,21 +36,19 @@ case.
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -111,5 +109,5 @@ case.
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/compiler/machines/bobcat/compiler.sf b/v7/src/compiler/machines/bobcat/compiler.sf
index 77ffbad75d047a004ba18860acba779f989f931e..56af9bd18e06fa8a838de71f471a6264cedd6157 100644 (file)
--- a/v7/src/compiler/machines/bobcat/compiler.sf
+++ b/v7/src/compiler/machines/bobcat/compiler.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.16 1994/02/02 01:21:22 gjr Exp $
+$Id: compiler.sf,v 1.17 1995/01/06 18:38:42 cph Exp $
 
-Copyright (c) 1988-1994 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,21 +34,19 @@ MIT in each case. |#
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -107,5 +105,5 @@ MIT in each case. |#
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/compiler/machines/i386/compiler.sf b/v7/src/compiler/machines/i386/compiler.sf
index 436a8791ccb6d5efdbe096deee49c31892cc05de..7e128db2c1bc5121f36a0232c31e0eefaa80dab1 100644 (file)
--- a/v7/src/compiler/machines/i386/compiler.sf
+++ b/v7/src/compiler/machines/i386/compiler.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.6 1994/02/02 01:22:27 gjr Exp $
+$Id: compiler.sf,v 1.7 1995/01/06 18:38:37 cph Exp $
 
-Copyright (c) 1992-1994 Massachusetts Institute of Technology
+Copyright (c) 1992-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,21 +34,19 @@ MIT in each case. |#
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -106,5 +104,5 @@ MIT in each case. |#
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/compiler/machines/mips/compiler.sf-big b/v7/src/compiler/machines/mips/compiler.sf-big
index 517afd0a6312b8c562c20d1ac02de675897babad..ca7daf62dca5077dcecd32ad06d089a0e322c86a 100644 (file)
--- a/v7/src/compiler/machines/mips/compiler.sf-big
+++ b/v7/src/compiler/machines/mips/compiler.sf-big
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf-big,v 1.6 1994/02/02 01:23:35 gjr Exp $
+$Id: compiler.sf-big,v 1.7 1995/01/06 18:38:32 cph Exp $
 
-Copyright (c) 1988-1994 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,21 +34,19 @@ MIT in each case. |#
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -109,5 +107,5 @@ MIT in each case. |#
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/compiler/machines/mips/compiler.sf-little b/v7/src/compiler/machines/mips/compiler.sf-little
index c9cf5f34f5514891687dba8ad21b6079958cbad5..ad8388225173ed1978efcb9da3f1e834a14ba846 100644 (file)
--- a/v7/src/compiler/machines/mips/compiler.sf-little
+++ b/v7/src/compiler/machines/mips/compiler.sf-little
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf-little,v 1.6 1994/02/02 01:23:49 gjr Exp $
+$Id: compiler.sf-little,v 1.7 1995/01/06 18:38:26 cph Exp $
 
-Copyright (c) 1988-1994 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,21 +34,19 @@ MIT in each case. |#
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -109,5 +107,5 @@ MIT in each case. |#
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/compiler/machines/spectrum/compiler.sf b/v7/src/compiler/machines/spectrum/compiler.sf
index 2844e0f25a07454d73ca41e35180c64a620ac635..66e93db5bdba4cd0310978f0a9b0ad8e0fb6165f 100644 (file)
--- a/v7/src/compiler/machines/spectrum/compiler.sf
+++ b/v7/src/compiler/machines/spectrum/compiler.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.16 1994/02/02 01:20:50 gjr Exp $
+$Id: compiler.sf,v 1.17 1995/01/06 18:38:20 cph Exp $
 
-Copyright (c) 1988-1994 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,21 +34,19 @@ MIT in each case. |#
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -106,5 +104,5 @@ MIT in each case. |#
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/compiler/machines/vax/compiler.sf b/v7/src/compiler/machines/vax/compiler.sf
index 473812a8c13d8fe703767811885d0c939e21699c..9c2cea0c9418ccfca7de22adadcbea8a29f63dcc 100644 (file)
--- a/v7/src/compiler/machines/vax/compiler.sf
+++ b/v7/src/compiler/machines/vax/compiler.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: compiler.sf,v 1.7 1994/02/02 01:21:41 gjr Exp $
+$Id: compiler.sf,v 1.8 1995/01/06 18:38:14 cph Exp $
 
-Copyright (c) 1988-1994 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,21 +34,19 @@ MIT in each case. |#
 
 ;;;; Script to incrementally syntax the compiler
 \f
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 ;; Guarantee that the compiler's package structure exists.
 (if (not (name->package '(COMPILER)))
     (begin
       ;; If there is no existing package constructor, generate one.
-      (if (not (file-exists? "compiler.bcon"))
+      (if (not (file-exists? "compiler.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "compiler")
-           (sf "compiler.con" "compiler.bcon")))
-      (load "compiler.bcon")))
+           (sf "compiler.con")))
+      (load "compiler.bco")))
 
 ;; Guarantee that the necessary syntactic transforms and optimizers
 ;; are loaded.
@@ -110,5 +108,5 @@ MIT in each case. |#
 
 ;; Rebuild the package constructors and cref.
 (cref/generate-constructors "compiler")
-(sf "compiler.con" "compiler.bcon")
-(sf "compiler.ldr" "compiler.bldr")
\ No newline at end of file
+(sf "compiler.con")
+(sf "compiler.ldr")
\ No newline at end of file

diff --git a/v7/src/cref/cref.sf b/v7/src/cref/cref.sf
index 830dfc721fa593987e6a715b802d0f97087d1beb..b36161cdacbbbf38c45e494f65c41099909fa2a7 100644 (file)
--- a/v7/src/cref/cref.sf
+++ b/v7/src/cref/cref.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: cref.sf,v 1.6 1993/10/11 23:31:40 cph Exp $
+$Id: cref.sf,v 1.7 1995/01/06 18:38:47 cph Exp $
 
-Copyright (c) 1988-93 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -36,15 +36,15 @@ MIT in each case. |#
 (sf-conditionally "object")
 (sf-directory ".")
 
-(if (not (file-exists? "cref.bcon"))
-    (sf "triv.con" "cref.bcon"))
-(if (not (file-exists? "cref.bldr"))
-    (sf "triv.ldr" "cref.bldr"))
+(if (not (file-exists? "cref.bco"))
+    (sf "triv.con" "cref.bco"))
+(if (not (file-exists? "cref.bld"))
+    (sf "triv.ldr" "cref.bld"))
 
-(if (file-exists? "../runtime/runtim.glob")
+(if (file-exists? "../runtime/runtim.glo")
     (begin
       (if (not (name->package '(CROSS-REFERENCE)))
          (load "make"))
       (cref/generate-constructors "cref")
-      (sf "cref.con" "cref.bcon")
-      (sf "cref.ldr" "cref.bldr")))
\ No newline at end of file
+      (sf "cref.con")
+      (sf "cref.ldr")))
\ No newline at end of file

diff --git a/v7/src/edwin/edwin.sf b/v7/src/edwin/edwin.sf
index a8380a5bfd8c4cb425a982284b468b7081f57d8d..a1973dc1dcdcc417398395d84c6b229188db3a68 100644 (file)
--- a/v7/src/edwin/edwin.sf
+++ b/v7/src/edwin/edwin.sf
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: edwin.sf,v 1.11 1992/09/23 22:44:24 jinx Exp $
+;;;    $Id: edwin.sf,v 1.12 1995/01/06 18:38:08 cph Exp $
 ;;;
-;;;    Copyright (c) 1991-1992 Massachusetts Institute of Technology
+;;;    Copyright (c) 1991-95 Massachusetts Institute of Technology
 ;;;
 ;;;    This material was developed by the Scheme project at the
 ;;;    Massachusetts Institute of Technology, Department of
@@ -42,18 +42,17 @@
 ;;; of that license should have been included along with this file.
 ;;;
 
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
+(load-option 'CREF)
 
 (if (not (name->package '(EDWIN)))
     (begin
-      (if (not (file-exists? "edwin.bcon"))
+      (if (not (file-exists? "edwin.bco"))
          (begin
            ((access cref/generate-trivial-constructor
                     (->environment '(CROSS-REFERENCE)))
             "edwin")
-           (sf "edwin.con" "edwin.bcon")))
-      (load "edwin.bcon")))
+           (sf "edwin.con")))
+      (load "edwin.bco")))
 
 (if (lexical-unreferenceable? (->environment '(EDWIN CLASS-CONSTRUCTOR))
                              'CLASS-DESCRIPTORS)
@@ -99,9 +98,9 @@
       (write-globals pathname pmodel)
       (write-constructor pathname pmodel)))
    "edwin"))
-(sf "edwin.con" "edwin.bcon")
-(if (not (file-processed? "edwin" "ldr" "bldr"))
-    (sf "edwin.ldr" "edwin.bldr"))
+(sf "edwin.con")
+(if (not (file-processed? "edwin" "ldr" "bld"))
+    (sf "edwin.ldr"))
 (if (and (file-exists? "edwin.avd")
         (not (file-processed? "edwin" "avd" "bad")))
     (fasdump (read-file "edwin.avd") "edwin.bad"))
\ No newline at end of file

diff --git a/v7/src/rcs/rcs.sf b/v7/src/rcs/rcs.sf
index 1ac79902de9be6a8ab752de89832672b31d1f97a..362ef5c3c49b971782cfda08fd4fd770ef33896d 100644 (file)
--- a/v7/src/rcs/rcs.sf
+++ b/v7/src/rcs/rcs.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/rcs/Attic/rcs.sf,v 1.5 1991/10/10 01:29:21 cph Exp $
+$Id: rcs.sf,v 1.6 1995/01/06 18:37:56 cph Exp $
 
-Copyright (c) 1988-91 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -40,5 +40,5 @@ MIT in each case. |#
     (with-working-directory-pathname "../cref" (lambda () (load "make"))))
 
 (cref/generate-constructors "rcs")
-(sf "rcs.con" "rcs.bcon")
-(sf "rcs.ldr" "rcs.bldr")
\ No newline at end of file
+(sf "rcs.con")
+(sf "rcs.ldr")
\ No newline at end of file

diff --git a/v7/src/runtime/packag.scm b/v7/src/runtime/packag.scm
index 971a0c391ac6a050fdd5defa800c6f4b91dd7a3f..1503ad9ec1bc25275a406f4f2e24a758424fe730 100644 (file)
--- a/v7/src/runtime/packag.scm
+++ b/v7/src/runtime/packag.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: packag.scm,v 14.19 1994/03/13 05:09:42 jawilson Exp $
+$Id: packag.scm,v 14.20 1995/01/06 18:37:30 cph Exp $
 
-Copyright (c) 1988-1994 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -159,10 +159,10 @@ MIT in each case. |#
                               (assoc "scm" load/default-types))
                         load/default-types)))
          (let ((syntax-table (nearest-repl/syntax-table)))
-           (load (pathname-new-type pathname "bcon")
+           (load (pathname-new-type pathname "bco")
                  system-global-environment
                  syntax-table false)
-           ((load (pathname-new-type pathname "bldr")
+           ((load (pathname-new-type pathname "bld")
                   system-global-environment
                   syntax-table false)
             (lambda (component environment)

diff --git a/v7/src/runtime/runtime.sf b/v7/src/runtime/runtime.sf
index 29aaff7e53219dcc17e64f07139631950d0d56f9..ae0bdf8a507454613a90963c85219f9e4b1e1a8d 100644 (file)
--- a/v7/src/runtime/runtime.sf
+++ b/v7/src/runtime/runtime.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: runtime.sf,v 14.10 1994/12/06 17:39:15 adams Exp $
+$Id: runtime.sf,v 14.11 1995/01/06 18:37:20 cph Exp $
 
-Copyright (c) 1988-1994 Massachusetts Institute of Technology
+Copyright (c) 1988-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -39,12 +39,8 @@ MIT in each case. |#
 ;; that when cross-syntaxing the cref `native' to the running system
 ;; is loaded.
 (load-option 'CREF)
-;;Was:
-;;(if (not (name->package '(CROSS-REFERENCE)))
-;;    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
-
 (cref/generate-constructors "runtime")
-(sf "runtime.con" "runtime.bcon")
-(sf "runtime.ldr" "runtime.bldr")
+(sf "runtime.con")
+(sf "runtime.ldr")
 (if (file-exists? "runtime.avd")
     (fasdump (read-file "runtime.avd") "runtime.bad"))
\ No newline at end of file

diff --git a/v7/src/win32/win32.sf b/v7/src/win32/win32.sf
index ba47f12e0fc4a2aaf20117954b80f0e958d6588d..0763ca9fd579dbccb4fc6a79c11e53aa63b1136a 100644 (file)
--- a/v7/src/win32/win32.sf
+++ b/v7/src/win32/win32.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: win32.sf,v 1.2 1993/11/10 21:32:21 adams Exp $
+$Id: win32.sf,v 1.3 1995/01/06 18:38:01 cph Exp $
 
-Copyright (c) 1993 Massachusetts Institute of Technology
+Copyright (c) 1993-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -57,10 +57,7 @@ MIT in each case. |#
   (sf-conditionally "win_ffi")
   (sf-directory "."))
 
-;; Guarantee that the package modeller is loaded.
-(if (not (name->package '(CROSS-REFERENCE)))
-    (with-working-directory-pathname "../cref" (lambda () (load "make"))))
-
+(load-option 'CREF)
 (cref/generate-constructors "win32")
-(sf "win32.con" "win32.bcon")
-(sf "win32.ldr" "win32.bldr")
\ No newline at end of file
+(sf "win32.con")
+(sf "win32.ldr")
\ No newline at end of file