Megatest

Check-in [39f1ace0d3]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:Added -M to obj build to fix issue with dashboard not starting
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.6584-nanomsg
Files: files | file ages | folders
SHA1: 39f1ace0d3925a979076afa87c134f3a2567a62e
User & Date: matt on 2021-11-14 15:33:22
Other Links: branch diff | manifest | tags
Context
2021-11-15
15:05
Merged fork check-in: 18439ca550 user: matt tags: v1.6584-nanomsg
2021-11-14
15:33
Added -M to obj build to fix issue with dashboard not starting check-in: 39f1ace0d3 user: matt tags: v1.6584-nanomsg
2021-11-13
21:17
Added minimal example of how build works check-in: 49214f61e2 user: matt tags: v1.6584-nanomsg
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified Makefile from [8e464a2b2a] to [89e357068d].

︙
60
61
62
63
64
65
66
67

68
69
70
71
72
73
74

60
61
62
63
64
65
66

67
68
69
70
71
72
73
74








-
+








GMOIMPFILES = $(GUIMODFILES:%.scm=%.import.o)

%.import.o : %.import.scm
	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o

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

# module dependencies
mofiles/apimod.o : mofiles/commonmod.o
mofiles/apimod.o : mofiles/servermod.o
mofiles/apimod.o : mofiles/tasksmod.o
mofiles/archivemod.o : mofiles/launchmod.o
mofiles/archivemod.o : mofiles/servermod.o
︙
126
127
128
129
130
131
132
133
134




135
136
137
138
139

140
141
142
143
144
145
146

126
127
128
129
130
131
132


133
134
135
136
137
138
139
140

141
142
143
144
145
146
147
148








-
-
+
+
+
+




-
+








# BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE")
# ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
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)

mtest: megatest.scm $(MOFILES) $(MOIMPFILES) megatest-fossil-hash.scm
	csc $(CSCOPTS) $(MOFILES) $(MOIMPFILES) megatest.scm -o mtest
mtest: megatest.scm $(MOFILES) megatest-fossil-hash.scm
	csc $(CSCOPTS) $(MOFILES) megatest.scm -o mtest

#  $(MOIMPFILES) removed

showmtesthash:
	@echo $(MTESTHASH)

dboard : dashboard.scm $(MOFILES) $(MOIMPFILES) $(GMOFILES) $(GMOIMPFILES) megatest-fossil-hash.scm
dboard : dashboard.scm $(MOFILES) $(GMOFILES) megatest-fossil-hash.scm
	csc -k $(CSCOPTS) $(MOFILES) $(GMOFILES) dashboard.scm -o dboard

# $(GMOIMPFILES) $(MOIMPFILES) 

mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm
	csc $(CSCOPTS) $(OFILES) $(MOFILES) mtut.scm -o mtut
︙

Modified megatest.scm from [d542feff12] to [e3b480ce07].

︙
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58










59
60
61
62
63
64
65

42
43
44
45
46
47
48










49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65








-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+








(declare (uses processmod))
(declare (uses rmtmod))
(declare (uses runsmod))
(declare (uses servermod))
(declare (uses testsmod))

;; needed for configf scripts, scheme etc.
(declare (uses apimod.import))
(declare (uses debugprint.import))
(declare (uses mtargs.import))
(declare (uses commonmod.import))
(declare (uses configfmod.import))
(declare (uses bigmod.import))
(declare (uses dbmod.import))
(declare (uses rmtmod.import))
(declare (uses servermod.import))
(declare (uses launchmod.import))
;; (declare (uses apimod.import))
;; (declare (uses debugprint.import))
;; (declare (uses mtargs.import))
;; (declare (uses commonmod.import))
;; (declare (uses configfmod.import))
;; (declare (uses bigmod.import))
;; (declare (uses dbmod.import))
;; (declare (uses rmtmod.import))
;; (declare (uses servermod.import))
;; (declare (uses launchmod.import))

;; (include "call-with-environment-variables/call-with-environment-variables.scm")

(module megatest-main
	*

  (import scheme
︙

Modified testbuild/Makefile from [d97da57d06] to [008880f530]. 

1
2
3



4

5
6
7
8


9
10
11


12
13
14
15

1
2
3
4
5
6

7
8
9


10
11
12


13
14

15
16
17




+
+
+
-
+


-
-
+
+

-
-
+
+
-




CSCOPTS=
SRCFILES=m1.scm m2.scm m3.scm

%.import.o : %.import.scm
	csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o

%.o : %.scm
%.o %.import.scm : %.scm
	csc $(CSCOPTS) -J -c $< -o $*.o

cl : cl.scm m1.o m2.o
	csc $(CSCOPTS) m1.o m2.o cl.scm -o cl
cl : cl.scm m1.o m2.o m1.import.o
	csc $(CSCOPTS) m1.o m1.import.o m2.o cl.scm -o cl

gui : gui.scm m1.o m3.o
	csc $(CSCOPTS) m1.o m3.o gui.scm -o gui
gui : gui.scm m1.o m2.o m3.o m1.import.o
	csc $(CSCOPTS) m1.o m2.o m3.o m1.import.o gui.scm -o gui


clean :
	rm -f *.o *.import.scm cl gui

Modified testbuild/cl.scm from [1b713265c6] to [c850e4c5f3].

︙
10
11
12
13
14
15
16
17


18
19
20
21
22
23

10
11
12
13
14
15
16

17
18
19
20
21
22
23
24








-
+
+







	chicken.base
	m1
	m2)

(define (main)
  (a)
  (b)
  (print "I'm main from cl.scm"))
  (print "I'm main from cl.scm")
  (print "Got "(try-an-eval)" from try an eval"))

)

(import cl-guts)

(main)

Modified testbuild/gui.scm from [8ea5c044bc] to [4b166181e3]. 

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

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




+








+







-
+







;; a command line only executable

(declare (uses m1))
(declare (uses m2))
(declare (uses m3))

(module gui-guts
	*

(import scheme
	chicken.base
	m1
	m2
	m3
	)

(define (main)
  (a)
  (c)
  (print "I'm main from cl.scm, let's start a gui ...")
)
  (print "Got "(try-an-eval)" from try an eval"))

)

(import gui-guts)

(main)

Modified testbuild/m1.scm from [624c900b71] to [7d00309785]. 

1
2
3
4
5
6
7
8
9

10
11
12
13
14






15
16

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23










+





+
+
+
+
+
+



;; a module used by both command line (cl.scm) and gui (gui.scm)

(declare (unit m1))

(module m1
	*

(import scheme
	chicken.base
	chicken.port
	)

(define (a)
  (print "I'm from module m1"))

(define (do-an-eval thestring ht)
  (with-input-from-string
      thestring
    (lambda ()
      ((eval (read)) ht))))
		     
)

Modified testbuild/m2.scm from [9e9aa983e6] to [6a790429a2]. 

1
2
3


4
5
6
7
8
9




10
11
12
13
14







15

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




+
+






+
+
+
+





+
+
+
+
+
+
+


;; a module used only by the command line executable
;;
(declare (unit m2))
(declare (uses m1))
(declare (uses m1.import))

(module m2
	*

(import scheme
	chicken.base

	m1
		
	srfi-69
	)

(define (b)
  (print "I'm from module m2"))

(define (try-an-eval)
  (let* ((ht (make-hash-table)))
    (do-an-eval "(lambda (ht)(import srfi-69 m1)
     (a)
     (hash-table-set! ht \"a\" 123))" ht)
    (hash-table->alist ht)))

)

Modified vg_records.scm from [63c7c77f61] to [d647eab863].

︙
15
16
17
18
19
20
21
22

23
24

15
16
17
18
19
20
21

22
23
24








-
+



;;     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/>.
;;

(import simple-exceptions)
;; (import simple-exceptions)

;; moved to vgmod.scm

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