Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -95,18 +95,18 @@ all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt # why were the files mofiles/ftail.o mofiles/rmtmod.o mofiles/commonmod.o listed on this target when MOFILES are there? # Removed non module .o files (i.e. $(OFILES) mtest: readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) mofiles/ducttape-lib.o - csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest + csc megatest.o $(CSCOPTS) $(MOFILES) $(MOIMPFILES) -o mtest showmtesthash: @echo $(MTESTHASH) # removing $(GOFILES) dboard : dashboard.o $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) - csc $(CSCOPTS) dashboard.o $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard + csc dashboard.o $(CSCOPTS) $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard ndboard : newdashboard.scm $(GOFILES) csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard mtut: $(MOFILES) megatest-fossil-hash.scm mtut.scm @@ -174,11 +174,11 @@ mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm mofiles/ulex.o : ulex/ulex.scm # for the modularized stuff -mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/stml2.o +mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/stml2.o mofiles/mtargs.o mofiles/dbmod.o : mofiles/commonmod.o mofiles/keysmod.o \ mofiles/tasksmod.o mofiles/odsmod.o mofiles/commonmod.o : mofiles/processmod.o mofiles/rmtmod.o : mofiles/dbmod.o mofiles/commonmod.o \ mofiles/apimod.o mofiles/ulex.o Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -30,72 +30,62 @@ sparse-vectors srfi-18 #;(prefix mtconfigf configf:) ) (import (prefix sqlite3 sqlite3:)) -;; (declare (uses common)) -;; (declare (uses margs)) -;; (declare (uses keys)) -;; (declare (uses items)) -;; (declare (uses db)) -;; (declare (uses process)) -;; (declare (uses launch)) -;; (declare (uses runs)) -;; (declare (uses dashboard-tests)) -;; (declare (uses dashboard-guimonitor)) -;; (declare (uses tree)) -;; (declare (uses dcommon)) -;; (declare (uses dashboard-context-menu)) -;; (declare (uses vg)) -;; (declare (uses subrun)) -;; ;; (declare (uses dashboard-main)) -;; (declare (uses megatest-version)) -;; (declare (uses mt)) +(declare (uses mtargs)) +(import (prefix mtargs args:)) + +(declare (uses ducttape-lib)) +(import ducttape-lib) + +(declare (uses mtconfigf)) +(import (prefix mtconfigf configf:)) + +;; invoke the imports - ORDER IS IMPORTANT! +(declare (uses mtargs.import)) +(declare (uses ducttape-lib.import)) +(declare (uses mtconfigf.import)) (declare (uses megamod)) (import megamod) (declare (uses commonmod)) (import commonmod) + (declare (uses rmtmod)) (import rmtmod) + (declare (uses runsmod)) (import runsmod) + (declare (uses dbmod)) (import dbmod) + (declare (uses testsmod)) (import testsmod) (declare (uses dcommonmod)) (import dcommonmod) -(declare (uses mtargs)) -(import (prefix mtargs args:)) -(declare (uses ducttape-lib)) -(import ducttape-lib) -(declare (uses mtconfigf)) -(import (prefix mtconfigf configf:)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") (include "vg_records.scm") -;; invoke the imports +;; invoke the imports - ORDER IS IMPORTANT! (declare (uses commonmod.import)) (declare (uses testsmod.import)) (declare (uses rmtmod.import)) (declare (uses runsmod.import)) (declare (uses megamod.import)) (declare (uses dcommonmod.import)) -(declare (uses mtargs.import)) -(declare (uses ducttape-lib.import)) -(declare (uses mtconfigf.import)) -(configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) -(configf:add-eval-string "(import megamod)(import commonmod)") +(mtconfigf#set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) +(mtconfigf#add-eval-string "(import megamod)(import commonmod)") (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -30,12 +30,25 @@ ;; (use sparse-vectors) (require-library mutils) +(declare (uses mtargs)) +(import (prefix mtargs args:)) +(declare (uses mtconfigf)) +(import (prefix mtconfigf configf:)) +(declare (uses ducttape-lib)) +(import ducttape-lib) + +;; invoke the imports +(declare (uses mtargs.import)) +(declare (uses mtconfigf.import)) +(declare (uses ducttape-lib.import)) + (declare (uses commonmod)) (import commonmod) + (declare (uses rmtmod)) (import rmtmod) (declare (uses dbmod)) (import dbmod) (declare (uses runsmod)) @@ -42,37 +55,19 @@ (import runsmod) (declare (uses testsmod)) (import testsmod) (declare (uses megamod)) (import megamod) -(declare (uses mtargs)) -(import (prefix mtargs args:)) -(declare (uses mtconfigf)) -(import (prefix mtconfigf configf:)) -(declare (uses ducttape-lib)) -(import ducttape-lib) ;; invoke the imports (declare (uses commonmod.import)) (declare (uses testsmod.import)) (declare (uses rmtmod.import)) (declare (uses runsmod.import)) (declare (uses megamod.import)) -(declare (uses mtargs.import)) -(declare (uses mtconfigf.import)) -(declare (uses ducttape-lib.import)) - (configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) -;; (declare (uses tdb)) -;; (declare (uses mt)) -;; (declare (uses api)) -;; (declare (uses tasks)) ;; only used for debugging. -;; (declare (uses env)) -;; (declare (uses diff-report)) -;; (declare (uses ftail)) -;; (import ftail) (define *db* #f) ;; this is only for the repl, do not use in general!!!! (define *default-log-port* (current-error-port)) (include "common_records.scm") @@ -80,11 +75,11 @@ (include "db_records.scm") (include "run_records.scm") ;; (include "megatest-fossil-hash.scm") ;; included in megamod (define getenv get-environment-variable) -(configf:add-eval-string "(import megamod)(import commonmod)") +(configf:add-eval-string "(import megamod commonmod (prefix mtconfigf configf:)(prefix mtargs args:))") (define *usage-log-file* #f) ;; put path to file for logging usage in this var in the ~/.megatestrc file (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file