1
0
Fork 0

Kawa fixes

This commit is contained in:
retropikzel 2025-10-23 06:30:13 +03:00
parent 9661a5a6a4
commit 461cac6d4d
1 changed files with 137 additions and 109 deletions

View File

@ -237,31 +237,59 @@
(string-append "-I \"" item "\" ")) (string-append "-I \"" item "\" "))
append-directories)))))) append-directories))))))
(kawa (kawa
(type . interpreter) (type . compiler)
(command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?) (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)
(apply string-append (set! append-directories
`(,"sh" (append append-directories
,(string #\newline) (list "/usr/local/share/kawa/lib")))
"filename=\"$(basename ${0})\"" (let* ((output-jar (string-append output-file ".jar"))
,(string #\newline) (main-class
"tmpfile=\"/tmp/kawa.${filename}\"" (string-append (string-cut-from-end (path->filename input-file)
,(string #\newline) 4)))
"tail -n+8 \"${0}\" > \"${tmpfile}\"" (kawa-jar-path "/usr/local/share/kawa/lib/kawa.jar")
,(string #\newline) (classpath
"kawa -J--add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED -J--enable-native-access=ALL-UNNAMED -J--enable-preview -Dkawa.import.path=" (string-append
,(apply string-append kawa-jar-path " "
(map (apply
(lambda (item) string-append
(string-append item "/*.sld:")) (map (lambda (dir)
(string-append dir " "))
(append prepend-directories append-directories)))))
(import-paths
(apply
string-append
`("-Dkawa.import.path="
,@(map (lambda (dir)
(string-append dir "/*.sld:"))
(append prepend-directories append-directories))
"*.sld")))
(library-dirs (apply string-append
(append (map (lambda (item)
(string-append item " "))
(append prepend-directories (append prepend-directories
append-directories))) append-directories)))))
" --r7rs --full-tailcalls " (class-files
" -f \"${tmpfile}\" \"$@\"" (apply
,(string #\newline) string-append
"rm -rf \"${tmpfile}\"" (map
,(string #\newline) (lambda (lib)
"exit" (string-append
,(string #\newline)))))) (string-cut-from-end
(search-library-file (append prepend-directories
append-directories)
lib)
4)
".class "))
library-files))))
`(,(string-append "rm -rf " output-jar)
,(string-append
"echo 'Main-Class: " main-class "\nClass-Path: . " classpath "' > MANIFEST.mf")
,(string-append "kawa " import-paths " --main -C " input-file)
,(string-append "jar cfm " output-jar " MANIFEST.mf " library-dirs " " main-class ".class")
,(string-append "printf '#!/bin/sh\nMYSELF=$(which \"$0\" 2>/dev/null)\n[ $? -gt 0 -a -f \"$0\" ] && MYSELF=\"./$0\"\njava=java\nif test -n \"$JAVA_HOME\"; then\n java=\"$JAVA_HOME/bin/java\"\nfi\nexec \"$java\" --add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED --add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED --add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED --enable-native-access=ALL-UNNAMED --enable-preview -jar $MYSELF \"$@\"\nexit 1\n' > " output-file)
,(string-append "cat " output-jar " >> " output-file)
,(string-append "rm -rf " output-jar)
,(string-append "chmod +x " output-file))))))
(larceny (larceny
(type . interpreter) (type . interpreter)
(command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?) (command . ,(lambda (input-file output-file prepend-directories append-directories library-files r6rs?)