Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -62,11 +62,11 @@ %.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 @@ -128,17 +128,19 @@ 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 Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -44,20 +44,20 @@ (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 * Index: testbuild/Makefile ================================================================== --- testbuild/Makefile +++ testbuild/Makefile @@ -1,15 +1,17 @@ CSCOPTS= SRCFILES=m1.scm m2.scm m3.scm -%.o : %.scm +%.import.o : %.import.scm + csc $(CSCOPTS) -unit $*.import -c $*.import.scm -o $*.import.o + +%.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 Index: testbuild/cl.scm ================================================================== --- testbuild/cl.scm +++ testbuild/cl.scm @@ -12,11 +12,12 @@ 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) Index: testbuild/gui.scm ================================================================== --- testbuild/gui.scm +++ testbuild/gui.scm @@ -1,24 +1,26 @@ ;; 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) Index: testbuild/m1.scm ================================================================== --- testbuild/m1.scm +++ testbuild/m1.scm @@ -5,12 +5,19 @@ (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)))) + ) Index: testbuild/m2.scm ================================================================== --- testbuild/m2.scm +++ testbuild/m2.scm @@ -1,15 +1,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))) + ) Index: vg_records.scm ================================================================== --- vg_records.scm +++ vg_records.scm @@ -17,8 +17,8 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see . ;; -(import simple-exceptions) +;; (import simple-exceptions) ;; moved to vgmod.scm