Small Kawa and Sagittarius fixes
This commit is contained in:
parent
22845b2e45
commit
6a661b30fd
|
|
@ -318,13 +318,13 @@
|
||||||
4)
|
4)
|
||||||
".class "))
|
".class "))
|
||||||
library-files))))
|
library-files))))
|
||||||
`(;,(string-append "unzip -o -d . " kawa-jar-path)
|
`(,(string-append
|
||||||
,(string-append
|
|
||||||
"echo 'Main-Class: " main-class "\nClass-Path: . " classpath "' > MANIFEST.mf")
|
"echo 'Main-Class: " main-class "\nClass-Path: . " classpath "' > MANIFEST.mf")
|
||||||
,(string-append "kawa " import-paths " --main -C " input-file)
|
,(string-append "kawa " import-paths " --main -C " input-file)
|
||||||
,(string-append "jar cfm " output-jar " MANIFEST.mf " library-dirs " " main-class ".class")
|
,(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 "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 "cat " output-jar " >> " output-file)
|
||||||
|
,(string-append "rm -rf " output-jar)
|
||||||
,(string-append "chmod +x " output-file))))))
|
,(string-append "chmod +x " output-file))))))
|
||||||
(larceny
|
(larceny
|
||||||
(type . interpreter)
|
(type . interpreter)
|
||||||
|
|
@ -463,7 +463,7 @@
|
||||||
(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?)
|
||||||
(apply string-append
|
(apply string-append
|
||||||
`("sash "
|
`("sash -d "
|
||||||
,(util-getenv "COMPILE_R7RS_SAGITTARIUS")
|
,(util-getenv "COMPILE_R7RS_SAGITTARIUS")
|
||||||
,(if r6rs? " -r6 " " -r7 ")
|
,(if r6rs? " -r6 " " -r7 ")
|
||||||
,@(map (lambda (item)
|
,@(map (lambda (item)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue