Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -29,11 +29,11 @@
MSRCFILES = dbmod.scm rmtmod.scm commonmod.scm apimod.scm \
archivemod.scm clientmod.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 \
-pkts.scm megamod.scm
+pkts.scm mtargs.scm mtconfigf.scm ducttape-lib.scm megamod.scm
GMSRCFILES = dcommonmod.scm vgmod.scm treemod.scm
# Eggs to install (straightforward ones)
@@ -87,17 +87,17 @@
PNGFILES = $(shell cd docs/manual;ls *png)
#all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
-IMPORTO = apimod.import.o dbmod.import.o itemsmod.import.o \
-odsmod.import.o runsmod.import.o testsmod.import.o \
-archivemod.import.o keysmod.import.o processmod.import.o \
-servermod.import.o clientmod.import.o envmod.import.o \
-launchmod.import.o rmtmod.import.o subrunmod.import.o \
-commonmod.import.o ezstepsmod.import.o megamod.import.o \
-runconfigmod.import.o tasksmod.import.o pkts.import.o
+# IMPORTO = apimod.import.o dbmod.import.o itemsmod.import.o \
+# odsmod.import.o runsmod.import.o testsmod.import.o \
+# archivemod.import.o keysmod.import.o processmod.import.o \
+# servermod.import.o clientmod.import.o envmod.import.o \
+# launchmod.import.o rmtmod.import.o subrunmod.import.o \
+# commonmod.import.o ezstepsmod.import.o megamod.import.o \
+# runconfigmod.import.o tasksmod.import.o pkts.import.o
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)
@@ -175,22 +175,41 @@
#
# $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
# csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
+#======================================================================
# Special dependencies for the includes
+#======================================================================
+
tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o \
archive.o megatest.o : db_records.scm migrate-fix.scm
+
tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm
+
db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
+
tests.o tasks.o dashboard-tasks.o : task_records.scm
+
runs.o : test_records.scm
+
megatest.o : megatest-fossil-hash.scm
+
rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm
+
common_records.scm : altdb.scm
+
vg.o dashboard.o : vg_records.scm mofiles/dcommonmod.o
+
dcommon.o : run_records.scm migrate-fix.scm
+
+# special include based modules
+mofiles/pkts.o : pkts/pkts.scm
+mofiles/mtargs.o : mtargs/mtargs.scm
+mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm
+mofile/ducttape-lib.o : ducttape/ducttape-lib.scm
+
# Temporary while transitioning to new routine
# runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm
# for the modularized stuff
@@ -219,10 +238,13 @@
mofiles/servermod.o \
mofiles/subrunmod.o \
mofiles/tasksmod.o \
mofiles/testsmod.o \
mofiles/pkts.o \
+ mofiles/mtargs.o \
+ mofiles/mtconfigf.o \
+ mofiles/ducttape-lib.o \
*-inc.scm
mofiles/dcommonmod.o : \
mofiles/vgmod.o \
mofiles/treemod.o \
ADDED ducttape-lib.scm
Index: ducttape-lib.scm
==================================================================
--- /dev/null
+++ ducttape-lib.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;;
+;; This file is part of Megatest.
+;;
+;; Megatest is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; Megatest is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Megatest. If not, see .
+
+;;======================================================================
+
+(declare (unit ducttape-lib))
+
+(include "ducttape/ducttape-lib.scm")
Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -42,10 +42,13 @@
;; (declare (uses subrunmod))
;; (declare (uses tasksmod))
;; (declare (uses testsmod))
;; (declare (uses vgmod))
(declare (uses pkts))
+(declare (uses mtargs))
+(declare (uses mtconfigf))
+(declare (uses ducttape-lib))
(module megamod
*
(import scheme chicken data-structures extras)
@@ -96,11 +99,11 @@
udp
uri-common
z3
)
-(use (prefix mtconfigf configf:))
+(import (prefix mtconfigf configf:))
(define read-config configf:read-config)
(define find-and-read-config configf:find-and-read-config)
(define config:eval-string-in-environment configf:eval-string-in-environment)
(import spiffy)
@@ -126,10 +129,12 @@
;; (import subrunmod)
;; (import tasksmod)
;; (import testsmod)
;; (import vgmod)
(import pkts)
+(import (prefix mtargs args:))
+(import ducttape-lib)
(use (prefix ulex ulex:))
(include "common_records.scm")
(include "db_records.scm")
@@ -172,11 +177,11 @@
(include "env-inc.scm")
(include "http-transport-inc.scm")
(include "items-inc.scm")
(include "keys-inc.scm")
(include "launch-inc.scm") ;; L1
-(include "margs-inc.scm")
+;; (include "margs-inc.scm")
(include "mt-inc.scm")
(include "ods-inc.scm") ;; L1
(include "pgdb-inc.scm")
(include "portlogger-inc.scm")
(include "process-inc.scm") ;; L6
ADDED mtargs.scm
Index: mtargs.scm
==================================================================
--- /dev/null
+++ mtargs.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;;
+;; This file is part of Megatest.
+;;
+;; Megatest is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; Megatest is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Megatest. If not, see .
+
+;;======================================================================
+
+(declare (unit mtargs.scm))
+
+(include "mtargs/mtargs.scm")
ADDED mtconfigf.scm
Index: mtconfigf.scm
==================================================================
--- /dev/null
+++ mtconfigf.scm
@@ -0,0 +1,23 @@
+;;======================================================================
+;; Copyright 2019, Matthew Welland.
+;;
+;; This file is part of Megatest.
+;;
+;; Megatest is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; Megatest is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with Megatest. If not, see .
+
+;;======================================================================
+
+(declare (unit mtconfigf))
+
+(include "mtconfigf/mtconfigf.scm")