Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -497,13 +497,15 @@ fi portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o mofiles/margsmod.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o mofiles/tasks.o tdb.o tests.o tree.o csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o launch.o lock-queue.o mofiles/margsmod.o mt.o mofiles/portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o mofiles/tasks.o tdb.o tests.o tree.o -# create a pdf dot graphviz diagram from notations in rmt.scm -rmt.pdf : rmt.scm - grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf +%.pdf : %.dot + dot -Tpdf $*.dot -o $*.pdf + +all.dot all-inc.dot : *.scm + gendeps all *.scm buildmanual: cd docs/manual && make wikipage=plan Index: api.scm ================================================================== --- api.scm +++ api.scm @@ -20,19 +20,6 @@ ;; ;;====================================================================== (use srfi-69 posix) -(declare (unit api)) -(declare (uses rmt)) -(declare (uses db)) -(declare (uses tasks)) - -(declare (uses commonmod)) -(import commonmod) - -(declare (uses apimod)) -(import apimod) - -(declare (uses dbmod)) -(import dbmod) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -31,25 +31,21 @@ (declare (uses launch)) (declare (uses server)) (declare (uses client)) (declare (uses tests)) (declare (uses genexample)) -;; (declare (uses daemon)) (declare (uses db)) -;; (declare (uses dcommon)) (declare (uses tdb)) (declare (uses mt)) -(declare (uses api)) + (declare (uses tasks)) ;; only used for debugging. (import tasks) (declare (uses tasks.import)) (declare (uses env)) (declare (uses diff-report)) -;; (declare (uses ftail)) -;; (import ftail) ;; Needed for repl even if not used here in megatest.scm ;; ORDER MATTERS! (declare (uses commonmod)) Index: rmt.scm ================================================================== --- rmt.scm +++ rmt.scm @@ -19,32 +19,5 @@ ;;====================================================================== (use format typed-records) ;; RADT => purpose of json format?? (declare (unit rmt)) -(declare (uses api)) -(declare (uses http-transport)) - -(declare (uses commonmod)) -(import commonmod) - -(declare (uses apimod)) -(import apimod) - -(declare (uses rmtmod)) -(import rmtmod) - -;; should not be here -(declare (uses dbmod)) -(import dbmod) - -(declare (uses configfmod)) -(import configfmod) - -(declare (uses servermod)) -(import servermod) - -(include "common_records.scm") -;; (declare (uses rmtmod)) - -;; (import rmtmod) - Index: utils/gendeps.scm ================================================================== --- utils/gendeps.scm +++ utils/gendeps.scm @@ -25,11 +25,11 @@ (with-output-to-port p (lambda () (apply print args)))) (define modules-without-mod - "(ods|transport|portlogger)") + "(ods|transport|portlogger|tasks|pgdb)") (define (mofiles-adjust->dot-o inf) (regex-case inf ("^.*mod$" _ (conc "mofiles/"inf".o")) @@ -82,23 +82,23 @@ (print "Found module "modname) (hash-table-set! moduledata modname sname)) (importuse (_ importname) (print "Found import "importname) (hh-push incldata importname sname)) - (mofiles-adjust->dot-o usingname))) (else #f)) (loop (read-line))))))))) files) (hash-table-for-each incldata (lambda (impname snames) (for-each (lambda (sname) (if (hash-table-exists? moduledata impname) - (make-inc-entry incport incdotport sname impname) - (print "No module file found for import " impname) - )) + (if (hash-table-exists? incldata sname) + (make-inc-entry incport incdotport sname impname) + (print "Skipping module "sname", it is not used by any other modules")) + (print "No module file found for import " impname))) snames))) (portprint dotport "}") (portprint incdotport "}") (close-output-port dotport) (close-output-port incport)