Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -36,16 +36,19 @@ itemsmod.scm keysmod.scm mtmod.scm rmtmod.scm \ tasksmod.scm pgdb.scm launchmod.scm runsmod.scm \ portloggermod.scm archivemod.scm ezstepsmod.scm \ subrunmod.scm bigmod.scm testsmod.scm -GUISRCF = dashboard-tests.scm vgmod.scm \ - dashboard-guimonitor.scm tree.scm +GUISRCF = -GUIMODFILES = dashboard-context-menu.scm dcommon.scm gutils.scm +GUIMODFILES = tree.scm dashboard-tests.scm vgmod.scm \ + dashboard-context-menu.scm dcommon.scm gutils.scm + +# dashboard-guimonitor.scm mofiles/dashboard-context-menu.o : mofiles/dcommon.o +mofiles/dashboard-tests.o : mofiles/dcommon.o mofiles/dcommon.o : mofiles/gutils.o OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) @@ -52,10 +55,11 @@ MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) GMOFILES = $(addprefix mofiles/,$(GUIMODFILES:%.scm=%.o)) # compiled import files MOIMPFILES = $(MSRCFILES:%.scm=%.import.o) +GMOIMPFILES = $(GUIMODFILES:%.scm=%.import.o) %.import.o : %.import.scm csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o mofiles/%.o : %.scm @@ -130,12 +134,12 @@ csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.scm -o mtest showmtesthash: @echo $(MTESTHASH) -dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) megatest-fossil-hash.scm - csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) $(GMOFILES) -o dboard +dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) megatest-fossil-hash.scm + csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut # include makefile.inc Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -16,22 +16,21 @@ ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see . ;; ;;====================================================================== -(import format) - (declare (uses ducttape-lib)) (declare (uses bigmod)) (declare (uses debugprint)) (declare (uses commonmod)) (declare (uses configfmod)) (declare (uses dashboard-context-menu)) -(declare (uses dashboard-guimonitor)) +;; (declare (uses dashboard-guimonitor)) (declare (uses dashboard-tests)) (declare (uses dbmod)) (declare (uses dcommon)) +(declare (uses gutils)) (declare (uses itemsmod)) (declare (uses launchmod)) (declare (uses mtmod)) (declare (uses mtargs)) (declare (uses mtver)) @@ -41,10 +40,11 @@ (declare (uses tree)) (declare (uses vgmod)) (declare (uses bigmod.import)) (declare (uses debugprint.import)) ;; (declare (uses dashboard-main)) + (import (prefix iup iup:)) (import canvas-draw) ;; (import canvas-draw-iup) @@ -57,11 +57,12 @@ chicken.file.posix chicken.string chicken.process-context regex regex-case srfi-69 typed-records - sparse-vectors) + sparse-vectors + format) ;; (include "common_records.scm") ;; (include "db_records.scm") ;; (include "run_records.scm") @@ -82,10 +83,12 @@ processmod runsmod subrunmod vgmod dcommon + gutils + tree dashboard-context-menu dashboard-tests) (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest Index: tree.scm ================================================================== --- tree.scm +++ tree.scm @@ -16,20 +16,10 @@ ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see . ;; ;;====================================================================== -(import format) -;; (import iup) -(import (prefix iup iup:)) -(import canvas-draw) - -(import sqlite3 srfi-1 - chicken.file.posix - regex regex-case srfi-69) -(import (prefix sqlite3 sqlite3:)) - (declare (unit tree)) (declare (uses mtargs)) (declare (uses mtver)) (declare (uses launchmod)) ;; (declare (uses megatest-version)) @@ -37,15 +27,33 @@ (declare (uses dbmod)) (declare (uses servermod)) ;; (declare (uses synchash)) (declare (uses dcommon)) +(module tree + * + +(import scheme + chicken.base + chicken.string + chicken.file.posix + ) + +(import format + srfi-13 + (prefix iup iup:) + canvas-draw + sqlite3 + srfi-1 + regex regex-case srfi-69 + (prefix sqlite3 sqlite3:)) + (import mtver launchmod dbmod servermod - ) + gutils) ;; (include "megatest-version.scm") ;; (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") @@ -162,5 +170,7 @@ (dboard:data-curr-run-id-set! data run-id) (dashboard:update-run-summary-tab))) ;; (print "path: " (tree:node->path obj id) " run-id: " run-id) )))) |# + +)