1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: Gwen Weinholt <git@weinholt.se>
Date: Sun, 26 May 2024 12:29:50 +0200
Subject: Do not use catalog:expand-path
Support older slib by reverting the following patch from upstream:
| Author: jaffer <jaffer>
| Date: Sun Oct 15 02:17:39 2023 +0000
|
| Summary: 2023-10-14 Aubrey Jaffer <agj@alum.mit.edu>
|
| Patch from Radey Shouman to use SLIB's new catalog:expand-path.
---
mkimpcat.scm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/mkimpcat.scm b/mkimpcat.scm
index ca65f06..c06e157 100755
--- a/mkimpcat.scm
+++ b/mkimpcat.scm
@@ -19,9 +19,8 @@
(let ((catname "implcat")
(iv (implementation-vicinity)))
- ;;(define (in-implementation-vicinity . paths) (apply in-vicinity iv paths))
- (define (in-implementation-vicinity . paths) (cons 'implementation paths))
- (call-with-output-file (in-vicinity iv catname)
+ (define (in-implementation-vicinity . paths) (apply in-vicinity iv paths))
+ (call-with-output-file (in-implementation-vicinity catname)
(lambda (op)
(define (display* . args)
(for-each (lambda (arg) (display arg op)) args)
@@ -38,7 +37,7 @@
(rem (cdr l)))
((car l) (cons (car l) (rem (cdr l))))
(else (rem (cdr l))))))
- (cond ((file-exists? (catalog:expand-path (car libs)))
+ (cond ((file-exists? (car libs))
(display " " op)
(write
(cons feature (cons 'compiled (append syms libs)))
@@ -51,8 +50,7 @@
(write (cons from to) op)
(newline op))
(define (add-source feature filename)
- (cond ((file-exists? (string-append (catalog:expand-path filename)
- (scheme-file-suffix)))
+ (cond ((file-exists? (string-append filename (scheme-file-suffix)))
(display " " op)
(write (list feature 'source filename) op)
(newline op)
|
