Overview
Comment: | more deps |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.70-defunct-try |
Files: | files | file ages | folders |
SHA1: |
a03628d54ed15ba58ccaf0e0cead54c0 |
User & Date: | matt on 2019-12-29 04:27:36 |
Other Links: | branch diff | manifest | tags |
Context
2019-12-29
| ||
21:00 | Resolved few missing use and import calls in dashboard. check-in: 29859df890 user: matt tags: v1.70-defunct-try | |
04:27 | more deps check-in: a03628d54e user: matt tags: v1.70-defunct-try | |
03:34 | Fixed couple more deps, added missing mutils.scm check-in: 32d398aaf7 user: matt tags: v1.70-defunct-try | |
Changes
Modified Makefile from [e61f193f0c] to [1c511b8a84].
︙ | ︙ | |||
30 31 32 33 34 35 36 | MSRCFILES = dbmod.scm 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 \ pkts.scm mtargs.scm mtconfigf.scm ducttape-lib.scm ulex.scm \ stml2.scm cookie.scm megamod.scm mutils.scm | | | | 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 | MSRCFILES = dbmod.scm 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 \ pkts.scm mtargs.scm mtconfigf.scm ducttape-lib.scm ulex.scm \ stml2.scm cookie.scm megamod.scm mutils.scm GMSRCFILES = dcommonmod.scm vgmod.scm treemod.scm gutilsmod.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 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) |
︙ | ︙ | |||
64 65 66 67 68 69 70 | # mofiles/ducttape-lib.o : ducttape-lib.scm ducttape/*scm # csc -I ducttape -J -c ducttape-lib.scm -o mofiles/ducttape-lib.o mofiles/%.o %.import.scm : %.scm @[ -e mofiles ] && mkdir -p mofiles csc $(CSCOPTS) -I $* -J -c $< -o mofiles/$*.o | | | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | # mofiles/ducttape-lib.o : ducttape-lib.scm ducttape/*scm # csc -I ducttape -J -c ducttape-lib.scm -o mofiles/ducttape-lib.o mofiles/%.o %.import.scm : %.scm @[ -e mofiles ] && mkdir -p mofiles csc $(CSCOPTS) -I $* -J -c $< -o mofiles/$*.o @touch $*.import.scm # ensure it is touched after the .o is made # a.import.o : a.import.scm a.o # csc -unit a.import -c a.import.scm -o $*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) |
︙ | ︙ | |||
105 106 107 108 109 110 111 | # removing $(GOFILES) dboard : dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) csc dashboard.scm $(CSCOPTS) $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard ndboard : newdashboard.scm $(GOFILES) csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard | | | | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | # removing $(GOFILES) dboard : dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) csc dashboard.scm $(CSCOPTS) $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard ndboard : newdashboard.scm $(GOFILES) csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard mtut: $(MOFILES) $(MOIMPFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) mtut.scm -o mtut TCMTOBJS= tcmt : $(TCMTOBJS) $(MOFILES) tcmt.scm csc $(CSCOPTS) $(MOFILES) $(TCMTOBJS) tcmt.scm -o tcmt # install documentation to $(PREFIX)/docs |
︙ | ︙ | |||
144 145 146 147 148 149 150 | #====================================================================== # Special dependencies for the includes #====================================================================== tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o \ dashboard-main.o monitor.o archive.o : db_records.scm migrate-fix.scm | | | | > > > | > | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | #====================================================================== # Special dependencies for the includes #====================================================================== tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o \ dashboard-main.o monitor.o archive.o : db_records.scm migrate-fix.scm tests.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm common_records.scm : altdb.scm vg.o : vg_records.scm mofiles/dcommonmod.o mofiles/dcommonmod.o : run_records.scm migrate-fix.scm mofiles/stml2.o \ mofiles/gutilsmod.o mofiles/stml2.o : mofiles/cookie.o # special include based modules mofiles/pkts.o : pkts/pkts.scm mofiles/mtargs.o : mtargs/mtargs.scm mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm mofiles/ulex.o : ulex/ulex.scm mofiles/mutils.o : mutils/mutils.scm mofiles/cookie.o : stml2/cookie.scm mofiles/stml2.o : stml2/stml2.scm # for the modularized stuff mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/stml2.o \ mofiles/mtargs.o mofiles/pkts.o mofiles/mtconfigf.o mofiles/dbmod.o : mofiles/commonmod.o mofiles/keysmod.o \ mofiles/tasksmod.o mofiles/odsmod.o mofiles/commonmod.o : mofiles/processmod.o mofiles/rmtmod.o : mofiles/dbmod.o mofiles/commonmod.o \ mofiles/apimod.o mofiles/ulex.o mofiles/apimod.o : mofiles/dbmod.o mofiles/runsmod.o : mofiles/testsmod.o |
︙ | ︙ | |||
479 480 481 482 483 484 485 | if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi | | | | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o # create a pdf dot graphviz diagram from notations in rmt.scm rmt.pdf : rmt.scm grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf buildmanual: cd docs/manual && make |
︙ | ︙ |
Modified dashboard.scm from [efec8e291d] to [87140f9d0a].
︙ | ︙ | |||
30 31 32 33 34 35 36 | sparse-vectors srfi-18 #;(prefix mtconfigf configf:) ) (import (prefix sqlite3 sqlite3:)) (declare (uses mtargs)) (import (prefix mtargs args:)) | | > < < < > > < < < < < < < > | 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 66 67 68 69 70 71 72 73 74 75 76 77 78 | sparse-vectors srfi-18 #;(prefix mtconfigf configf:) ) (import (prefix sqlite3 sqlite3:)) (declare (uses mtargs)) (import (prefix mtargs args:)) (declare (uses mtconfigf)) (import (prefix mtconfigf configf:)) (declare (uses ducttape-lib)) (import ducttape-lib) ;; invoke the imports - ORDER IS IMPORTANT! (declare (uses mtargs.import)) (declare (uses ducttape-lib.import)) (declare (uses mtconfigf.import)) (declare (uses gutilsmod)) (import gutilsmod) (declare (uses megamod)) (import megamod) (declare (uses commonmod)) (import commonmod) (declare (uses rmtmod)) (import rmtmod) (declare (uses runsmod)) (import runsmod) (declare (uses dbmod)) (import dbmod) (declare (uses testsmod)) (import testsmod) (declare (uses dcommonmod)) (import dcommonmod) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") (include "task_records.scm") (include "vg_records.scm") ;; invoke the imports - ORDER IS IMPORTANT! (declare (uses gutilsmod.import)) (declare (uses commonmod.import)) (declare (uses testsmod.import)) (declare (uses rmtmod.import)) (declare (uses runsmod.import)) (declare (uses megamod.import)) (declare (uses dcommonmod.import)) |
︙ | ︙ |
Modified dcommon.scm from [12ec9ea4f0] to [be72c18553].
︙ | ︙ | |||
24 25 26 27 28 29 30 | (use canvas-draw) (import canvas-draw-iup) (use regex typed-records matchable) (declare (unit dcommon)) (declare (uses megatest-version)) | < < | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | (use canvas-draw) (import canvas-draw-iup) (use regex typed-records matchable) (declare (unit dcommon)) (declare (uses megatest-version)) (declare (uses commonmod)) (import commonmod) ;; (declare (uses synchash)) (include "common_records.scm") (include "db_records.scm") |
︙ | ︙ |
Modified dcommonmod.scm from [fdab2018b7] to [3f37daf016].
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | ;;====================================================================== (declare (unit dcommonmod)) (declare (uses commonmod)) (declare (uses testsmod)) (declare (uses megamod)) (declare (uses mtargs)) (module dcommonmod * (import scheme chicken data-structures extras) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 | > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ;;====================================================================== (declare (unit dcommonmod)) (declare (uses commonmod)) (declare (uses testsmod)) (declare (uses megamod)) (declare (uses mtargs)) (declare (uses mtconfigf)) (declare (uses gutilsmod)) (module dcommonmod * (import scheme chicken data-structures extras) (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 |
︙ | ︙ | |||
77 78 79 80 81 82 83 | tcp typed-records udp uri-common z3 ) | | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | tcp typed-records udp uri-common z3 ) (import (prefix mtconfigf configf:)) (import gutilsmod) (import commonmod) (import testsmod) (import megamod) (import canvas-draw) (import canvas-draw-iup) (use (prefix iup iup:)) (import (prefix mtargs args:)) |
︙ | ︙ | |||
105 106 107 108 109 110 111 | (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") | | | 107 108 109 110 111 112 113 114 115 116 | (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") ) |
Deleted gutils.scm version [b0963fc0d4].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Added gutilsmod.scm version [35fcf6a225].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; ;; This file is part of Megatest. ;; ;; Megatest is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; ;; Megatest is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see <http://www.gnu.org/licenses/>. ;; ;;====================================================================== (require-library iup) (import (prefix iup iup:)) (use canvas-draw) (use srfi-1 regex regex-case srfi-69) (declare (unit gutilsmod)) (module gutilsmod * (import scheme chicken data-structures extras srfi-1) (include "gutils-inc.scm") ) |
Modified mtut.scm from [047f24c580] to [d24a197a9e].
︙ | ︙ | |||
29 30 31 32 33 34 35 | ;; (declare (uses common)) ;; (declare (uses megatest-version)) ;; (declare (uses margs)) (declare (uses mtconfigf)) (import (prefix mtconfigf configf:)) | < > > > < < < | 29 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 | ;; (declare (uses common)) ;; (declare (uses megatest-version)) ;; (declare (uses margs)) (declare (uses mtconfigf)) (import (prefix mtconfigf configf:)) (declare (uses stml2)) (import stml2) (declare (uses ducttape-lib)) (import ducttape-lib) (declare (uses mtconfigf.import)) (declare (uses commonmod)) (declare (uses megamod)) (import commonmod) (import megamod) ;; (declare (uses rmt)) ;; (include "megatest-fossil-hash.scm") ;; comes from megamod ;; stuff for the mapper and checker functions ;; (define *target-mappers* (make-hash-table)) (define *runname-mappers* (make-hash-table)) (define *area-checkers* (make-hash-table)) |
︙ | ︙ |
Modified stml2/stml2.scm from [74915027cb] to [ee4c13898d].
1 2 3 4 5 6 7 8 9 10 11 12 13 | ;; Copyright 2007-2011, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. ;; stml is a list of html strings ;; (declare (unit stml)) | < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | ;; Copyright 2007-2011, Matthew Welland. ;; ;; This program is made available under the GNU GPL version 2.0 or ;; greater. See the accompanying file COPYING for details. ;; ;; This program is distributed WITHOUT ANY WARRANTY; without even the ;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ;; PURPOSE. ;; stml is a list of html strings ;; (declare (unit stml)) (module stml2 * (import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1) (import cookie) (use (prefix dbi dbi:) (prefix crypt c:) typed-records) |
︙ | ︙ |