diff --git a/lib/chibi/snow/commands.scm b/lib/chibi/snow/commands.scm index 971ee6a7..ebe5e9d7 100644 --- a/lib/chibi/snow/commands.scm +++ b/lib/chibi/snow/commands.scm @@ -1025,7 +1025,12 @@ `(guile -L ,install-dir -L ,lib-path ,file) `(guile -L ,install-dir ,file))) ((kawa) - `(kawa --script ,file)) + (if lib-path + `(kawa + ,(string-append "-Dkawa.import.path=" install-dir ":" lib-path) + --r7rs --script ,file) + `(kawa ,(string-append "-Dkawa.import.path=" install-dir) + --r7rs --script ,file))) ((larceny) (if lib-path `(larceny -r7rs -path ,(string-append install-dir ":" lib-path) @@ -1136,7 +1141,7 @@ (define (get-library-extension impl cfg) (or (conf-get cfg 'library-extension) (case impl - ((gauche) "scm") + ((gauche kawa) "scm") (else "sld")))) (define (install-with-sudo? cfg path) diff --git a/tests/snow/snow-tests.scm b/tests/snow/snow-tests.scm index a1ece344..9b5a3ef8 100644 --- a/tests/snow/snow-tests.scm +++ b/tests/snow/snow-tests.scm @@ -150,18 +150,21 @@ (test-assert (installed-version status '(pingala factorial) 'foment))) (snow ,@repo2 update) -(snow ,@repo2 --implementations "gauche,larceny" +(snow ,@repo2 --implementations "gauche,kawa,larceny" install leonardo.fibonacci) -(let ((status (snow-status --implementations "gauche,larceny"))) +(let ((status (snow-status --implementations "gauche,kawa,larceny"))) (test "1.1" (installed-version status '(leonardo fibonacci) 'gauche)) + (test "1.1" (installed-version status '(leonardo fibonacci) 'kawa)) (test "1.1" (installed-version status '(leonardo fibonacci) 'larceny))) (snow ,@repo3 update) -(snow ,@repo3 --implementations "gauche,larceny" +(snow ,@repo3 --implementations "gauche,kawa,larceny" install pingala.binomial) -(let ((status (snow-status --implementations "gauche,larceny"))) +(let ((status (snow-status --implementations "gauche,kawa,larceny"))) (test-assert (installed-version status '(pingala binomial) 'gauche)) (test-assert (installed-version status '(pingala factorial) 'gauche)) + (test-assert (installed-version status '(pingala binomial) 'kawa)) + (test-assert (installed-version status '(pingala factorial) 'kawa)) (test-assert (installed-version status '(pingala binomial) 'larceny)) (test-assert (installed-version status '(pingala factorial) 'larceny)))