Fixing kawa install rules and adding to tests.

This commit is contained in:
Alex Shinn 2015-04-11 01:21:38 +09:00
parent d1537fec79
commit 579fcf95ae
2 changed files with 14 additions and 6 deletions

View file

@ -1025,7 +1025,12 @@
`(guile -L ,install-dir -L ,lib-path ,file) `(guile -L ,install-dir -L ,lib-path ,file)
`(guile -L ,install-dir ,file))) `(guile -L ,install-dir ,file)))
((kawa) ((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) ((larceny)
(if lib-path (if lib-path
`(larceny -r7rs -path ,(string-append install-dir ":" lib-path) `(larceny -r7rs -path ,(string-append install-dir ":" lib-path)
@ -1136,7 +1141,7 @@
(define (get-library-extension impl cfg) (define (get-library-extension impl cfg)
(or (conf-get cfg 'library-extension) (or (conf-get cfg 'library-extension)
(case impl (case impl
((gauche) "scm") ((gauche kawa) "scm")
(else "sld")))) (else "sld"))))
(define (install-with-sudo? cfg path) (define (install-with-sudo? cfg path)

View file

@ -150,18 +150,21 @@
(test-assert (installed-version status '(pingala factorial) 'foment))) (test-assert (installed-version status '(pingala factorial) 'foment)))
(snow ,@repo2 update) (snow ,@repo2 update)
(snow ,@repo2 --implementations "gauche,larceny" (snow ,@repo2 --implementations "gauche,kawa,larceny"
install leonardo.fibonacci) 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) 'gauche))
(test "1.1" (installed-version status '(leonardo fibonacci) 'kawa))
(test "1.1" (installed-version status '(leonardo fibonacci) 'larceny))) (test "1.1" (installed-version status '(leonardo fibonacci) 'larceny)))
(snow ,@repo3 update) (snow ,@repo3 update)
(snow ,@repo3 --implementations "gauche,larceny" (snow ,@repo3 --implementations "gauche,kawa,larceny"
install pingala.binomial) 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 binomial) 'gauche))
(test-assert (installed-version status '(pingala factorial) '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 binomial) 'larceny))
(test-assert (installed-version status '(pingala factorial) 'larceny))) (test-assert (installed-version status '(pingala factorial) 'larceny)))