Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -30,12 +30,13 @@ # 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 \ @@ -46,15 +47,25 @@ OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) +# compiled import files +MOIMPFILES = $(MSRCFILES:%.scm=%.import.o) -mofiles/%.o : %.scm +%.import.o : mofiles/%.o %.import.scm + csc -unit $*.import -c $*.import.scm -o $*.import.o + + + +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}') @@ -75,12 +86,12 @@ #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) @@ -173,12 +184,12 @@ 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 \ @@ -361,13 +372,16 @@ $(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 #====================================================================== Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -57,20 +57,23 @@ ;; (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")