Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -26,13 +26,13 @@
SHELL=/bin/bash
PREFIX=$(PWD)
CSCOPTS=
INSTALL=install
-SRCFILES = launch.scm runconfig.scm \
- server.scm configf.scm keys.scm \
- process.scm runs.scm \
+SRCFILES = runconfig.scm \
+ server.scm keys.scm \
+ runs.scm \
mt.scm \
ezsteps.scm api.scm \
subrun.scm archive.scm env.scm
# cgisetup/models/pgdb.scm
@@ -80,11 +80,10 @@
mofiles/debugprint.o mofiles/commonmod.o mofiles/configfmod.o
mofiles/apimod.o : mofiles/commonmod.o mofiles/tcp-transportmod.o mofiles/configfmod.o mofiles/megatestmod.o
mofiles/dbmod.o : mofiles/dbfile.o
mofiles/api.o : mofiles/apimod.o
mofiles/commonmod.o : mofiles/debugprint.o mofiles/stml2.o
-configf.o : commonmod.import.o
mofiles/dbfile.o : mofiles/debugprint.o
mofiles/rmtmod.o mofiles/dbmod.o : mofiles/dbfile.o mofiles/commonmod.o mofiles/debugprint.o
db.o : mofiles/dbmod.o mofiles/dbfile.o
mofiles/debugprint.o : mofiles/mtargs.o
mofiles/tcp-transportmod.o : mofiles/portlogger.o
@@ -95,11 +94,11 @@
# 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 tree.scm
+ dashboard-guimonitor.scm
OFILES = $(SRCFILES:%.scm=%.o)
GOFILES = $(GUISRCF:%.scm=%.o)
MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
@@ -229,11 +228,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 tree.scm : common_records.scm megatest-version.scm
+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_records.scm : altdb.scm
mofiles/dbfile.o : mofiles/commonmod.o
DELETED configf.scm
Index: configf.scm
==================================================================
--- configf.scm
+++ /dev/null
@@ -1,52 +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 .
-
-;;======================================================================
-
-;;======================================================================
-;; Config file handling
-;;======================================================================
-
-(use regex regex-case matchable) ;; directory-utils)
-(declare (unit configf))
-(declare (uses process))
-(declare (uses env))
-(declare (uses keys))
-(declare (uses debugprint))
-(declare (uses mtargs))
-(declare (uses mtargs.import))
-;; (declare (uses common))
-(declare (uses commonmod))
-(declare (uses commonmod.import))
-(declare (uses processmod))
-(declare (uses processmod.import))
-(declare (uses configfmod))
-(declare (uses configfmod.import))
-(declare (uses dbfile))
-(declare (uses dbfile.import))
-(declare (uses dbmod))
-(declare (uses dbmod.import))
-(declare (uses mtmod))
-(declare (uses mtmod.import))
-(declare (uses megatestmod))
-(declare (uses megatestmod.import))
-
-;; (include "configf-guts.scm")
-
-;; (define shell configfmod#shell)
-;; (print (runconfigs-get *configdat* "testing"))
Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -65,19 +65,14 @@
(declare (uses runsmod))
(declare (uses runsmod.import))
(declare (uses launchmod))
(declare (uses launchmod.import))
-(declare (uses configf))
-;; (declare (uses common))
(declare (uses keys))
-(declare (uses process))
-(declare (uses launch))
(declare (uses runs))
(declare (uses dashboard-tests))
-(declare (uses tree))
(declare (uses dcommon))
(declare (uses dashboard-context-menu))
(declare (uses vgmod))
(declare (uses subrun))
(declare (uses mt))
Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -35,11 +35,11 @@
(declare (uses tasksmod))
(declare (uses dbfile))
(declare (uses servermod))
;; needed but dunno why
-(use iup canvas-draw)
+(use iup canvas-draw fmt)
(module dcommon
*
(import scheme
DELETED launch.scm
Index: launch.scm
==================================================================
--- launch.scm
+++ /dev/null
@@ -1,67 +0,0 @@
-
-;; Copyright 2006-2017, 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 .
-
-;;======================================================================
-;; launch a task - this runs on the originating host, tests themselves
-;;
-;;======================================================================
-
-(declare (unit launch))
-(declare (uses subrun))
-;; (declare (uses common))
-(declare (uses debugprint))
-(declare (uses commonmod))
-(declare (uses processmod))
-(declare (uses configfmod))
-(declare (uses configf))
-(declare (uses rmtmod))
-(declare (uses ezsteps))
-;; (declare (uses dbmod))
-(declare (uses dbfile))
-(declare (uses dbmod))
-(declare (uses mtargs))
-(declare (uses mtmod))
-(declare (uses megatestmod))
-(declare (uses tasksmod))
-
-(use regex regex-case base64 sqlite3 srfi-18 directory-utils posix posix-extras z3
- call-with-environment-variables csv hostinfo
- typed-records pathname-expand matchable)
-
-(import (prefix base64 base64:)
- (prefix sqlite3 sqlite3:)
- (prefix mtargs args:)
-)
-
-;; (include "common_records.scm")
-;; (include "key_records.scm")
-;; (include "db_records.scm")
-(include "megatest-fossil-hash.scm")
-
-(import commonmod
- processmod
- configfmod
- rmtmod
- debugprint
- dbmod
- dbfile
- mtmod
- megatestmod
- tasksmod
- )
-
Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -78,11 +78,10 @@
(declare (uses mt))
(declare (uses api))
(declare (uses env))
(declare (uses diff-report))
(declare (uses runs))
-(declare (uses launch))
(declare (uses server))
(declare (uses genexample))
(declare (uses mtbody))
(import csi)
Index: mtexec.scm
==================================================================
--- mtexec.scm
+++ mtexec.scm
@@ -27,11 +27,10 @@
(prefix dbi dbi:)
)
;; (declare (uses common))
(declare (uses mtargs))
-(declare (uses configf))
(declare (uses commonmod))
(declare (uses configfmod))
(import commonmod
configfmod
Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -23,11 +23,10 @@
(declare (uses debugprint.import))
(declare (uses commonmod))
(declare (uses commonmod.import))
(declare (uses configfmod))
(declare (uses configfmod.import))
-(declare (uses configf))
(declare (uses rmtmod))
(declare (uses rmtmod.import))
(include "megatest-version.scm")
DELETED process.scm
Index: process.scm
==================================================================
--- process.scm
+++ /dev/null
@@ -1,32 +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 .
-
-;;======================================================================
-
-;;======================================================================
-;; Process convience utils
-;;======================================================================
-
-(use regex directory-utils)
-(declare (unit process))
-(declare (uses debugprint))
-(declare (uses processmod))
-
-(import debugprint
- processmod)
-
Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -21,20 +21,21 @@
;; (declare (uses common))
(declare (uses debugprint))
(declare (uses commonmod))
(declare (uses configfmod))
(declare (uses rmtmod))
-(declare (uses launch))
+(declare (uses launchmod))
(declare (uses mtargs))
(use (srfi 18) extras s11n)
(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
(use directory-utils posix-extras matchable utils)
(use spiffy uri-common intarweb http-client spiffy-request-vars)
(import commonmod
configfmod
+ launchmod
debugprint
(prefix mtargs args:))
;; (include "common_records.scm")
;; (include "db_records.scm")
DELETED tree.scm
Index: tree.scm
==================================================================
--- tree.scm
+++ /dev/null
@@ -1,46 +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 .
-;;
-;;======================================================================
-
-(declare (unit tree))
-;; (declare (uses mtargs))
-;; (declare (uses debugprint))
-;; (declare (uses launch))
-;; (declare (uses gutils))
-;; (declare (uses server))
-;; (declare (uses dcommon))
-;;
-;;
-;; (use format)
-;; (require-library iup)
-;; (import (prefix iup iup:))
-;; (use canvas-draw)
-;;
-;; (use sqlite3 srfi-1 posix regex regex-case srfi-69)
-;; (import (prefix sqlite3 sqlite3:))
-;;
-;; (import (prefix mtargs args:)
-;; debugprint)
-;;
-;; ;; (include "megatest-version.scm")
-;; ;; (include "common_records.scm")
-;; ;; (include "db_records.scm")
-;; ;; (include "key_records.scm")
-;;
-;;