Overview
Comment: | Added skeleton of support for new compliation units; mtconfigf, mtargs and ducttape. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.70-defunct-try |
Files: | files | file ages | folders |
SHA1: |
2a2b2f42b55d51f95e8caeabd7fc159b |
User & Date: | matt on 2019-12-15 21:55:03 |
Other Links: | branch diff | manifest | tags |
Context
2019-12-15
| ||
22:32 | Compile works now. check-in: 54bcd48568 user: matt tags: v1.70-defunct-try | |
21:55 | Added skeleton of support for new compliation units; mtconfigf, mtargs and ducttape. check-in: 2a2b2f42b5 user: matt tags: v1.70-defunct-try | |
21:44 | Move bunch of stuff from opensrc repo to Megatest repo to ease development. check-in: e429044746 user: matt tags: v1.70-defunct-try | |
Changes
Modified Makefile from [b6ddf60581] to [baed842bc4].
︙ | ︙ | |||
27 28 29 30 31 32 33 | # removed from MSRCFILES: ftail.scm # module source files 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 \ | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | # removed from MSRCFILES: ftail.scm # module source files 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 megamod.scm GMSRCFILES = 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 \ |
︙ | ︙ | |||
85 86 87 88 89 90 91 | 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) #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard | | | | | | | | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | 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) #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard # IMPORTO = apimod.import.o dbmod.import.o itemsmod.import.o \ # odsmod.import.o runsmod.import.o testsmod.import.o \ # archivemod.import.o keysmod.import.o processmod.import.o \ # servermod.import.o clientmod.import.o envmod.import.o \ # launchmod.import.o rmtmod.import.o subrunmod.import.o \ # commonmod.import.o ezstepsmod.import.o megamod.import.o \ # runconfigmod.import.o tasksmod.import.o pkts.import.o all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt # why were the files mofiles/ftail.o mofiles/rmtmod.o mofiles/commonmod.o listed on this target when MOFILES are there? # Removed non module .o files (i.e. $(OFILES) mtest: readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES) csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest |
︙ | ︙ | |||
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 | #multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES) # csc $(CSCOPTS) $(OFILES) $(GOFILES) multi-dboard.scm -o multi-dboard # # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm # csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl # 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 dashboard.o \ archive.o megatest.o : db_records.scm migrate-fix.scm tests.o runs.o dashboard.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 megatest.o : megatest-fossil-hash.scm rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm common_records.scm : altdb.scm vg.o dashboard.o : vg_records.scm mofiles/dcommonmod.o dcommon.o : run_records.scm migrate-fix.scm # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm # for the modularized stuff mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/dbmod.o : mofiles/commonmod.o mofiles/keysmod.o mofiles/tasksmod.o mofiles/odsmod.o | > > > > > > > > > > > > > > > > > > > | 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 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | #multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES) # csc $(CSCOPTS) $(OFILES) $(GOFILES) multi-dboard.scm -o multi-dboard # # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm # csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl #====================================================================== # 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 dashboard.o \ archive.o megatest.o : db_records.scm migrate-fix.scm tests.o runs.o dashboard.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 megatest.o : megatest-fossil-hash.scm rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm common_records.scm : altdb.scm vg.o dashboard.o : vg_records.scm mofiles/dcommonmod.o dcommon.o : run_records.scm migrate-fix.scm # special include based modules mofiles/pkts.o : pkts/pkts.scm mofiles/mtargs.o : mtargs/mtargs.scm mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm mofile/ducttape-lib.o : ducttape/ducttape-lib.scm # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm # for the modularized stuff mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/dbmod.o : mofiles/commonmod.o mofiles/keysmod.o mofiles/tasksmod.o mofiles/odsmod.o |
︙ | ︙ | |||
217 218 219 220 221 222 223 224 225 226 227 228 229 230 | mofiles/runconfigmod.o \ mofiles/runsmod.o \ mofiles/servermod.o \ mofiles/subrunmod.o \ mofiles/tasksmod.o \ mofiles/testsmod.o \ mofiles/pkts.o \ *-inc.scm mofiles/dcommonmod.o : \ mofiles/vgmod.o \ mofiles/treemod.o \ mofiles/ezstepsmod.o | > > > | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | mofiles/runconfigmod.o \ mofiles/runsmod.o \ mofiles/servermod.o \ mofiles/subrunmod.o \ mofiles/tasksmod.o \ mofiles/testsmod.o \ mofiles/pkts.o \ mofiles/mtargs.o \ mofiles/mtconfigf.o \ mofiles/ducttape-lib.o \ *-inc.scm mofiles/dcommonmod.o : \ mofiles/vgmod.o \ mofiles/treemod.o \ mofiles/ezstepsmod.o |
︙ | ︙ |
Added ducttape-lib.scm version [ee2ef474af].
> > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ;;====================================================================== ;; Copyright 2019, 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/>. ;;====================================================================== (declare (unit ducttape-lib)) (include "ducttape/ducttape-lib.scm") |
Modified megamod.scm from [29d2df538a] to [216b602655].
︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 51 52 53 | (declare (uses runsmod)) ;; (declare (uses servermod)) ;; (declare (uses subrunmod)) ;; (declare (uses tasksmod)) ;; (declare (uses testsmod)) ;; (declare (uses vgmod)) (declare (uses pkts)) (module megamod * (import scheme chicken data-structures extras) (use (prefix base64 base64:) | > > > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | (declare (uses runsmod)) ;; (declare (uses servermod)) ;; (declare (uses subrunmod)) ;; (declare (uses tasksmod)) ;; (declare (uses testsmod)) ;; (declare (uses vgmod)) (declare (uses pkts)) (declare (uses mtargs)) (declare (uses mtconfigf)) (declare (uses ducttape-lib)) (module megamod * (import scheme chicken data-structures extras) (use (prefix base64 base64:) |
︙ | ︙ | |||
94 95 96 97 98 99 100 | tcp typed-records udp uri-common z3 ) | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | tcp typed-records udp uri-common z3 ) (import (prefix mtconfigf configf:)) (define read-config configf:read-config) (define find-and-read-config configf:find-and-read-config) (define config:eval-string-in-environment configf:eval-string-in-environment) (import spiffy) ;; (import apimod) |
︙ | ︙ | |||
124 125 126 127 128 129 130 131 132 133 134 135 136 137 | (import runsmod) ;; (import servermod) ;; (import subrunmod) ;; (import tasksmod) ;; (import testsmod) ;; (import vgmod) (import pkts) (use (prefix ulex ulex:)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") | > > | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | (import runsmod) ;; (import servermod) ;; (import subrunmod) ;; (import tasksmod) ;; (import testsmod) ;; (import vgmod) (import pkts) (import (prefix mtargs args:)) (import ducttape-lib) (use (prefix ulex ulex:)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") |
︙ | ︙ | |||
170 171 172 173 174 175 176 | (include "common-inc.scm") ;; L5 (include "db-inc.scm") ;; L4 (include "env-inc.scm") (include "http-transport-inc.scm") (include "items-inc.scm") (include "keys-inc.scm") (include "launch-inc.scm") ;; L1 | | | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | (include "common-inc.scm") ;; L5 (include "db-inc.scm") ;; L4 (include "env-inc.scm") (include "http-transport-inc.scm") (include "items-inc.scm") (include "keys-inc.scm") (include "launch-inc.scm") ;; L1 ;; (include "margs-inc.scm") (include "mt-inc.scm") (include "ods-inc.scm") ;; L1 (include "pgdb-inc.scm") (include "portlogger-inc.scm") (include "process-inc.scm") ;; L6 (include "rmt-inc.scm") ;; L2 (include "runconfig-inc.scm") |
︙ | ︙ |
Added mtargs.scm version [ba4dbc91f2].
> > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ;;====================================================================== ;; Copyright 2019, 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/>. ;;====================================================================== (declare (unit mtargs.scm)) (include "mtargs/mtargs.scm") |
Added mtconfigf.scm version [dd571ebac6].
> > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ;;====================================================================== ;; Copyright 2019, 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/>. ;;====================================================================== (declare (unit mtconfigf)) (include "mtconfigf/mtconfigf.scm") |