Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -32,11 +32,11 @@ # portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm SRCFILES= # removed from MSRCFILES: ftail.scm # module source files -MSRCFILES = rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm configfmod.scm dbmod.scm dcommonmod.scm envmod.scm ezstepsmod.scm itemsmod.scm keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm vgmod.scm megamod.scm +MSRCFILES = rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm dbmod.scm dcommonmod.scm envmod.scm ezstepsmod.scm itemsmod.scm keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm vgmod.scm megamod.scm # Eggs to install (straightforward ones) EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \ @@ -53,11 +53,11 @@ MOIMPFILES = $(MSRCFILES:%.scm=%.import.o) %.import.o : %.import.scm csc -unit $*.import -c $*.import.scm -o $*.import.o -mofiles/%.o : %.scm mofiles +mofiles/%.o : %.scm mkdir -p mofiles csc $(CSCOPTS) -J -c $< -o mofiles/$*.o # a.import.o : a.import.scm a.o # csc -unit a.import -c a.import.scm -o $*.o @@ -179,21 +179,20 @@ # for the modularized stuff mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/dbmod.o : mofiles/commonmod.o mofiles/keysmod.o mofiles/tasksmod.o mofiles/odsmod.o -mofiles/commonmod.o : mofiles/configfmod.o mofiles/processmod.o +mofiles/commonmod.o : mofiles/processmod.o mofiles/rmtmod.o : mofiles/dbmod.o mofiles/commonmod.o mofiles/apimod.o mofiles/apimod.o : mofiles/megamod.o mofiles/dbmod.o # Removed from megamod.o dep: mofiles/ftail.o mofiles/megamod.o : \ mofiles/rmtmod.o \ mofiles/commonmod.o \ mofiles/apimod.o \ mofiles/archivemod.o \ mofiles/clientmod.o \ - mofiles/configfmod.o \ mofiles/dbmod.o \ mofiles/dcommonmod.o \ mofiles/envmod.o \ mofiles/ezstepsmod.o \ mofiles/itemsmod.o \ Index: commonmod.scm ================================================================== --- commonmod.scm +++ commonmod.scm @@ -17,11 +17,10 @@ ;; along with Megatest. If not, see . ;;====================================================================== (declare (unit commonmod)) -(declare (uses configfmod)) (declare (uses processmod)) (module commonmod * @@ -31,11 +30,10 @@ srfi-69 ports regex-case regex hostinfo srfi-4 pkts (prefix dbi dbi:) stack) -(import configfmod) (import processmod) (import stml2) (include "common_records.scm") (include "megatest-fossil-hash.scm") Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -34,11 +34,10 @@ ;; (declare (uses common)) ;; (declare (uses margs)) ;; (declare (uses keys)) ;; (declare (uses items)) ;; (declare (uses db)) -;; (declare (uses configf)) ;; (declare (uses process)) ;; (declare (uses launch)) ;; (declare (uses runs)) ;; (declare (uses dashboard-tests)) ;; (declare (uses dashboard-guimonitor)) @@ -66,11 +65,13 @@ (include "run_records.scm") (include "task_records.scm") (include "megatest-fossil-hash.scm") (include "vg_records.scm") +(configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) (configf:add-eval-string "(import megamod)") + (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright (C) Matt Welland 2012-2017 @@ -117,11 +118,10 @@ args:arg-hash 0)) ;; (set! *functions* dbmod#*functions*) ;; (set! apimod#*functions* dbmod#*functions*) -;; (set! configfmod#*functions* dbmod#*functions*) (include "migrate-fix.scm") ;; check for MT_* environment variables and exit if found (if (not (args:get-arg "-test")) Index: dbmod.scm ================================================================== --- dbmod.scm +++ dbmod.scm @@ -18,11 +18,10 @@ ;;====================================================================== (declare (unit dbmod)) (declare (uses commonmod)) -(declare (uses configfmod)) (declare (uses keysmod)) (declare (uses tasksmod)) (declare (uses odsmod)) (module dbmod @@ -32,11 +31,10 @@ (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable stack regex srfi-13 stack) (import commonmod) -(import configfmod) (import keysmod) (import files) (import tasksmod) (import odsmod) Index: keysmod.scm ================================================================== --- keysmod.scm +++ keysmod.scm @@ -18,18 +18,16 @@ ;;====================================================================== (declare (unit keysmod)) (declare (uses commonmod)) -(declare (uses configfmod)) (module keysmod * (import scheme chicken data-structures extras) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) (import commonmod) -(import configfmod) ;; (use (prefix ulex ulex:)) (import srfi-13) (include "common_records.scm") Index: megamod.scm ================================================================== --- megamod.scm +++ megamod.scm @@ -26,11 +26,10 @@ ;; ;; (declare (uses rmtmod)) ;; (declare (uses commonmod)) ;; (declare (uses apimod)) ;; (declare (uses archivemod)) ;; (declare (uses clientmod)) -;; (declare (uses configfmod)) ;; (declare (uses dbmod)) ;; (declare (uses dcommonmod)) ;; (declare (uses envmod)) ;; (declare (uses ezstepsmod)) ;; (declare (uses itemsmod)) @@ -106,16 +105,14 @@ (define find-and-read-config configf:find-and-read-config) (define config:eval-string-in-environment configf:eval-string-in-environment) (import canvas-draw-iup spiffy) - ;; (import apimod) ;; (import archivemod) ;; (import clientmod) ;; (import commonmod) -;; (import configfmod) ;; (import dbmod) ;; (import dcommonmod) ;; (import envmod) ;; (import ezstepsmod) ;; (import ftail) @@ -173,11 +170,10 @@ (include "api-inc.scm") (include "archive-inc.scm") (include "client-inc.scm") (include "common-inc.scm") -;; (include "configf-inc.scm") (include "db-inc.scm") (include "dcommon-inc.scm") (include "dashboard-tests-inc.scm") (include "env-inc.scm") (include "ezsteps-inc.scm") Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -52,12 +52,10 @@ (import commonmod) (declare (uses rmtmod)) (import rmtmod) (declare (uses dbmod)) (import dbmod) -;; (declare (uses configfmod)) -;; (import configfmod) (declare (uses megamod)) (import megamod) ;; invoke the imports (declare (uses megamod.import)) Index: mtut.scm ================================================================== --- mtut.scm +++ mtut.scm @@ -23,20 +23,20 @@ (define (toplevel-command . a) #f) (use srfi-1 posix srfi-69 readline ;; regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras) srfi-19 srfi-18 extras format pkts regex regex-case (prefix dbi dbi:) - nanomsg) + nanomsg (prefix mtconfigf configf:)) ;; (declare (uses common)) ;; (declare (uses megatest-version)) ;; (declare (uses margs)) -(declare (uses configfmod)) +;; (declare (uses configfmod)) (declare (uses commonmod)) (declare (uses megamod)) (import commonmod) -(import configfmod) +;; (import configfmod) (import megamod) ;; (declare (uses rmt)) (use ducttape-lib)