Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -96,12 +96,12 @@
showmtesthash:
@echo $(MTESTHASH)
# removing $(GOFILES)
-dboard : dashboard.o $(MOFILES) $(MOIMPFILES)
- csc $(CSCOPTS) dashboard.o $(MOFILES) $(MOIMPFILES) -o dboard
+dboard : dashboard.o $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES)
+ csc $(CSCOPTS) dashboard.o $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard
ndboard : newdashboard.scm $(GOFILES)
csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard
mtut: $(MOFILES) megatest-fossil-hash.scm mtut.scm
@@ -210,12 +210,15 @@
mofiles/subrunmod.o \
mofiles/tasksmod.o \
mofiles/testsmod.o \
*-inc.scm
-# mofiles/dcommonmod.o \
-# mofiles/vgmod.o \
+mofiles/dcommonmod.o : \
+ mofiles/vgmod.o \
+ mofiles/treemod.o \
+ mofiles/ezstepsmod.o
+
# $(MOFILES) : mofiles/commonmod.o
megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm
echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new
if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi
@@ -378,11 +381,11 @@
clean :
rm -f $(OFILES) $(GOFILES) $(MOFILES) $(MOIMPFILES) $(TCMTOBJS) \
$(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut \
tcmt *.import.scm readline-fix.scm serialize-env dboard \
dboard.o megatest.o dashboard.o megatest-fossil-hash.* \
- altdb.scm mofiles/*.o vg.o
+ altdb.scm mofiles/*.o vg.o $(GMOIMPFILES)
rm -rf share
#======================================================================
# Make the records files
#======================================================================
Index: archive-inc.scm
==================================================================
--- archive-inc.scm
+++ archive-inc.scm
@@ -20,11 +20,11 @@
;;======================================================================
;;
;;======================================================================
-;; NOT CURRENTLY USED
+;; NOT CURRENTLY USED - commented out as it has unresolved dependencies
;;
#;(define (archive:main linktree target runname testname itempath options)
(let ((testdir (conc linktree "/" target "/" runname "/" testname "/" itempatt))
(flavor 'plain) ;; type of machine to run jobs on
(maxload 1.5) ;; max allowed load for this work
Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
cannot compute difference between binary files
Index: dcommonmod.scm
==================================================================
--- dcommonmod.scm
+++ dcommonmod.scm
@@ -17,21 +17,89 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit dcommonmod))
-(declare (uses commonmod))
+;; (declare (uses commonmod))
+(declare (uses megamod))
(module dcommonmod
*
(import scheme chicken data-structures extras)
-(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
-(import commonmod)
+(import (prefix sqlite3 sqlite3:)
+ posix typed-records srfi-18 srfi-69 format ports srfi-1
+ matchable (prefix iup iup:)
+ canvas-draw
+ ;; blindly copied from megamod
+ (prefix base64 base64:)
+ (prefix dbi dbi:)
+ (prefix nanomsg nmsg:)
+ (prefix sqlite3 sqlite3:)
+ call-with-environment-variables
+ csv
+ csv-xml
+ data-structures
+ directory-utils
+ dot-locking
+ extras
+ files
+ fmt
+ format
+ hostinfo
+ http-client
+ intarweb
+ irregex
+ matchable
+ md5
+ message-digest
+ pathname-expand
+ pkts
+ ports
+ posix
+ ;; queue
+ regex
+ regex-case
+ s11n
+ sparse-vectors
+ spiffy
+ spiffy-directory-listing
+ spiffy-request-vars
+ sql-de-lite
+ srfi-1
+ srfi-4
+ srfi-13
+ srfi-18
+ srfi-69
+ stack
+ stml2
+ tcp
+ typed-records
+ udp
+ uri-common
+ z3
+ )
+
+(use (prefix mtconfigf configf:))
+
+;; (import commonmod)
+(import megamod)
+(import canvas-draw)
+(import canvas-draw-iup)
+(use (prefix iup iup:))
+
+(define *tim* (iup:timer))
+
;; (use (prefix ulex ulex:))
(include "common_records.scm")
+(include "db_records.scm")
+(include "key_records.scm")
+(include "run_records.scm")
+(include "task_records.scm")
+(include "test_records.scm")
+(include "vg_records.scm")
(include "dcommon-inc.scm")
(include "dashboard-tests-inc.scm")
(include "vg-inc.scm")
(include "tree-inc.scm")
Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -53,11 +53,10 @@
(prefix base64 base64:)
(prefix dbi dbi:)
(prefix nanomsg nmsg:)
(prefix sqlite3 sqlite3:)
call-with-environment-variables
- canvas-draw
csv
csv-xml
data-structures
directory-utils
dot-locking
@@ -67,11 +66,10 @@
format
hostinfo
http-client
intarweb
irregex
- (prefix iup iup:)
matchable
md5
message-digest
pathname-expand
pkts
@@ -103,11 +101,11 @@
(use (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 canvas-draw-iup spiffy)
+(import spiffy)
;; (import apimod)
;; (import archivemod)
;; (import clientmod)
;; (import commonmod)
@@ -136,11 +134,11 @@
(include "db_records.scm")
(include "key_records.scm")
(include "run_records.scm")
(include "task_records.scm")
(include "test_records.scm")
-(include "vg_records.scm")
+;; (include "vg_records.scm")
;;======================================================================
;; L O C K I N G M E C H A N I S M S
;;======================================================================
@@ -150,12 +148,10 @@
;; globals
(define *writes-total-delay* 0)
(define *exit-started* #f)
(define *last-monitor-update-time* 0)
-(define *tim* (iup:timer))
-
;; The watchdog is to keep an eye on things like db sync etc.
;;
;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
(define *watchdog* (make-thread
Index: vgmod.scm
==================================================================
--- vgmod.scm
+++ vgmod.scm
@@ -17,20 +17,21 @@
;; along with Megatest. If not, see .
;;======================================================================
(declare (unit vgmod))
-(declare (uses commonmod))
-(import commonmod)
+;; (declare (uses commonmod))
+;; (import commonmod)
(module vgmod
*
(import scheme chicken data-structures extras)
(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
-(import commonmod)
+;; (import commonmod)
;; (use (prefix ulex ulex:))
-(include "common_records.scm")
-
+;; (include "common_records.scm")
+;; (include "vg_records.scm")
+;; (include "vg-inc.scm")
)