Megatest

Check-in [e057f70f51]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:First pass integration of the fix from Peter Bex for mtconfigf eval. Not quite working yet...
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.65-try3
Files: files | file ages | folders
SHA1: e057f70f5187dd2e058d15950be4eac0cd49e4ad
User & Date: matt on 2019-11-12 23:26:13
Other Links: branch diff | manifest | tags
Context
2019-11-12
23:57
Added import of megamod for eval in configf check-in: 2415804df9 user: matt tags: v1.65-try3
23:26
First pass integration of the fix from Peter Bex for mtconfigf eval. Not quite working yet... check-in: e057f70f51 user: matt tags: v1.65-try3
2019-11-11
22:40
Fixed Makefile in example check-in: c54ed87ce3 user: matt tags: v1.65-try3
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified Makefile from [2f4f3f2a42] to [4fd2cd6834].

︙
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

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








+

-
+














+
+

+
+
+
+
+
-
+



+
+
+








#   http-transport.scm filedb.scm tdb.scm \
#   client.scm mt.scm \
#   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 = ftail.scm rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm configfmod.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 megamod.scm
MSRCFILES = rmtmod.scm commonmod.scm apimod.scm archivemod.scm clientmod.scm configfmod.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 megamod.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)

%.import.o : mofiles/%.o %.import.scm
	csc -unit $*.import -c $*.import.scm -o $*.import.o



mofiles/%.o : %.scm
mofiles/%.o : %.scm mofiles
	mkdir -p mofiles
	csc $(CSCOPTS) -J -c $< -o mofiles/$*.o

# 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))
MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')

ifeq ($(MTESTHASH),)
$(error MTESTHASH is broken!)
︙
73
74
75
76
77
78
79
80
81


82
83
84
85
86
87
88

84
85
86
87
88
89
90


91
92
93
94
95
96
97
98
99








-
-
+
+








PNGFILES = $(shell cd docs/manual;ls *png)

#all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
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)
	csc $(CSCOPTS) $(MOFILES) megatest.o -o mtest
mtest: readline-fix.scm megatest.o $(MOFILES) $(MOIMPFILES)
	csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.o -o mtest

showmtesthash:
	@echo $(MTESTHASH)

# removing $(GOFILES)
dboard : dashboard.scm $(MOFILES)
	csc $(CSCOPTS) dashboard.scm $(MOFILES) -o dboard
︙
171
172
173
174
175
176
177

178
179
180
181
182
183
184
185
186

182
183
184
185
186
187
188
189
190

191
192
193
194
195
196
197








+

-








# 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
mofiles/commonmod.o : mofiles/configfmod.o mofiles/processmod.o
mofiles/rmtmod.o    : mofiles/dbmod.o mofiles/commonmod.o mofiles/apimod.o
mofiles/apimod.o    : mofiles/megamod.o mofiles/dbmod.o
# Removed from megamod.o dep:   mofiles/ftail.o
mofiles/megamod.o   : \
   mofiles/ftail.o \
   mofiles/rmtmod.o \
   mofiles/commonmod.o \
   mofiles/apimod.o \
   mofiles/archivemod.o \
   mofiles/clientmod.o \
   mofiles/configfmod.o \
   mofiles/dbmod.o \
︙
359
360
361
362
363
364
365
366





367
368
369
370
371
372
373
374
375

370
371
372
373
374
375
376

377
378
379
380
381
382

383
384
385
386
387
388
389








-
+
+
+
+
+

-








	mkdir -p ext-tests
	cd ext-tests;fossil open --nested $(MTQA_FOSSIL)

$(MTQA_FOSSIL) :
	fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL)

clean : 
	rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut tcmt ftail.import.scm readline-fix.scm serialize-env dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o
	rm -f $(OFILES) $(GOFILES) $(MOFILES) $(MOIMPFILES) $(TCMTOBJS) \
              $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil mtut \
              tcmt *.import.scm readline-fix.scm serialize-env dboard \
              dboard.o megatest.o dashboard.o megatest-fossil-hash.* \
              altdb.scm mofiles/*.o vg.o
	rm -rf share
	rm -f *.import.scm

#======================================================================
# Make the records files
#======================================================================

# vg_records.scm : records.sh
#	./records.sh
︙

Modified megatest.scm from [fae0f224b5] to [98225c2e93].

︙
55
56
57
58
59
60
61



62
63
64
65
66
67
68
69
70
71


72
73
74
75
76
77
78

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








+
+
+








-
-
+
+








(declare (uses dbmod))
(import dbmod)
;; (declare (uses configfmod))
;; (import configfmod)
(declare (uses megamod))
(import megamod)

;; invoke the imports
(declare (uses megamod.import))

(configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)

;; (declare (uses tdb))
;; (declare (uses mt))
;; (declare (uses api))
;; (declare (uses tasks)) ;; only used for debugging.
;; (declare (uses env))
;; (declare (uses diff-report))
(declare (uses ftail))
(import ftail)
;; (declare (uses ftail))
;; (import ftail)

(define *db* #f) ;; this is only for the repl, do not use in general!!!!

(include "common_records.scm")
(include "key_records.scm")
(include "db_records.scm")
(include "run_records.scm")
︙

This page was generated in about 0.124s by Fossil 2.24 [452f8e1ffc] 2024-03-26 15:36:00