Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-23 20:15:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #354 - Initial support for includes

Browse source 
Still needs some cleanup, but the batch compilation code now also check source files used by (include) directives.
This commit is contained in:
Justin Ethier 2020-01-10 13:41:10 -05:00
parent 192e8a094f
commit bc3ab62439
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cyclone.scm
View file

@ -48,21 +48,33 @@
;; Do we need to recompile given library? ;; Do we need to recompile given library?
(define (recompile? lib-dep append-dirs prepend-dirs) (define (recompile? lib-dep append-dirs prepend-dirs)
(let* ((sld-file (lib:import->filename lib-dep ".sld" append-dirs prepend-dirs)) (let* ((sld-file (lib:import->filename lib-dep ".sld" append-dirs prepend-dirs))
;(included-files (lib:read-includes lib-dep append-dirs prepend-dirs)) (includes (lib:read-includes lib-dep append-dirs prepend-dirs))
(included-files
(map
(lambda (include)
(lib:import->path lib-dep append-dirs prepend-dirs include))
includes))
(base (basename sld-file)) (base (basename sld-file))
(obj-file (string-append base ".o")) (obj-file (string-append base ".o"))
(sys-dir (Cyc-installation-dir 'sld)) (sys-dir (Cyc-installation-dir 'sld))
) )
; DEBUG:
;(display (list lib-dep "includes" included-files) (current-error-port))
;(newline (current-error-port))
(and (and
(not (in-subdir? sys-dir sld-file)) ;; Never try to recompile installed libraries (not (in-subdir? sys-dir sld-file)) ;; Never try to recompile installed libraries
(or (or
(not (file-exists? obj-file)) ;; No obj file, must rebuild (not (file-exists? obj-file)) ;; No obj file, must rebuild
;(any (lambda (inc-file) (any (lambda (src-file)
; TODO: do we have full path here? can we call file-mtime on the inc-file? (let ((result (> (file-mtime src-file)
; ) (file-mtime obj-file))) ;; obj file out of date
; included-files) )
(> (file-mtime sld-file) ; (when result
(file-mtime obj-file)))))) ;; obj file out of date ;(display (list "DEBUG src file newer than obj" src-file obj-file) (current-error-port))
;(newline (current-error-port)))
result))
(cons sld-file included-files))
))))
;; Is "path" under given subdirectory "dir"? ;; Is "path" under given subdirectory "dir"?
(define (in-subdir? dir path) (define (in-subdir? dir path)