Overview
Comment: | Re-ordered some imports and added deps |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.70-refactor01 | v1.70-defunct-try |
Files: | files | file ages | folders |
SHA1: |
b6aa34569a3939825510f716024c14e8 |
User & Date: | matt on 2019-12-28 06:25:06 |
Other Links: | branch diff | manifest | tags |
Context
2019-12-28
| ||
17:49 | Merged refactor to v1.70 check-in: 803e36b3f2 user: matt tags: v1.70-defunct-try | |
06:25 | Re-ordered some imports and added deps Leaf check-in: b6aa34569a user: matt tags: v1.70-refactor01, v1.70-defunct-try | |
2019-12-17
| ||
20:25 | Added missing import of mtargs. Fixed typo check-in: 6df0c4fb3a user: matt tags: v1.70-refactor01, v1.70-defunct-try | |
Changes
Modified Makefile from [5e1f9a8e2f] to [910417fab5].
︙ | ︙ | |||
93 94 95 96 97 98 99 | PNGFILES = $(shell cd docs/manual;ls *png) 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) mofiles/ducttape-lib.o | | | | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | PNGFILES = $(shell cd docs/manual;ls *png) 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) mofiles/ducttape-lib.o csc megatest.o $(CSCOPTS) $(MOFILES) $(MOIMPFILES) -o mtest showmtesthash: @echo $(MTESTHASH) # removing $(GOFILES) dboard : dashboard.o $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) csc dashboard.o $(CSCOPTS) $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) -o dboard ndboard : newdashboard.scm $(GOFILES) csc $(CSCOPTS) $(GOFILES) newdashboard.scm -o ndboard mtut: $(MOFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(MOFILES) mtut.scm -o mtut |
︙ | ︙ | |||
172 173 174 175 176 177 178 | mofiles/pkts.o : pkts/pkts.scm mofiles/mtargs.o : mtargs/mtargs.scm mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm mofiles/ulex.o : ulex/ulex.scm # for the modularized stuff | | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | mofiles/pkts.o : pkts/pkts.scm mofiles/mtargs.o : mtargs/mtargs.scm mofiles/mtconfigf.o : mtconfigf/mtconfigf.scm mofiles/ulex.o : ulex/ulex.scm # for the modularized stuff mofiles/commonmod.o : megatest-fossil-hash.scm mofiles/stml2.o mofiles/mtargs.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 |
︙ | ︙ |
Modified dashboard.scm from [dfcdf77012] to [93b746544c].
︙ | ︙ | |||
28 29 30 31 32 33 34 | ;; (use ducttape-lib) (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors srfi-18 #;(prefix mtconfigf configf:) ) (import (prefix sqlite3 sqlite3:)) | | | | | | | | | | | | | < < < < < | > > > > < < < < < < | < < < | | | 28 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 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | ;; (use ducttape-lib) (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors srfi-18 #;(prefix mtconfigf configf:) ) (import (prefix sqlite3 sqlite3:)) (declare (uses mtargs)) (import (prefix mtargs args:)) (declare (uses ducttape-lib)) (import ducttape-lib) (declare (uses mtconfigf)) (import (prefix mtconfigf configf:)) ;; invoke the imports - ORDER IS IMPORTANT! (declare (uses mtargs.import)) (declare (uses ducttape-lib.import)) (declare (uses mtconfigf.import)) (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 commonmod.import)) (declare (uses testsmod.import)) (declare (uses rmtmod.import)) (declare (uses runsmod.import)) (declare (uses megamod.import)) (declare (uses dcommonmod.import)) (mtconfigf#set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) (mtconfigf#add-eval-string "(import megamod)(import commonmod)") (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " license GPL, Copyright (C) Matt Welland 2012-2017 |
︙ | ︙ |
Modified megatest.scm from [658062bedf] to [71e35bcd8c].
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | ;; Added for csv stuff - will be removed ;; (use sparse-vectors) (require-library mutils) (declare (uses commonmod)) (import commonmod) (declare (uses rmtmod)) (import rmtmod) (declare (uses dbmod)) (import dbmod) (declare (uses runsmod)) (import runsmod) (declare (uses testsmod)) (import testsmod) (declare (uses megamod)) (import megamod) | > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < | | 28 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 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | ;; Added for csv stuff - will be removed ;; (use sparse-vectors) (require-library mutils) (declare (uses mtargs)) (import (prefix mtargs args:)) (declare (uses mtconfigf)) (import (prefix mtconfigf configf:)) (declare (uses ducttape-lib)) (import ducttape-lib) ;; invoke the imports (declare (uses mtargs.import)) (declare (uses mtconfigf.import)) (declare (uses ducttape-lib.import)) (declare (uses commonmod)) (import commonmod) (declare (uses rmtmod)) (import rmtmod) (declare (uses dbmod)) (import dbmod) (declare (uses runsmod)) (import runsmod) (declare (uses testsmod)) (import testsmod) (declare (uses megamod)) (import megamod) ;; invoke the imports (declare (uses commonmod.import)) (declare (uses testsmod.import)) (declare (uses rmtmod.import)) (declare (uses runsmod.import)) (declare (uses megamod.import)) (configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*) (define *db* #f) ;; this is only for the repl, do not use in general!!!! (define *default-log-port* (current-error-port)) (include "common_records.scm") (include "key_records.scm") (include "db_records.scm") (include "run_records.scm") ;; (include "megatest-fossil-hash.scm") ;; included in megamod (define getenv get-environment-variable) (configf:add-eval-string "(import megamod commonmod (prefix mtconfigf configf:)(prefix mtargs args:))") (define *usage-log-file* #f) ;; put path to file for logging usage in this var in the ~/.megatestrc file (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file ;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file ;; (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc"))) |
︙ | ︙ |