Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -32,12 +32,13 @@ # portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm SRCFILES= # removed from MSRCFILES: ftail.scm # module source files -MSRCFILES = rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm dbmod.scm dcommonmod.scm envmod.scm ezstepsmod.scm itemsmod.scm keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm vgmod.scm treemod.scm megamod.scm +MSRCFILES = rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm envmod.scm ezstepsmod.scm itemsmod.scm keysmod.scm launchmod.scm odsmod.scm processmod.scm runconfigmod.scm runsmod.scm servermod.scm subrunmod.scm tasksmod.scm testsmod.scm megamod.scm +GMSRCFILES = dbmod.scm dcommonmod.scm vgmod.scm treemod.scm # Eggs to install (straightforward ones) EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \ json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \ @@ -49,10 +50,14 @@ GOFILES = $(GUISRCF:%.scm=%.o) MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) # compiled import files MOIMPFILES = $(MSRCFILES:%.scm=%.import.o) + +GMOFILES = $(addprefix mofiles/,$(GMSRCFILES:%.scm=%.o)) +# compiled import files +GMOIMPFILES = $(GMSRCFILES:%.scm=%.import.o) %.import.o : %.import.scm csc -unit $*.import -c $*.import.scm -o $*.import.o mofiles/%.o : %.scm @@ -190,11 +195,10 @@ mofiles/commonmod.o \ mofiles/apimod.o \ mofiles/archivemod.o \ mofiles/clientmod.o \ mofiles/dbmod.o \ - mofiles/dcommonmod.o \ mofiles/envmod.o \ mofiles/ezstepsmod.o \ mofiles/itemsmod.o \ mofiles/keysmod.o \ mofiles/launchmod.o \ @@ -204,13 +208,14 @@ mofiles/runsmod.o \ mofiles/servermod.o \ mofiles/subrunmod.o \ mofiles/tasksmod.o \ mofiles/testsmod.o \ - mofiles/vgmod.o \ *-inc.scm +# mofiles/dcommonmod.o \ +# mofiles/vgmod.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 Index: common-inc.scm ================================================================== --- common-inc.scm +++ common-inc.scm @@ -2351,22 +2351,10 @@ (lambda (var val) (setenv var val))) vars)) -(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f)) - (let* ((pre-cmd (dtests:get-pre-command)) - (post-cmd (dtests:get-post-command)) - (fullcmd (if (or pre-cmd post-cmd) - (conc pre-cmd cmd post-cmd) - (conc "viewscreen " cmd)))) - (debug:print-info 02 *default-log-port* "Running command: " fullcmd) - (cond - (with-vars (common:without-vars fullcmd)) - (with-orig-env (common:with-orig-env fullcmd)) - (else (common:without-vars fullcmd "MT_.*"))))) - ;;====================================================================== ;; T I M E A N D D A T E ;;====================================================================== ;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5 Index: dcommon-inc.scm ================================================================== --- dcommon-inc.scm +++ dcommon-inc.scm @@ -20,10 +20,22 @@ ;; yes, this is non-ideal (define dashboard:update-summary-tab #f) (define dashboard:update-servers-table #f) +(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f)) + (let* ((pre-cmd (dtests:get-pre-command)) + (post-cmd (dtests:get-post-command)) + (fullcmd (if (or pre-cmd post-cmd) + (conc pre-cmd cmd post-cmd) + (conc "viewscreen " cmd)))) + (debug:print-info 02 *default-log-port* "Running command: " fullcmd) + (cond + (with-vars (common:without-vars fullcmd)) + (with-orig-env (common:with-orig-env fullcmd)) + (else (common:without-vars fullcmd "MT_.*"))))) + ;;====================================================================== ;; C O M M O N D A T A S T R U C T U R E ;;====================================================================== ;; ;; data common to all tabs goes here Index: dcommonmod.scm ================================================================== --- dcommonmod.scm +++ dcommonmod.scm @@ -29,7 +29,14 @@ (import commonmod) ;; (use (prefix ulex ulex:)) (include "common_records.scm") +(include "dcommon-inc.scm") +(include "dashboard-tests-inc.scm") +(include "vg-inc.scm") +(include "tree-inc.scm") +(include "dashboard-context-menu-inc.scm") +(include "ezsteps-inc.scm") +(include "gutils-inc.scm") ) Index: megamod.scm ================================================================== --- megamod.scm +++ megamod.scm @@ -171,15 +171,11 @@ (include "api-inc.scm") (include "archive-inc.scm") (include "client-inc.scm") (include "common-inc.scm") (include "db-inc.scm") -(include "dcommon-inc.scm") -(include "dashboard-tests-inc.scm") (include "env-inc.scm") -(include "ezsteps-inc.scm") -(include "gutils-inc.scm") (include "http-transport-inc.scm") (include "items-inc.scm") (include "keys-inc.scm") (include "launch-inc.scm") (include "margs-inc.scm") @@ -194,14 +190,11 @@ (include "server-inc.scm") (include "subrun-inc.scm") (include "tasks-inc.scm") (include "tdb-inc.scm") (include "tests-inc.scm") -(include "vg-inc.scm") -(include "tree-inc.scm") -(include "dashboard-context-menu-inc.scm") ;; (include "js-path.scm") ;; moved into init procedure in tests-inc.scm ) ;; http-transport:server-dat definition moved to common_records.scm ;; bunch of small functions factored out of send-receive to make debug easier