Index: configf-inc.scm ================================================================== --- configf-inc.scm +++ configf-inc.scm @@ -1,7 +1,7 @@ ;;====================================================================== -;; Copyright 2006-2012, Matthew Welland. +;; Copyright 2006-2018, Matthew Welland. ;; ;; This file is part of Megatest. ;; ;; Megatest is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -16,10 +16,15 @@ ;; You should have received a copy of the GNU General Public License ;; along with Megatest. If not, see . ;;====================================================================== +(define *eval-string* "") +(define (add-eval-string str) + (if (not (string-contains *eval-string* str)) + (set! *eval-string* (conc *eval-string* " " str)))) + ;;====================================================================== ;; Config file handling ;;====================================================================== ;; return list (path fullpath configname) Index: megamod.scm ================================================================== --- megamod.scm +++ megamod.scm @@ -26,11 +26,11 @@ ;; ;; (declare (uses rmtmod)) ;; (declare (uses commonmod)) ;; (declare (uses apimod)) ;; (declare (uses archivemod)) ;; (declare (uses clientmod)) -(declare (uses configfmod)) +;; (declare (uses configfmod)) ;; (declare (uses dbmod)) ;; (declare (uses dcommonmod)) ;; (declare (uses envmod)) ;; (declare (uses ezstepsmod)) ;; (declare (uses itemsmod)) @@ -99,18 +99,20 @@ udp uri-common z3 ) +(use (prefix mtconfigf configf:)) + (import canvas-draw-iup spiffy) ;; (import apimod) ;; (import archivemod) ;; (import clientmod) ;; (import commonmod) -(import configfmod) +;; (import configfmod) ;; (import dbmod) ;; (import dcommonmod) ;; (import envmod) ;; (import ezstepsmod) ;; (import ftail) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -22,11 +22,12 @@ ;; fake out readline usage of toplevel-command (define (toplevel-command . a) #f) (use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:) readline apropos json http-client directory-utils typed-records - http-client srfi-18 extras format) + http-client srfi-18 extras format + (prefix mtconfigf configf:)) ;; Added for csv stuff - will be removed ;; (use sparse-vectors) @@ -51,12 +52,12 @@ (import commonmod) (declare (uses rmtmod)) (import rmtmod) (declare (uses dbmod)) (import dbmod) -(declare (uses configfmod)) -(import configfmod) +;; (declare (uses configfmod)) +;; (import configfmod) (declare (uses megamod)) (import megamod) ;; (declare (uses tdb)) ;; (declare (uses mt))