Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -156,11 +156,17 @@ # Special dependencies for the module includes $(MOFILE) $(MOIMPFILES) : megatest-fossil-hash.scm megatest.o : $(MOIMPFILES) mofiles/commonmod.o : megatest-fossil-hash.scm -mofiles/dbmod.o mofiles/servermod.o mofiles/apimod.o mofiles/dcommonmod.o : mofiles/commonmod.o +mofiles/dbmod.o \ + mofiles/servermod.o \ + mofiles/apimod.o \ + mofiles/dcommonmod.o \ + mofiles/configfmod.o \ + mofiles/ods.o : mofiles/commonmod.o + mofiles/rmtmod.o : mofiles/apimod.o common.o : mofiles/commonmod.o # commonmod.o dashboard.o megatest.o tcmt.o apimod.o : megatest-fossil-hash.scm tests.o db.o launch.o runs.o dashboard-tests.o \ Index: common.scm ================================================================== --- common.scm +++ common.scm @@ -51,10 +51,13 @@ (import commonmod) ;; dbr:dbstruct is used here. should move it (declare (uses dbmod)) (import dbmod) + +(declare (uses configfmod)) +(import configfmod) (include "common_records.scm") ;;====================================================================== ;; (require-library margs) Index: configf.scm ================================================================== --- configf.scm +++ configf.scm @@ -113,11 +113,11 @@ " (conc (or *toppath* (get-environment-variable \"MT_RUN_AREA_HOME\"))" " (if (string-null? extra) \"\" \"/\")" " extra)))")) ((get g) (match (string-split cmd) - ((sect var)(conc "(lambda (ht)(configf:lookup ht \"" sect "\" \"" var "\"))")) + ((sect var)(conc "(lambda (ht)(configfmod#configf:lookup ht \"" sect "\" \"" var "\"))")) (else (debug:print-error 0 *default-log-port* "#{get ...} used with only one parameter, \"" cmd "\", two needed.") "(lambda (ht) #f)"))) ((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))")) ;; ((rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))")) Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -66,10 +66,11 @@ (import dbmod) ;; (declare (uses dbmod.import)) (declare (uses configfmod)) (import configfmod) +(declare (uses configfmod.import)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") Index: dcommon.scm ================================================================== --- dcommon.scm +++ dcommon.scm @@ -33,10 +33,13 @@ (declare (uses commonmod)) (import commonmod) (declare (uses dbmod)) (import dbmod) + +(declare (uses configfmod)) +(import configfmod) (declare (uses dcommonmod)) (import dcommonmod) ;; (declare (uses synchash)) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -43,14 +43,20 @@ (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)) (import commonmod) (declare (uses commonmod.import)) +(declare (uses configfmod)) +(import configfmod) +(declare (uses configfmod.import)) + (declare (uses ods)) (import ods) (declare (uses ods.import)) (declare (uses dbmod)) Index: rmt.scm ================================================================== --- rmt.scm +++ rmt.scm @@ -34,10 +34,13 @@ (import rmtmod) ;; should not be here (declare (uses dbmod)) (import dbmod) + +(declare (uses configfmod)) +(import configfmod) (include "common_records.scm") ;; (declare (uses rmtmod)) ;; (import rmtmod) Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -37,10 +37,13 @@ (declare (uses commonmod)) (import commonmod) (declare (uses dbmod)) (import dbmod) + +(declare (uses configfmod)) +(import configfmod) (include "common_records.scm") (include "db_records.scm") (define (server:make-server-url hostport) Index: tests.scm ================================================================== --- tests.scm +++ tests.scm @@ -41,10 +41,13 @@ (declare (uses commonmod)) (import commonmod) (declare (uses dbmod)) (import dbmod) + +(declare (uses configfmod)) +(import configfmod) (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm")