Index: docs/code/module-hierarchy.dot ================================================================== --- docs/code/module-hierarchy.dot +++ docs/code/module-hierarchy.dot @@ -72,19 +72,24 @@ // launchmod -> mtmod; // runsmod mtmod -> runsmod; commonmod -> runsmod; testsmod -> runsmod; + rmtmod -> runsmod; + subrunmod -> runsmod; // pgdbmod commonmod -> pgdbmod; mtconfigf -> pgdbmod; //servermod commonmod -> servermod; dbmod -> servermod; mtconfigf -> servermod; mtargs -> servermod; tasksmod -> servermod; + // subrunsmod + mtconfigf -> subrunmod; + commonmod -> subrunmod; // launchmod // commonmod -> launchmod; // rmtmod -> launchmod; // testsmod -> launchmod; // mtconfigf -> launchmod; Index: megamod.scm ================================================================== --- megamod.scm +++ megamod.scm @@ -32,16 +32,17 @@ (declare (uses mtconfigf)) (declare (uses odsmod)) (declare (uses pgdbmod)) (declare (uses pkts)) (declare (uses rmtmod)) -(declare (uses runsmod)) +(declare (uses mtmod)) (declare (uses servermod)) (declare (uses tasksmod)) (declare (uses testsmod)) (declare (uses subrunmod)) (declare (uses itemsmod)) +(declare (uses runsmod)) ;; (declare (uses archivemod)) ;; (declare (uses clientmod)) ;; (declare (uses dcommonmod)) ;; (declare (uses envmod)) ;; (declare (uses ezstepsmod)) @@ -116,23 +117,24 @@ (import (prefix mtargs args:)) ;; Order here is important! (import commonmod) (import keysmod) +(import pgdbmod) +(import tasksmod) (import dbmod) (import apimod) (import ducttape-lib) (import itemsmod) (import pkts) -(import pgdbmod) (import rmtmod) -(import runsmod) -(import servermod) -(import tasksmod) +(import mtmod) (import testsmod) +(import servermod) (import subrunmod) (import itemsmod) +(import runsmod) ;; (import archivemod) ;; (import clientmod) ;; (import dcommonmod) ;; (import envmod) ;; (import ezstepsmod) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -30,71 +30,87 @@ ;; (use sparse-vectors) (declare (uses mtargs)) (declare (uses mtconfigf)) +(declare (uses stml2)) +(declare (uses ulex)) (import (prefix mtargs args:)) (import (prefix mtconfigf configf:)) +(import cookie) +(import stml2) +(import ulex) -;; order maters +;; order matters? (declare (uses commonmod)) +(declare (uses itemsmod)) (declare (uses apimod)) (declare (uses cookie)) (declare (uses keysmod)) +(declare (uses odsmod)) (declare (uses dbmod)) +(declare (uses servermod)) (declare (uses ducttape-lib)) -(declare (uses megamod)) (declare (uses mutils)) (declare (uses pgdbmod)) (declare (uses pkts)) (declare (uses rmtmod)) +(declare (uses mtmod)) +(declare (uses subrunmod)) (declare (uses runsmod)) -(declare (uses stml2)) (declare (uses tasksmod)) (declare (uses testsmod)) -(declare (uses ulex)) +(declare (uses megamod)) (import commonmod) +(import itemsmod) (import keysmod) +(import pgdbmod) +(import tasksmod) +(import odsmod) (import dbmod) +(import servermod) (import apimod) -(import cookie) (import ducttape-lib) -(import megamod) (import mutils) -(import pgdbmod) (import pkts) (import rmtmod) -(import runsmod) -(import stml2) +(import mtmod) (import testsmod) -(import ulex) +(import subrunmod) +(import runsmod) +(import megamod) ;; NOTE: Order is important! ;; invoke the imports (declare (uses mtargs.import)) (declare (uses mtconfigf.import)) +(declare (uses cookie.import)) +(declare (uses stml2.import)) +(declare (uses ulex.import)) ;; invoke the imports (declare (uses commonmod.import)) +(declare (uses itemsmod.import)) (declare (uses keysmod.import)) +(declare (uses pgdbmod.import)) +(declare (uses tasksmod.import)) +(declare (uses odsmod.import)) (declare (uses dbmod.import)) +(declare (uses servermod.import)) (declare (uses apimod.import)) -(declare (uses cookie.import)) (declare (uses ducttape-lib.import)) -(declare (uses megamod.import)) (declare (uses mutils.import)) (declare (uses pkts.import)) -(declare (uses pgdbmod.import)) (declare (uses rmtmod.import)) -(declare (uses runsmod.import)) -(declare (uses stml2.import)) -(declare (uses tasksmod.import)) +(declare (uses mtmod.import)) (declare (uses testsmod.import)) -(declare (uses ulex.import)) +(declare (uses subrunmod.import)) +(declare (uses runsmod.import)) +(declare (uses megamod.import)) (configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) (define *db* #f) ;; this is only for the repl, do not use in general!!!!