Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -26,14 +26,12 @@
SHELL=/bin/bash
PREFIX=$(PWD)
CSCOPTS=
INSTALL=install
-SRCFILES = runconfig.scm \
- server.scm keys.scm \
- ezsteps.scm \
- archive.scm env.scm
+SRCFILES = server.scm \
+ env.scm
pgdb.scm : cgisetup/models/pgdb.scm
# module source files
MSRCFILES = dbfile.scm debugprint.scm mtargs.scm commonmod.scm dbmod.scm \
@@ -91,11 +89,10 @@
endif
ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
PNGFILES = $(shell cd docs/manual;ls *png)
-
mtest: $(OFILES) readline-fix.scm $(MOFILES) $(MOIMPFILES) megatest.o megatest-version.scm
csc $(CSCOPTS) $(OFILES) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest
showmtesthash:
DELETED archive.scm
Index: archive.scm
==================================================================
--- archive.scm
+++ /dev/null
@@ -1,37 +0,0 @@
-;; Copyright 2006-2014, 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 <http://www.gnu.org/licenses/>.
-;;
-
-;; strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(declare (unit archive))
-(declare (uses debugprint))
-(declare (uses mtargs))
-;; (declare (uses common))
-(declare (uses commonmod))
-(declare (uses configfmod))
-(declare (uses rmtmod))
-
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69
- format md5 message-digest srfi-18)
-
-(import commonmod
- configfmod
- debugprint
- rmtmod
- (prefix mtargs args:))
-
Index: configf-guts.scm
==================================================================
--- configf-guts.scm
+++ configf-guts.scm
@@ -20,44 +20,10 @@
;;======================================================================
;; 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))
-;;
-;; (import commonmod
-;; configfmod
-;; processmod
-;; (prefix mtargs args:)
-;; debugprint
-;; mtmod
-;; )
-;;
-;; (include "common_records.scm")
-
(define configf:imports "(import commonmod configfmod processmod (prefix mtargs args:))")
(define (configf:process-line l ht allow-system #!key (linenum #f))
(let loop ((res l))
Index: dashboard-guimonitor.scm
==================================================================
--- dashboard-guimonitor.scm
+++ dashboard-guimonitor.scm
@@ -30,12 +30,10 @@
(use sqlite3 srfi-1 posix regex regex-case srfi-69)
(import (prefix sqlite3 sqlite3:))
(declare (unit dashboard-guimonitor))
-;; (declare (uses common))
-(declare (uses keys))
(declare (uses commonmod))
(import commonmod)
(include "run_records.scm")
Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -65,12 +65,10 @@
(declare (uses runsmod))
(declare (uses runsmod.import))
(declare (uses launchmod))
(declare (uses launchmod.import))
-(declare (uses keys))
-
(declare (uses dcommon))
(declare (uses vgmod))
(use format)
DELETED ezsteps.scm
Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ /dev/null
@@ -1,43 +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 <http://www.gnu.org/licenses/>.
-;;
-
-;; strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(declare (unit ezsteps))
-(declare (uses commonmod))
-;; (declare (uses common))
-(declare (uses configfmod))
-(declare (uses debugprint))
-
-(declare (uses runconfig))
-(declare (uses rmtmod))
-(declare (uses mtargs))
-(declare (uses tasksmod))
-
-(use srfi-1 posix regex srfi-69 directory-utils call-with-environment-variables posix-extras
- z3 csv typed-records pathname-expand matchable)
-
-(import commonmod
- configfmod
- debugprint
- rmtmod
- (prefix mtargs args:)
- tasksmod
- )
-
DELETED keys.scm
Index: keys.scm
==================================================================
--- keys.scm
+++ /dev/null
@@ -1,38 +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 <http://www.gnu.org/licenses/>.
-;;
-
-;;======================================================================
-;; Run keys, these are used to hierarchially organise tests and run areas
-;;======================================================================
-
-(declare (unit keys))
-;; (declare (uses common))
-(declare (uses debugprint))
-(declare (uses commonmod))
-(declare (uses configfmod))
-(declare (uses mtargs))
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:)
- (prefix mtargs args:))
-
-(import commonmod
- configfmod
- debugprint)
-
DELETED monitor.scm
Index: monitor.scm
==================================================================
--- monitor.scm
+++ /dev/null
@@ -1,34 +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 <http://www.gnu.org/licenses/>.
-
-;; strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking)
-(import (prefix sqlite3 sqlite3:))
-
-(declare (unit runs))
-;; (declare (uses common))
-
-(declare (uses runconfig))
-(declare (uses commonmod))
-(import commonmod)
-
-;; (include "common_records.scm")
-;; (include "key_records.scm")
-;; (include "db_records.scm")
-(include "run_records.scm")
-
DELETED runconfig.scm
Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ /dev/null
@@ -1,34 +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 <http://www.gnu.org/licenses/>.
-
-;;======================================================================
-;; read a config file, loading only the section pertinent
-;; to this run field1val/field2val/field3val ...
-;;======================================================================
-
-(use format directory-utils)
-
-(declare (unit runconfig))
-;; (declare (uses common))
-(declare (uses debugprint))
-(declare (uses commonmod))
-
-(import commonmod
- debugprint)
-
-;; (include "common_records.scm")
-
Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -22,11 +22,10 @@
;; Database access
;;======================================================================
(declare (unit tdb))
(declare (uses debugprint))
-(declare (uses keys))
(declare (uses commonmod))
(declare (uses mtargs))
(declare (uses rmtmod))
(module tdb