Change default output file name to be limited to a three character

suffix.

diff --git a/v7/src/sf/make.scm b/v7/src/sf/make.scm
index 88c9d657b9377a6c84ac26afdf902e397ba9dbc3..2a0bf98be28b8e12cb7a54b4539c4fc8dd5c1a7d 100644 (file)
--- a/v7/src/sf/make.scm
+++ b/v7/src/sf/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.30 1994/06/21 19:38:30 cph Exp $
+$Id: make.scm,v 4.31 1995/01/06 18:36:17 cph Exp $
 
-Copyright (c) 1988-94 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
@@ -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 30 '()))
\ No newline at end of file
+(add-system! (make-system "SF" 4 31 '()))
\ No newline at end of file

diff --git a/v7/src/sf/sf.sf b/v7/src/sf/sf.sf
index 55ed2f7d3046ce421f25b76eb5350cdcf3ee136c..c2e5d99b169ec3533936688a8cdecd525c9b340d 100644 (file)
--- a/v7/src/sf/sf.sf
+++ b/v7/src/sf/sf.sf
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/sf/sf.sf,v 4.5 1989/10/26 06:28:11 cph Rel $
+$Id: sf.sf,v 4.6 1995/01/06 18:36:33 cph Exp $
 
-Copyright (c) 1988, 1989 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
@@ -52,10 +52,7 @@ MIT in each case. |#
   (sf-conditionally "lsets")
   (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 "sf")
-(sf "sf.con" "sf.bcon")
-(sf "sf.ldr" "sf.bldr")
\ No newline at end of file
+(sf "sf.con")
+(sf "sf.ldr")
\ No newline at end of file

diff --git a/v7/src/sf/toplev.scm b/v7/src/sf/toplev.scm
index a17063df914bc12e74598bd3874a7634a8a256fd..3b7f6edfc78aa695099fd486f02062d121535d3c 100644 (file)
--- a/v7/src/sf/toplev.scm
+++ b/v7/src/sf/toplev.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: toplev.scm,v 4.12 1993/09/01 00:10:28 cph Exp $
+$Id: toplev.scm,v 4.13 1995/01/06 18:36:24 cph Exp $
 
-Copyright (c) 1988-1993 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
@@ -165,7 +165,10 @@ MIT in each case. |#
                    (let ((input-type (pathname-type input-path)))
                      (if (and (string? input-type)
                               (not (string=? "scm" input-type)))
-                         (string-append "b" input-type)
+                         (string-append "b"
+                                        (if (> (string-length input-type) 2)
+                                            (string-head input-type 2)
+                                            input-type))
                          "bin")))))
              (if bin-string
                  (merge-pathnames bin-string bin-path)

diff --git a/v8/src/sf/make.scm b/v8/src/sf/make.scm
index 88c9d657b9377a6c84ac26afdf902e397ba9dbc3..2a0bf98be28b8e12cb7a54b4539c4fc8dd5c1a7d 100644 (file)
--- a/v8/src/sf/make.scm
+++ b/v8/src/sf/make.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: make.scm,v 4.30 1994/06/21 19:38:30 cph Exp $
+$Id: make.scm,v 4.31 1995/01/06 18:36:17 cph Exp $
 
-Copyright (c) 1988-94 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
@@ -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 30 '()))
\ No newline at end of file
+(add-system! (make-system "SF" 4 31 '()))
\ No newline at end of file

diff --git a/v8/src/sf/toplev.scm b/v8/src/sf/toplev.scm
index a17063df914bc12e74598bd3874a7634a8a256fd..3b7f6edfc78aa695099fd486f02062d121535d3c 100644 (file)
--- a/v8/src/sf/toplev.scm
+++ b/v8/src/sf/toplev.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: toplev.scm,v 4.12 1993/09/01 00:10:28 cph Exp $
+$Id: toplev.scm,v 4.13 1995/01/06 18:36:24 cph Exp $
 
-Copyright (c) 1988-1993 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
@@ -165,7 +165,10 @@ MIT in each case. |#
                    (let ((input-type (pathname-type input-path)))
                      (if (and (string? input-type)
                               (not (string=? "scm" input-type)))
-                         (string-append "b" input-type)
+                         (string-append "b"
+                                        (if (> (string-length input-type) 2)
+                                            (string-head input-type 2)
+                                            input-type))
                          "bin")))))
              (if bin-string
                  (merge-pathnames bin-string bin-path)