Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-03 19:26:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Sagittarius support on snow-chibi

Browse source
This commit is contained in:
retropikzel 2025-06-28 09:00:22 +03:00
parent 77a4fbd5ba
commit 16fef78ab7
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/chibi.scrbl
View file

@ -1665,6 +1665,6 @@ installed. The following are currently supported:
\item{gauche - version >= 0.9.4}
\item{kawa - version >= 2.0; you need to add the install dir to the search path, e.g. \scheme{-Dkawa.import.path=/usr/local/share/kawa}}
\item{larceny - version 0.98; you need to add "lib/Snow" to the paths in startup.sch}
\item{sagittarius - version >= 0.98}
\item{sagittarius - version >= 0.9.13}
\item{stklos - version > 2.10}
]

19
lib/chibi/snow/commands.scm
View file

@ -1407,6 +1407,10 @@
"(begin (display (getenv \"LARCENY_ROOT\")) (exit))"))
char-whitespace?)
"lib/Snow")))
((sagittarius)
(list (make-path
(process->string
'(sagittarius -I "(sagittarius)" -e "(display (car (load-path))) (exit)")))))
((stklos)
(list (make-path
(process->string
@ -1499,6 +1503,10 @@
`(larceny -r7rs -path ,(string-append install-dir ":" lib-path)
-program ,file)
`(larceny -r7rs -path ,install-dir -program ,file)))
((sagittarius)
(if lib-path
`(sagittarius -A ,install-dir -A ,lib-path ,file)
`(sagittarius -A ,install-dir ,file)))
((stklos)
(if lib-path
`(stklos -A ,install-dir -A ,lib-path ,file)
@ -1644,6 +1652,11 @@
(larceny 0 1 2 4 5 6 7 8 9 11 13 14 16 17 19 22 23 25 26 27 28 29
30 31 37 38 39 41 42 43 45 48 51 54 56 59 60 61 62 63 64
66 67 69 71 74 78 86 87 95 96 98)
(sagittarius 0 1 2 4 6 8 11 13 14 16 17 18 19 22 23 25 26 27 29 31 37 38 39
41 42 43 45 49 57 60 61 64 69 78 86 87 98 99 100 101 105 106
110 111 112 113 114 115 116 117 120 121 123 124 125 126 127
128 129 130 131 132 133 134 135 139 141 142 143 144 145 146
151 152 154 156 158 159 160 193 195 197 210 219 230)
(stklos 0 1 2 4 5 6 7 8 9 10 11 13 14 15 16 17 18 19 22 23 25 26 27 28 29
30 31 34 35 36 37 38 39 41 43 45 46 48 51 54 55 59 60 61 62 64 66
69 70 74 87 88 89 94 95 96 98 100 111 112 113 115 116 117 118 125
@ -1704,6 +1717,7 @@
((eq? impl 'cyclone) (get-install-library-dir impl cfg))
((eq? impl 'generic) (get-install-library-dir impl cfg))
((eq? impl 'guile) (get-guile-site-dir))
((eq? impl 'sagittarius) (get-install-library-dir impl cfg))
((eq? impl 'stklos) (get-install-library-dir impl cfg))
((conf-get cfg 'install-source-dir))
((conf-get cfg 'install-prefix)
@ -1715,6 +1729,7 @@
((eq? impl 'chicken) (get-install-library-dir impl cfg))
((eq? impl 'cyclone) (get-install-library-dir impl cfg))
((eq? impl 'generic) (get-install-library-dir impl cfg))
((eq? impl 'sagittarius) (get-install-library-dir impl cfg))
((eq? impl 'stklos) (get-install-library-dir impl cfg))
((conf-get cfg 'install-data-dir))
((conf-get cfg 'install-prefix)
@ -1737,6 +1752,8 @@
(car (get-install-dirs impl cfg)))
((eq? impl 'guile)
(get-guile-site-ccache-dir))
((eq? impl 'sagittarius)
(car (get-install-dirs impl cfg)))
((eq? impl 'stklos)
(car (get-install-dirs impl cfg)))
((conf-get cfg 'install-prefix)
@ -1837,6 +1854,8 @@
(library-include-files impl cfg (make-path dir library-file)))
(install-dir (get-install-source-dir impl cfg))
(install-lib-dir (get-install-library-dir impl cfg)))
;; ensure the install directory exists
(create-directory* install-dir)
;; install the library file
(let ((path (make-path install-dir dest-library-file)))
(install-directory cfg (path-directory path))

4
lib/chibi/snow/utils.scm
View file

@ -41,10 +41,10 @@
'(kawa -e "(write (features))"))))
(larceny "larceny" (larceny --version) "v0.98"
,(delay '()))
(sagittarius "sagittarius" #f #f
(sagittarius "sagittarius" (sagittarius --version) #f
,(delay
(process->sexp
'(sagittarius -I "(scheme base)" -e "(write (features))"))))
'(sagittarius -I "(scheme base)" -e "(write (features)) (exit)"))))
(stklos "stklos" (stklos --version) #f
,(delay
(process->sexp