Overview
Comment: | Make of mtest - deps fixed (I think). Still doesn't compile |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.65-try3 |
Files: | files | file ages | folders |
SHA1: |
88ef67d3eeb590a2f45277fa236264ee |
User & Date: | matt on 2019-11-24 20:48:20 |
Other Links: | branch diff | manifest | tags |
Context
2019-11-24
| ||
20:51 | Moved dbmod.scm back to MSRCFILES where it belongs. check-in: 830231e662 user: matt tags: v1.65-try3 | |
20:48 | Make of mtest - deps fixed (I think). Still doesn't compile check-in: 88ef67d3ee user: matt tags: v1.65-try3 | |
2019-11-21
| ||
14:31 | Comment out archive:main. It doesn't work and isn't needed. check-in: 600378be44 user: mrwellan tags: v1.65-try3 | |
Changes
Modified Makefile from [0f48ea1449] to [f132fa0079].
︙ | ︙ | |||
30 31 32 33 34 35 36 | # ezsteps.scm lock-queue.scm sdb.scm \ # rmt.scm api.scm subrun.scm \ # portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm SRCFILES= # removed from MSRCFILES: ftail.scm # module source files | | > > > > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | # ezsteps.scm lock-queue.scm sdb.scm \ # rmt.scm api.scm subrun.scm \ # 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 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 \ spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3 GUISRCF = dashboard-context-menu.scm dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm OFILES = $(SRCFILES:%.scm=%.o) 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 mkdir -p mofiles csc $(CSCOPTS) -J -c $< -o mofiles/$*.o |
︙ | ︙ | |||
188 189 190 191 192 193 194 | mofiles/megamod.o : \ mofiles/rmtmod.o \ mofiles/commonmod.o \ mofiles/apimod.o \ mofiles/archivemod.o \ mofiles/clientmod.o \ mofiles/dbmod.o \ | < < > > | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | mofiles/megamod.o : \ mofiles/rmtmod.o \ mofiles/commonmod.o \ mofiles/apimod.o \ mofiles/archivemod.o \ mofiles/clientmod.o \ mofiles/dbmod.o \ mofiles/envmod.o \ mofiles/ezstepsmod.o \ mofiles/itemsmod.o \ mofiles/keysmod.o \ mofiles/launchmod.o \ mofiles/odsmod.o \ mofiles/processmod.o \ mofiles/runconfigmod.o \ mofiles/runsmod.o \ mofiles/servermod.o \ mofiles/subrunmod.o \ mofiles/tasksmod.o \ mofiles/testsmod.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 $(OFILES) $(GOFILES) : common_records.scm |
︙ | ︙ |
Modified common-inc.scm from [0cd45c61d6] to [64b34ec4d3].
︙ | ︙ | |||
2349 2350 2351 2352 2353 2354 2355 | (hash-table-for-each vars (lambda (var val) (setenv var val))) vars)) | < < < < < < < < < < < < | 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 | (hash-table-for-each vars (lambda (var val) (setenv var val))) vars)) ;;====================================================================== ;; T I M E A N D D A T E ;;====================================================================== ;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5 (define (common:hms-string->seconds tstr) (let ((parts (string-split-fields "\\w+" tstr)) |
︙ | ︙ |
Modified dcommon-inc.scm from [9124642923] to [fbdcd8eb79].
︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 | ;; ;;====================================================================== ;; yes, this is non-ideal (define dashboard:update-summary-tab #f) (define dashboard:update-servers-table #f) ;;====================================================================== ;; 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 ;; (defstruct dboard:commondat | > > > > > > > > > > > > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | ;; ;;====================================================================== ;; 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 ;; (defstruct dboard:commondat |
︙ | ︙ |
Modified dcommonmod.scm from [29dedb5135] to [27b2251e02].
︙ | ︙ | |||
27 28 29 30 31 32 33 34 35 | (import scheme chicken data-structures extras) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) (import commonmod) ;; (use (prefix ulex ulex:)) (include "common_records.scm") ) | > > > > > > > | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | (import scheme chicken data-structures extras) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable) (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") ) |
Modified megamod.scm from [d686f24aaa] to [66dc0599fb].
︙ | ︙ | |||
169 170 171 172 173 174 175 | "Watchdog thread")) (include "api-inc.scm") (include "archive-inc.scm") (include "client-inc.scm") (include "common-inc.scm") (include "db-inc.scm") | < < < < < < < | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | "Watchdog thread")) (include "api-inc.scm") (include "archive-inc.scm") (include "client-inc.scm") (include "common-inc.scm") (include "db-inc.scm") (include "env-inc.scm") (include "http-transport-inc.scm") (include "items-inc.scm") (include "keys-inc.scm") (include "launch-inc.scm") (include "margs-inc.scm") (include "mt-inc.scm") (include "ods-inc.scm") (include "pgdb-inc.scm") (include "portlogger-inc.scm") (include "process-inc.scm") (include "rmt-inc.scm") (include "runconfig-inc.scm") (include "runs-inc.scm") (include "server-inc.scm") (include "subrun-inc.scm") (include "tasks-inc.scm") (include "tdb-inc.scm") (include "tests-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 |