Kawa fixes

bash_completion.sh

@@ -18,7 +18,7 @@ _compile_scheme()
         #if [[ "$i" == "-t" ]] ; then
             #targetfound=true
         #fi
-    done
+    #done
 
     if [[ "$outputfound" == "false" ]]; then
         shortopts="${shortopts} -o"

compile-scheme.scm

@@ -8,6 +8,8 @@
             (libs library-util)
             (srfi 170))
 
+(define debug? (if (member "--debug" (command-line)) #t #f))
+
 (when (member "--help" (command-line))
   (display "For help see: man compile-scheme")
   (newline)
@@ -204,6 +206,11 @@
            r6rs?
            compilation-target)))
 
+(when debug?
+  (display "[debug] scheme-command: ")
+  (write scheme-command)
+  (newline))
+
 (define scheme-library-command
   (lambda (library-file)
     (apply (cdr (assoc 'library-command (cdr (assoc scheme data))))

libs/data.sld

@@ -282,8 +282,7 @@
                                ,(util-getenv "COMPILE_R7RS_GUILE")
                                ,(if r6rs? " --r6rs -x .sls " " --r7rs -x .sld ")
                                ,@(map (lambda (item)
-                                        (string-append " -L " item " "
+                                        (string-append " -L " item " "))
-                                                       " -L " (dirname item) " "))
                                       (append prepend-directories
                                               append-directories))
                                " -s "
@@ -353,24 +352,17 @@
                              r6rs?
                              compilation-target)
                       (apply string-append
-                             `("CLASSPATH="
+                             `(,exec-cmd
-                               ,@(map (lambda (item)
+                               " 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 --full-tailcalls"
-                                        (if (char=? (string-ref item 0) #\/)
-                                          (string-append item ":")
-                                          (string-append pwd "/" item ":")))
-                                      (append prepend-directories
-                                              append-directories))
-                               " "
-                               ,exec-cmd
-                               " 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 "
                                ,(util-getenv "COMPILE_R7RS_KAWA")
                                " -Dkawa.import.path="
                                ,@(map (lambda (item)
                                         (if (char=? (string-ref item 0) #\/)
-                                          (string-append item "/*.sld")
+                                          (string-append item "/*.sld:")
-                                          (string-append pwd "/" item "/*.sld")))
+                                          (string-append pwd "/" item "/*.sld:")))
                                       (append prepend-directories
-                                              append-directories))
+                                              append-directories
+                                              (list "/usr/local/share/kawa/lib")))
                                " -f "
                                ,script-file
                                " "