diff options
Diffstat (limited to 'mkimpcat.scm')
| -rwxr-xr-x[-rw-r--r--] | mkimpcat.scm | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/mkimpcat.scm b/mkimpcat.scm index 08e33eb..c06e157 100644..100755 --- a/mkimpcat.scm +++ b/mkimpcat.scm @@ -25,7 +25,7 @@ (define (display* . args) (for-each (lambda (arg) (display arg op)) args) (newline op)) - (define (in-wb-vicinity . paths) (apply in-vicinity iv "../wb/" paths)) + (define (in-wb-vicinity . paths) (apply in-vicinity iv "../wb/c/" paths)) (define (in-xscm-vicinity . paths) (apply in-vicinity iv "../xscm-2.01/" paths)) (define (add-link feature . libs) (define syms '()) @@ -50,7 +50,7 @@ (write (cons from to) op) (newline op)) (define (add-source feature filename) - (cond ((file-exists? filename) + (cond ((file-exists? (string-append filename (scheme-file-suffix))) (display " " op) (write (list feature 'source filename) op) (newline op) @@ -60,6 +60,7 @@ (display* "#+" feature) (display* "(") (begin + (cond ((add-link 'hobbit (in-implementation-vicinity "hobbit" link:able-suffix)))) (cond ((add-link 'i/o-extensions (in-implementation-vicinity "ioext" link:able-suffix) (usr:lib "c")) @@ -75,7 +76,7 @@ link:able-suffix)))) (cond ((or (add-link 'db - (in-implementation-vicinity "db.so")) + (in-implementation-vicinity "wbscm.so")) (add-link 'db (in-implementation-vicinity "db" link:able-suffix) (in-implementation-vicinity "handle" link:able-suffix) @@ -89,7 +90,7 @@ (in-implementation-vicinity "scan" link:able-suffix) (usr:lib "c")) (add-link 'db - (in-wb-vicinity "db.so")) + (in-wb-vicinity "wbscm.so")) (add-link 'db (in-wb-vicinity "db" link:able-suffix) (in-wb-vicinity "handle" link:able-suffix) @@ -185,36 +186,25 @@ (add-alias '3rs 'r3rs) (add-alias '4rs 'r4rs) (add-alias '5rs 'r5rs) - (add-alias 'hobbit (in-implementation-vicinity "hobbit")) - (add-alias 'scmhob (in-implementation-vicinity "scmhob")) - (add-alias 'regex-case (in-implementation-vicinity "rgxcase")) - (add-alias 'url-filename (in-implementation-vicinity "urlfile")) - (add-source 'disarm (in-implementation-vicinity - (string-append "disarm" (scheme-file-suffix)))) + (add-source 'hobbit (in-implementation-vicinity "hobbit")) + (add-source 'scmhob (in-implementation-vicinity "scmhob")) + (add-source 'regex-case (in-implementation-vicinity "rgxcase")) + (add-source 'url-filename (in-implementation-vicinity "urlfile")) + (add-source 'disarm (in-implementation-vicinity "disarm")) (add-source 'build (in-implementation-vicinity "build")) - (add-source 'compile (in-implementation-vicinity - (string-append "compile" (scheme-file-suffix)))) + (add-source 'compile (in-implementation-vicinity "compile")) (or - (add-source 'wb-table - (in-implementation-vicinity - (string-append "wbtab" (scheme-file-suffix)))) - (add-source 'wb-table - (in-wb-vicinity - (string-append "wbtab" (scheme-file-suffix))))) + (add-source 'wb-table (in-implementation-vicinity "wbtab")) + (add-source 'wb-table (in-wb-vicinity "wbtab"))) (or - (add-source 'rwb-isam - (in-implementation-vicinity - (string-append "rwb-isam" (scheme-file-suffix)))) - (add-source 'rwb-isam - (in-wb-vicinity - (string-append "rwb-isam" (scheme-file-suffix))))) + (add-source 'rwb-isam (in-implementation-vicinity "rwb-isam")) + (add-source 'rwb-isam (in-wb-vicinity "rwb-isam"))) (display* ")") ) (display* "#+" 'primitive-hygiene) (display* "(") - (add-source 'macro (in-implementation-vicinity - (string-append "Macro" (scheme-file-suffix)))) + (add-source 'macro (in-implementation-vicinity "Macro")) (display* ")") (add-links 'dld |