Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -29,13 +29,12 @@
CSCOPTS=
INSTALL=install
SRCFILES = runconfig.scm \
server.scm keys.scm \
runs.scm \
- mt.scm \
ezsteps.scm api.scm \
- subrun.scm archive.scm env.scm
+ archive.scm env.scm
# cgisetup/models/pgdb.scm
# module source files
MSRCFILES = dbfile.scm debugprint.scm mtargs.scm commonmod.scm dbmod.scm \
@@ -43,11 +42,11 @@
configfmod.scm processmod.scm servermod.scm megatestmod.scm \
stml2.scm fsmod.scm cpumod.scm mtmod.scm odsmod.scm \
pkts.scm testsmod.scm pgdb.scm cookie.scm launchmod.scm \
subrunmod.scm runsmod.scm tasksmod.scm archivemod.scm \
ezstepsmod.scm mtbody.scm envmod.scm genexample.scm mutils.scm \
- diff-report.scm tdb.scm vgmod.scm dcommon.scm dashboard-tests.scm
+ diff-report.scm tdb.scm vgmod.scm dcommon.scm
transport-mode.scm : transport-mode.scm.template
cp transport-mode.scm.template transport-mode.scm
dashboard-transport-mode.scm : dashboard-transport-mode.scm.template
@@ -93,12 +92,11 @@
# ftail.scm rmtmod.scm commonmod.scm removed
# MSRCFILES = ducttape-lib.scm pkts.scm stml2.scm cookie.scm mutils.scm \
# mtargs.scm commonmod.scm dbmod.scm adjutant.scm ulex.scm \
# rmtmod.scm apimod.scm
-GUISRCF = dashboard-context-menu.scm \
- dashboard-guimonitor.scm
+GUISRCF = dashboard-guimonitor.scm
OFILES = $(SRCFILES:%.scm=%.o)
GOFILES = $(GUISRCF:%.scm=%.o)
MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
@@ -172,11 +170,10 @@
# runs.o \
# server.o \
# tasks.o \
# tdb.o \
# tests.o \
-# subrun.o \
# ezsteps.o
#
# # mofiles/rmtmod.o \
# # mofiles/commonmod.o \
#
@@ -209,15 +206,15 @@
# mofiles/dbmod.o : mofiles/configfmod.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 \
-dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o \
+tests.o db.o launch.o runs.o \
+dashboard-guimonitor.o dashboard-main.o \
monitor.o dashboard.o archive.o megatest.o : db_records.scm megatest-fossil-hash.scm
-tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm
+tests.o runs.o dashboard.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
db.o api.o : mofiles/dbmod.o mofiles/dbfile.o mofiles/debugprint.o mofiles/commonmod.o dbmod.import.o
tests.o tasks.o dashboard-tasks.o : task_records.scm
@@ -228,11 +225,11 @@
# make $(MOIMPFILES)
# touch mofiles-made
megatest.o : megatest-fossil-hash.scm megatest-version.scm $(MOFILES) $(MOIMPFILES)
-common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm dcommon.scm ezsteps.scm index-tree.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm : common_records.scm megatest-version.scm
+common.scm configf.scm dashboard-guimonitor.scm dashboard.scm dcommon.scm ezsteps.scm index-tree.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm : common_records.scm megatest-version.scm
common_records.scm : altdb.scm
mofiles/dbfile.o : mofiles/commonmod.o
DELETED dashboard-context-menu.scm
Index: dashboard-context-menu.scm
==================================================================
--- dashboard-context-menu.scm
+++ /dev/null
@@ -1,53 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2012, 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 dashboard-context-menu))
-;; (declare (uses commonmod))
-;; (declare (uses configfmod))
-;; (declare (uses rmtmod))
-;; (declare (uses ezsteps))
-;; (declare (uses subrun))
-;; (declare (uses testsmod))
-;; (declare (uses subrunmod))
-;; (declare (uses megatestmod))
-;;
-;; (use format fmt)
-;; (require-library iup)
-;; (import (prefix iup iup:))
-;;
-;; (use canvas-draw)
-;;
-;; (use srfi-1 posix regex regex-case srfi-69)
-;; (use (prefix sqlite3 sqlite3:))
-;;
-;; ;; (include "common_records.scm")
-;; ;; (include "db_records.scm")
-;; ;; (include "run_records.scm")
-;;
-;; (import commonmod
-;; configfmod
-;; rmtmod
-;; testsmod
-;; subrunmod
-;; debugprint
-;; megatestmod
-;; )
-;;
-;;
DELETED dashboard-tests.scm
Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ /dev/null
@@ -1,71 +0,0 @@
-;;======================================================================
-;; Copyright 2006-2012, 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 .
-
-;;======================================================================
-
-;;======================================================================
-;; Test info panel
-;;======================================================================
-
-(declare (unit dashboard-tests))
-(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 testsmod))
-
-(declare (uses dcommon))
-(declare (uses ezsteps))
-(declare (uses subrun))
-(declare (uses runsmod))
-(declare (uses subrunmod))
-
-(module dashboard-tests
- *
-
-(import scheme
- chicken
- format fmt
- iup
- (prefix iup iup:)
- canvas-draw
- srfi-1 posix regex regex-case srfi-69
- (prefix sqlite3 sqlite3:)
-
- commonmod
- configfmod
- rmtmod
- debugprint
- megatestmod
- dbmod
- dbfile
- tasksmod
- testsmod
- runsmod
- subrunmod
- )
-
-;; (include "common_records.scm")
-;; (include "db_records.scm")
-;; (include "run_records.scm")
-
-)
Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -68,16 +68,12 @@
(declare (uses launchmod.import))
(declare (uses keys))
(declare (uses runs))
-(declare (uses dashboard-tests))
(declare (uses dcommon))
-(declare (uses dashboard-context-menu))
(declare (uses vgmod))
-(declare (uses subrun))
-(declare (uses mt))
(use format)
(require-library iup)
(import (prefix iup iup:))
Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -73,11 +73,10 @@
(declare (uses runsmod))
(declare (uses ezstepsmod))
(declare (uses launchmod))
(declare (uses tdb))
-(declare (uses mt))
(declare (uses api))
(declare (uses env))
(declare (uses diff-report))
(declare (uses runs))
(declare (uses server))
DELETED mt.scm
Index: mt.scm
==================================================================
--- mt.scm
+++ /dev/null
@@ -1,54 +0,0 @@
-;; Copyright 2006-2013, 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 .
-;;
-
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils
- call-with-environment-variables)
-
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit mt))
-(declare (uses debugprint))
-;; (declare (uses common))
-(declare (uses commonmod))
-(declare (uses configfmod))
-
-(declare (uses runconfig))
-(declare (uses server))
-(declare (uses runs))
-(declare (uses rmtmod))
-(declare (uses megatestmod))
-
-(import debugprint
- commonmod
- configfmod
- rmtmod
- megatestmod)
-
-;; make mt: calls in megatestmod work
-;; (read-config-set! read-config)
-
-;; (include "common_records.scm")
-;; (include "key_records.scm")
-;; (include "db_records.scm")
-(include "run_records.scm")
-;; (include "test_records.scm")
-
-;; This is the Megatest API. All generally "useful" routines will be wrapped or extended
-;; here.
-
Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -33,11 +33,10 @@
;; (declare (uses common))
(declare (uses runconfig))
(declare (uses server))
-(declare (uses mt))
(declare (uses archive))
(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)
DELETED subrun.scm
Index: subrun.scm
==================================================================
--- subrun.scm
+++ /dev/null
@@ -1,39 +0,0 @@
-
-;; Copyright 2006-2016, 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 .
-
-;; strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(declare (unit subrun))
-
-(declare (uses debugprint))
-(declare (uses commonmod))
-(declare (uses configfmod))
-(declare (uses tasksmod))
-
-(declare (uses mt))
-;; (declare (uses common))
-
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18)
- posix-extras directory-utils pathname-expand typed-records format
- call-with-environment-variables)
-
-(import commonmod
- configfmod
- debugprint
- tasksmod)
-
Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -22,13 +22,11 @@
;; Database access
;;======================================================================
(declare (unit tdb))
(declare (uses debugprint))
-;; (declare (uses common))
(declare (uses keys))
-(declare (uses mt))
(declare (uses commonmod))
(declare (uses mtargs))
(declare (uses rmtmod))
(module tdb