Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -128,18 +128,18 @@ ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") PNGFILES = $(shell cd docs/manual;ls *png) -mtest: megatest.scm $(MOFILES) $(MOIMPFILES) +mtest: megatest.scm $(MOFILES) $(MOIMPFILES) megatest-fossil-hash.scm csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.scm -o mtest showmtesthash: @echo $(MTESTHASH) -dboard : $(OFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) megatest-fossil-hash.scm - csc $(CSCOPTS) $(OFILES) dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard +dboard : dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) megatest-fossil-hash.scm + csc -k $(CSCOPTS) $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) dashboard.scm -o dboard mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut # include makefile.inc Index: commonmod.scm ================================================================== --- commonmod.scm +++ commonmod.scm @@ -470,10 +470,11 @@ bdat-task-db-set! bdat-time-to-exit-set! bdat-watchdog-set! bdat-task-db-set! +bdat-target-set! make-launch:einf launch:einf-pid launch:einf-exit-status launch:einf-exit-code Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -28,11 +28,11 @@ (declare (uses configfmod)) (declare (uses dashboard-context-menu)) (declare (uses dashboard-tests)) (declare (uses dbmod)) (declare (uses dcommon)) -(declare (uses debugprint.import)) +;; (declare (uses debugprint.import)) (declare (uses itemsmod)) (declare (uses launchmod)) (declare (uses mtargs)) (declare (uses mtmod)) (declare (uses mtver)) @@ -43,29 +43,57 @@ (declare (uses tree)) (declare (uses vgmod)) (declare (uses testsmod)) (declare (uses tasksmod)) +;; needed for configf scripts, scheme etc. +;; (declare (uses apimod.import)) +;; (declare (uses debugprint.import)) +;; (declare (uses mtargs.import)) +;; (declare (uses commonmod.import)) +;; (declare (uses configfmod.import)) +;; (declare (uses bigmod.import)) +;; (declare (uses dbmod.import)) +;; (declare (uses rmtmod.import)) +;; ;; (declare (uses servermod.import)) +;; (declare (uses launchmod.import)) ;; (declare (uses dashboard-guimonitor)) ;; (declare (uses dashboard-main)) (module dashboard * -(import (prefix iup iup:)) -(import canvas-draw) -(import canvas-draw-iup) - -(import ducttape-lib - bigmod) - -(import (prefix sqlite3 sqlite3:) - srfi-1 +(import scheme + chicken.base + chicken.bitwise + chicken.condition + chicken.eval + chicken.file chicken.file.posix - chicken.string + chicken.format + chicken.io + chicken.irregex + chicken.pathname + chicken.port + chicken.pretty-print + chicken.process chicken.process-context chicken.process-context.posix + chicken.process.signal + chicken.random + chicken.repl + chicken.sort + chicken.string + chicken.tcp + chicken.time + chicken.time.posix + + (prefix iup iup:) + canvas-draw + canvas-draw-iup + (prefix sqlite3 sqlite3:) + srfi-1 regex regex-case srfi-69 typed-records sparse-vectors format srfi-4 @@ -78,31 +106,33 @@ ;; (include "task_records.scm") ;; (include "megatest-version.scm") (include "megatest-fossil-hash.scm") ;; (include "vg_records.scm") -(import debugprint - commonmod +(import (prefix mtargs args:) ;; gutils + bigmod + commonmod configfmod + dashboard-context-menu + dashboard-tests dbmod + dcommon + debugprint itemsmod launchmod - (prefix mtargs args:) mtmod mtver processmod - runsmod rmtmod + runsmod subrunmod - vgmod - dcommon + tasksmod + testsmod tree - dashboard-context-menu - dashboard-tests - testsmod - tasksmod + vgmod + ducttape-lib ) (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " @@ -3633,11 +3663,11 @@ ;;====================================================================== ;; The heavy lifting starts here ;;====================================================================== -(define (main) +(define (dashboard-main) (let ((mtdb-path (conc *toppath* "/megatest.db"))) ;; #;(if (and (common:file-exists? mtdb-path) (file-writable? mtdb-path)) (if (not (args:get-arg "-skip-version-check")) (common:exit-on-version-changed))) @@ -3697,18 +3727,27 @@ (dboard:common-run-curr-updaters commondat 0) ;; force update of summary tab ) "update buttons once")) (th2 (make-thread iup:main-loop "Main loop"))) (thread-start! th2) (thread-join! th2))))) + +(define (get-debugcontrolf) + (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc"))) + (if (common:file-exists? debugcontrolf) + debugcontrolf + #f))) + +(define (main) + (if (args:get-arg "-repl") + (repl) + (dashboard-main))) + ) (import dashboard) ;; ease debugging by loading ~/.dashboardrc -(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc"))) - (if (common:file-exists? debugcontrolf) - (load debugcontrolf))) +(let ((debugcontrolf (get-debugcontrolf))) + (load debugcontrolf)) -(if (args:get-arg "-repl") - (repl) - (main)) +(main) Index: megatest.config ================================================================== --- megatest.config +++ megatest.config @@ -15,13 +15,15 @@ # You should have received a copy of the GNU General Public License # along with Megatest. If not, see . ## commented out due to a bug in v1.6501 in mtutil [fields] -## a text -## b text -## c text +a text +b text +c text + +[default] usercode .mtutil.scm areafilter area-to-run targtrans generic-target-translator runtrans generic-runname-translator