Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -33,12 +33,12 @@
configfmod.scm commonmod.scm dbmod.scm rmtmod.scm \
debugprint.scm mtver.scm csv-xml.scm servermod.scm \
hostinfo.scm adjutant.scm processmod.scm testsmod.scm \
itemsmod.scm keysmod.scm mtmod.scm rmtmod.scm \
tasksmod.scm pgdb.scm launchmod.scm runsmod.scm \
- http-transportmod.scm portloggermod.scm clientmod.scm \
- archivemod.scm ezstepsmod.scm subrunmod.scm bigmod.scm
+ portloggermod.scm clientmod.scm archivemod.scm \
+ ezstepsmod.scm subrunmod.scm bigmod.scm testsmod.scm
GUISRCF = dashboard-context-menu.scm dashboard-tests.scm \
dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm \
vg.scm
@@ -61,12 +61,12 @@
mofiles/apimod.o : mofiles/servermod.o
mofiles/apimod.o : mofiles/tasksmod.o
mofiles/archivemod.o : mofiles/launchmod.o
mofiles/archivemod.o : mofiles/servermod.o
mofiles/bigmod.o : mofiles/configfmod.o
-mofiles/bigmod.o : mofiles/rmtmod.o
mofiles/bigmod.o : mofiles/dbmod.o
+mofiles/bigmod.o : mofiles/rmtmod.o
mofiles/clientmod.o : mofiles/servermod.o
mofiles/commonmod.o : mofiles/configfmod.o
mofiles/commonmod.o : mofiles/debugprint.o
mofiles/commonmod.o : mofiles/hostinfo.o
mofiles/commonmod.o : mofiles/itemsmod.o
@@ -80,24 +80,21 @@
mofiles/dbmod.o : mofiles/csv-xml.o
mofiles/dbmod.o : mofiles/keysmod.o
mofiles/dbmod.o : mofiles/mtmod.o
mofiles/ezstepsmod.o : mofiles/rmtmod.o
mofiles/ezstepsmod.o : mofiles/subrunmod.o
-mofiles/http-transportmod.o : mofiles/dbmod.o
-mofiles/http-transportmod.o : mofiles/portloggermod.o
mofiles/keysmod.o : mofiles/debugprint.o
mofiles/launchmod.o : mofiles/bigmod.o
mofiles/launchmod.o : mofiles/ezstepsmod.o
mofiles/launchmod.o : mofiles/rmtmod.o mofiles/servermod.o
mofiles/mtmod.o : mofiles/debugprint.o
mofiles/portloggermod.o : mofiles/tasksmod.o
mofiles/rmtmod.o : mofiles/apimod.o
-mofiles/rmtmod.o : mofiles/commonmod.o mofiles/http-transportmod.o
+mofiles/rmtmod.o : mofiles/commonmod.o mofiles/portloggermod.o
mofiles/rmtmod.o : mofiles/itemsmod.o mofiles/clientmod.o
mofiles/runsmod.o : mofiles/rmtmod.o mofiles/archivemod.o
mofiles/servermod.o : mofiles/commonmod.o
-mofiles/servermod.o : mofiles/http-transportmod.o
mofiles/stml2.o : mofiles/cookie.o mofiles/dbi.o
mofiles/tasksmod.o : mofiles/pgdb.o mofiles/dbmod.o
mofiles/testsmod.o : mofiles/commonmod.o
mofiles/testsmod.o : mofiles/itemsmod.o mofiles/rmtmod.o mofiles/tasksmod.o
Index: clientmod.scm
==================================================================
--- clientmod.scm
+++ clientmod.scm
@@ -20,11 +20,10 @@
(declare (unit clientmod))
(declare (uses commonmod))
(declare (uses debugprint))
(declare (uses configfmod))
-(declare (uses http-transportmod))
(declare (uses servermod))
(module clientmod
*
@@ -52,11 +51,10 @@
srfi-69
commonmod
debugprint
configfmod
- http-transportmod
servermod
)
;;======================================================================
DELETED http-transportmod.scm
Index: http-transportmod.scm
==================================================================
--- http-transportmod.scm
+++ /dev/null
@@ -1,91 +0,0 @@
-;;======================================================================
-;; Copyright 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 .
-
-;;======================================================================
-
-(declare (unit http-transportmod))
-(declare (uses debugprint))
-(declare (uses commonmod))
-(declare (uses configfmod))
-(declare (uses mtargs))
-(declare (uses mtver))
-(declare (uses dbmod))
-(declare (uses stml2))
-(declare (uses portloggermod))
-(declare (uses pkts))
-
-(module http-transportmod
- *
-
-(import scheme
- (prefix sqlite3 sqlite3:)
- chicken.base
- chicken.condition
- chicken.file
- chicken.file.posix
- chicken.format
- chicken.io
- chicken.pathname
- chicken.port
- chicken.pretty-print
- chicken.process
- chicken.process-context
- chicken.process-context.posix
- chicken.sort
- chicken.string
- chicken.time
- chicken.time.posix
- chicken.tcp
-
- (prefix base64 base64:)
- directory-utils
- matchable
- md5
- message-digest
- regex
- s11n
- srfi-1
- srfi-13
- srfi-18
- srfi-69
- stack
- system-information
- typed-records
- z3
- spiffy
- uri-common
- intarweb
- http-client
- spiffy-request-vars
- intarweb
- spiffy-directory-listing
-
- (prefix mtargs args:)
- commonmod
- configfmod
- debugprint
- mtver
- dbmod
- stml2
- portloggermod
- pkts
-
- )
-
-
-)
Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -33,11 +33,10 @@
(declare (uses dbmod))
(declare (uses dbi))
(declare (uses debugprint))
(declare (uses ducttape-lib))
(declare (uses ezstepsmod))
-(declare (uses http-transportmod))
(declare (uses launchmod))
(declare (uses mtargs))
(declare (uses mtver))
(declare (uses mutils))
(declare (uses processmod))
@@ -54,11 +53,10 @@
(declare (uses configfmod.import))
(declare (uses bigmod.import))
(declare (uses dbmod.import))
(declare (uses rmtmod.import))
(declare (uses servermod.import))
-(declare (uses http-transportmod.import))
;; (include "call-with-environment-variables/call-with-environment-variables.scm")
(module megatest-main
*
@@ -149,11 +147,10 @@
commonmod
configfmod
dbmod
debugprint
ezstepsmod
- http-transportmod
launchmod
processmod
rmtmod
runsmod
servermod
@@ -2490,11 +2487,10 @@
commonmod
configfmod
dbmod
debugprint
ezstepsmod
- http-transportmod
launchmod
processmod
rmtmod
runsmod
servermod
Index: rmtmod.scm
==================================================================
--- rmtmod.scm
+++ rmtmod.scm
@@ -17,23 +17,24 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit rmtmod))
+
+(declare (uses apimod))
+(declare (uses clientmod))
(declare (uses commonmod))
(declare (uses configfmod))
-(declare (uses apimod))
-(declare (uses itemsmod))
+(declare (uses dbmod))
(declare (uses debugprint))
+(declare (uses itemsmod))
+(declare (uses mtargs))
(declare (uses mtver))
-(declare (uses tasksmod))
(declare (uses pgdb))
-(declare (uses mtargs))
-(declare (uses dbmod))
-(declare (uses http-transportmod))
+(declare (uses portloggermod))
(declare (uses servermod))
-(declare (uses clientmod))
+(declare (uses tasksmod))
(module rmtmod
*
(import scheme
@@ -84,11 +85,10 @@
clientmod
commonmod
configfmod
dbmod
debugprint
- http-transportmod
itemsmod
mtver
pgdb
pkts
portloggermod
Index: servermod.scm
==================================================================
--- servermod.scm
+++ servermod.scm
@@ -20,11 +20,10 @@
(declare (unit servermod))
(declare (uses commonmod))
(declare (uses debugprint))
(declare (uses configfmod))
-(declare (uses http-transportmod))
(declare (uses pkts))
(module servermod
*
@@ -52,11 +51,10 @@
srfi-69
commonmod
debugprint
configfmod
- http-transportmod
pkts
)
#;(define (server:make-server-url hostport)
Index: testsmod.scm
==================================================================
--- testsmod.scm
+++ testsmod.scm
@@ -23,11 +23,10 @@
(declare (uses debugprint))
(declare (uses commonmod))
(declare (uses configfmod))
(declare (uses itemsmod))
(declare (uses rmtmod))
-(declare (uses http-transportmod))
(declare (uses stml2))
(declare (uses dbmod))
(declare (uses tasksmod))
(module testsmod
@@ -77,11 +76,10 @@
(prefix mtargs args:)
commonmod
pkts
itemsmod
rmtmod
- http-transportmod
configfmod
stml2
dbmod
tasksmod