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

Clean up the code, build both .so and o

Browse source
This commit is contained in:
retropikzel 2025-06-28 09:52:21 +03:00
parent cd48e9973a
commit 48ca9f9a5f
3 changed files with 29 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1375,8 +1375,8 @@
char-whitespace?))))) char-whitespace?)))))
(list (or dir "/usr/local/share/cyclone/")))) (list (or dir "/usr/local/share/cyclone/"))))
((gambit) ((gambit)
(list (string-append (get-environment-variable "HOME") (list (make-path (get-environment-variable "HOME")
"/.gambit_userlib"))) ".gambit_userlib")))
((generic) ((generic)
(list (make-path (or (conf-get cfg 'install-prefix) (list (make-path (or (conf-get cfg 'install-prefix)
(cond-expand (windows (get-environment-variable "LOCALAPPDATA")) (cond-expand (windows (get-environment-variable "LOCALAPPDATA"))
@ -1915,44 +1915,17 @@
(define (gambit-installer impl cfg library dir) (define (gambit-installer impl cfg library dir)
(let* ((library-file (get-library-file cfg library)) (let* ((library-file (get-library-file cfg library))
(o-file (path-replace-extension library-file "so")) (install-dir (get-install-library-dir impl cfg))
(ext (get-library-extension impl cfg)) (so-path (string-append (path-strip-extension library-file) ".so"))
(dest-library-file (dest-so-path (make-path install-dir so-path))
(string-append (library->path cfg library) "." ext)) (o-path (string-append (path-strip-extension library-file) ".o"))
(dest-o-file (dest-o-path (make-path install-dir o-path)))
(string-append (library->path cfg library) ".so")) (install-directory cfg (path-directory dest-so-path))
(include-files (install-file cfg (make-path dir so-path) dest-so-path)
(library-include-files impl cfg (make-path dir library-file))) (install-file cfg (make-path dir o-path) dest-o-path)
(install-dir (get-install-source-dir impl cfg)) (cons dest-o-path
(install-lib-dir (get-install-library-dir impl cfg))) (cons dest-so-path
;; install the library file (default-installer impl cfg library dir)))))
(let ((path (make-path install-dir dest-library-file))
(o-path (make-path install-dir dest-o-file)))
(install-directory cfg (path-directory path))
(install-file cfg (make-path dir library-file) path)
(install-file cfg (make-path dir o-file) o-path)
;; install any includes
(cons
path
(append
(map
(lambda (x)
(let ((dest-file (make-path install-dir (path-relative x dir))))
(install-directory cfg (path-directory dest-file))
(install-file cfg x dest-file)
dest-file))
include-files)
(map
(lambda (x)
(let* ((so-file (string-append x (cond-expand (macosx ".dylib")
(else ".so"))))
(dest-file (make-path install-lib-dir
(path-relative so-file dir))))
(install-directory cfg (path-directory dest-file))
(install-file cfg so-file dest-file)
dest-file))
(library-shared-include-files
impl cfg (make-path dir library-file))))))))
(define (guile-installer impl cfg library dir) (define (guile-installer impl cfg library dir)
(let* ((source-scm-file (get-library-file cfg library)) (let* ((source-scm-file (get-library-file cfg library))
@ -2178,22 +2151,25 @@
(let* ((library-file (get-library-file cfg library)) (let* ((library-file (get-library-file cfg library))
(src-library-file (make-path dir library-file)) (src-library-file (make-path dir library-file))
(library-dir (path-directory src-library-file)) (library-dir (path-directory src-library-file))
(dest-library-file (string-append (library->path cfg library) ".so")) (dest-so-file (string-append (library->path cfg library) ".so"))
(dest-dir (path-directory (make-path dir dest-library-file)))) (dest-o-file (string-append (library->path cfg library) ".o"))
(dest-dir (path-directory (make-path dir dest-so-file))))
;; ensure the build directory exists ;; ensure the build directory exists
(create-directory* dest-dir) (create-directory* dest-dir)
(with-directory (with-directory
dir dir
(lambda () (lambda ()
(let ((res (system 'gsc (let ((res (system 'gsc '-o dest-so-file '-dynamic src-library-file)))
'-o dest-library-file
'-dynamic
src-library-file)))
(and (or (and (pair? res) (zero? (cadr res))) (and (or (and (pair? res) (zero? (cadr res)))
(yes-or-no? cfg "gambit failed to build: " (yes-or-no? cfg "gambit failed to build .so file: "
(library-name library) (library-name library)
" - install anyway?")) " - install anyway?"))
library)))))) (let ((res (system 'gsc '-o dest-o-file '-obj src-library-file)))
(and (or (and (pair? res) (zero? (cadr res)))
(yes-or-no? cfg "gambit failed to build .o file: "
(library-name library)
" - install anyway?"))
library))))))))
(define (guile-builder impl cfg library dir) (define (guile-builder impl cfg library dir)
(let* ((library-file (get-library-file cfg library)) (let* ((library-file (get-library-file cfg library))

BIN
tmptest
View file

Binary file not shown.

4
tmptest.scm
View file

@ -1,4 +0,0 @@
(import (scheme base)
(retropikzel hello))
(hello)