Index: dashboard-tests.scm ================================================================== --- dashboard-tests.scm +++ dashboard-tests.scm @@ -24,18 +24,23 @@ (declare (unit dashboard-tests)) (declare (uses common)) (declare (uses commonmod)) (declare (uses configfmod)) +(declare (uses debugprint)) +(declare (uses rmtmod)) +(declare (uses megatestmod)) +(declare (uses dbmod)) +(declare (uses dbfile)) +(declare (uses tasksmod)) + (declare (uses dcommon)) -(declare (uses db)) (declare (uses gutils)) +(declare (uses db)) (declare (uses rmt)) (declare (uses ezsteps)) (declare (uses subrun)) -(declare (uses debugprint)) -(declare (uses rmtmod)) (use format fmt) (require-library iup) (import (prefix iup iup:)) @@ -45,11 +50,16 @@ (use (prefix sqlite3 sqlite3:)) (import commonmod configfmod rmtmod - debugprint) + debugprint + megatestmod + dbmod + dbfile + tasksmod + ) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -16,23 +16,52 @@ ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see . ;; ;;====================================================================== -(declare (uses common)) (declare (uses mtargs)) (declare (uses mtargs.import)) -(declare (uses keys)) -(declare (uses items)) (declare (uses debugprint)) (declare (uses debugprint.import)) -(declare (uses db)) -(declare (uses configf)) -(declare (uses configfmod)) -(declare (uses configfmod.import)) +(declare (uses cookie)) +(declare (uses cookie.import)) +(declare (uses stml2)) +(declare (uses stml2.import)) +(declare (uses commonmod)) +(declare (uses commonmod.import)) (declare (uses processmod)) (declare (uses processmod.import)) +(declare (uses configfmod)) +(declare (uses configfmod.import)) +(declare (uses mtmod)) +(declare (uses mtmod.import)) +(declare (uses dbfile)) +(declare (uses dbfile.import)) +(declare (uses dbmod)) +(declare (uses dbmod.import)) +(declare (uses portlogger)) +(declare (uses portlogger.import)) +(declare (uses tcp-transportmod)) +(declare (uses tcp-transportmod.import)) +(declare (uses servermod)) +(declare (uses servermod.import)) +(declare (uses megatestmod)) +(declare (uses megatestmod.import)) +(declare (uses apimod)) +(declare (uses apimod.import)) +(declare (uses rmtmod)) +(declare (uses rmtmod.import)) +(declare (uses pgdb)) +(declare (uses pgdb.import)) +(declare (uses tasksmod)) +(declare (uses tasksmod.import)) + +(declare (uses configf)) +(declare (uses common)) +(declare (uses keys)) +(declare (uses items)) +(declare (uses db)) (declare (uses process)) (declare (uses launch)) (declare (uses runs)) (declare (uses dashboard-tests)) (declare (uses tree)) @@ -39,17 +68,10 @@ (declare (uses dcommon)) (declare (uses dashboard-context-menu)) (declare (uses vg)) (declare (uses subrun)) (declare (uses mt)) -(declare (uses dbmod)) -(declare (uses dbfile)) -(declare (uses dbfile.import)) -(declare (uses rmtmod)) -(declare (uses rmtmod.import)) -(declare (uses commonmod)) -(declare (uses commonmod.import)) (use format) (require-library iup) (import (prefix iup iup:)) @@ -66,11 +88,15 @@ processmod (prefix mtargs args:) dbmod dbfile rmtmod - debugprint) + debugprint + stml2 + megatestmod + tasksmod + ) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") @@ -82,10 +108,13 @@ ;; executables such as dashboard and mtutil ;; (include "dashboard-transport-mode.scm") (dbfile:db-init-proc db:initialize-main-db) (set! rmtmod:send-receive rmt:send-receive) + +;; remove when configf fully modularized +(read-config-set! configf:read-file) (debug:print-info 0 *default-log-port* "transport-mode="(rmt:transport-mode)) (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -16,25 +16,27 @@ ;; along with Megatest. If not, see . ;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') (declare (unit runs)) -(declare (uses db)) -(declare (uses common)) (declare (uses debugprint)) (declare (uses commonmod)) (declare (uses processmod)) (declare (uses configfmod)) +(declare (uses mtargs)) +(declare (uses rmtmod)) +(declare (uses dbfile)) +(declare (uses megatestmod)) + +(declare (uses db)) +(declare (uses common)) (declare (uses items)) (declare (uses runconfig)) (declare (uses tests)) (declare (uses server)) (declare (uses mt)) (declare (uses archive)) -(declare (uses mtargs)) -(declare (uses rmtmod)) -(declare (uses dbfile)) (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) posix-extras directory-utils pathname-expand typed-records format sxml-serializer sxml-modifications matchable) @@ -52,10 +54,11 @@ processmod configfmod debugprint rmtmod dbfile + megatestmod (prefix mtargs args:)) ;; use this struct to facilitate refactoring ;; Index: tests.scm ================================================================== --- tests.scm +++ tests.scm @@ -34,19 +34,21 @@ (declare (uses runconfig)) (declare (uses server)) (declare (uses mtargs)) (declare (uses rmtmod)) (declare (uses megatestmod)) +(declare (uses tasksmod)) (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking directory-utils) (import (prefix sqlite3 sqlite3:)) (import commonmod configfmod (prefix mtargs args:) debugprint rmtmod megatestmod + tasksmod ) (require-library stml) (include "common_records.scm") (include "key_records.scm") Index: utils/run-plot.sh ================================================================== --- utils/run-plot.sh +++ utils/run-plot.sh @@ -1,8 +1,8 @@ #!/bin/bash -IGNORE_UNITS=portlogger,stml2,debugprint,mtargs,ods +IGNORE_UNITS=mtargs,ods FILES=$(ls *mod.scm|grep -v import) if [[ utils/plot-uses.scm -nt utils/plot-uses ]];then oldcsc csc utils/plot-uses.scm