Merging and fixing

This commit is contained in:
retropikzel 2025-06-27 07:52:47 +03:00
commit af5dd96347
2 changed files with 21 additions and 12 deletions

View file

@ -1400,14 +1400,14 @@
"/usr/local/share/guile/")))) "/usr/local/share/guile/"))))
((mosh) ((mosh)
(with-output-to-file (with-output-to-file
"/tmp/mosh-helper" (string-append (cond-expand (windows (get-environment-variable "TMP"))
(else "/tmp"))
"/snowmosh")
(lambda () (lambda ()
(display "(import (scheme base) (scheme write) (mosh config)) (display (get-config \"library-path\")) (newline)") (display "(import (scheme base) (scheme write) (mosh config))")
(newline))) (newline)
(list (display "(display (get-config \"library-path\"))")))
(string-append (list (string-append (symbol->string (process->sexp '(mosh /tmp/snowmosh)))
(string-trim (process->string '(mosh "/tmp/mosh-helper"))
char-whitespace?)
"/lib"))) "/lib")))
((larceny) ((larceny)
(list (list
@ -1508,7 +1508,7 @@
((mosh) ((mosh)
(if lib-path (if lib-path
`(mosh --loadpath= ,install-dir --loadpath= ,lib-path ,file) `(mosh --loadpath= ,install-dir --loadpath= ,lib-path ,file)
`(guile --loadpath= ,install-dir ,file))) `(mosh --loadpath= ,install-dir ,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)

View file

@ -39,8 +39,17 @@
,(delay ,(delay
(process->sexp (process->sexp
'(kawa -e "(write (features))")))) '(kawa -e "(write (features))"))))
(mosh "mosh" #f #f (mosh "mosh" (mosh -v) #f
,(delay (write-string "mosh\n"))) ,(delay
(let ((tmpfile (string-append (cond-expand (windows (get-environment-variable "TMP"))
(else "/tmp"))
"/snowmosh")))
(with-output-to-file
tmpfile
(lambda ()
(display "(import (scheme base) (scheme write) (mosh config)) (display (features))")))
(process->sexp
`(mosh ,tmpfile)))))
(larceny "larceny" (larceny --version) "v0.98" (larceny "larceny" (larceny --version) "v0.98"
,(delay '())) ,(delay '()))
(sagittarius "sagittarius" #f #f (sagittarius "sagittarius" #f #f