Overview
| Comment: | Re-did config file path handling, removed directory-push/directory-pop for syle more consistent with old behavior |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | development |
| Files: | files | file ages | folders |
| SHA1: |
7906872d606f87fa3b8d05139fd8f296 |
| User & Date: | mrwellan on 2013-04-10 16:43:32 |
| Other Links: | branch diff | manifest | tags |
Context
|
2013-04-10
| ||
| 18:11 | Added push/pop dir to *toppath* in runconfigs for consistent loading of runconfigs check-in: d72d1dc4b8 user: mrwellan tags: development | |
| 16:43 | Re-did config file path handling, removed directory-push/directory-pop for syle more consistent with old behavior check-in: 7906872d60 user: mrwellan tags: development | |
|
2013-04-09
| ||
| 16:10 | Re-did config file path handling using directory-push/directory-pop for consistent relative path handling check-in: 1b85530bae user: mrwellan tags: development | |
Changes
Modified configf.scm from [fd7443cd26] to [ee796a94b9].
| ︙ | ︙ | |||
146 147 148 149 150 151 152 | (close-input-port inp) (hash-table-delete! res "") ;; we are using "" as a dumping ground and must remove it before returning the ht res) (regex-case inl (configf:comment-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (configf:blank-l-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) | | > > | | | > > | | | | | | | | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | (close-input-port inp) (hash-table-delete! res "") ;; we are using "" as a dumping ground and must remove it before returning the ht res) (regex-case inl (configf:comment-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (configf:blank-l-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (configf:include-rx ( x include-file ) (let* ((curr-dir (current-directory)) (full-conf (if (absolute-pathname? include-file) include-file (conc curr-dir "/" include-file))) (conf-dir (pathname-directory include-file)) (incfname (pathname-strip-directory include-file))) (if (file-exists? full-conf) (begin ;; (push-directory conf-dir) (read-config full-conf res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections) ;; (pop-directory) (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (begin (debug:print 0 "INFO: include file " include-file " not found (called from " path ")") (loop (configf:read-line inp res allow-system) curr-section-name #f #f))))) (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system) ;; if we have the sections list then force all settings into "" and delete it later? (if (or (not sections) (member section-name sections)) section-name "") ;; stick everything into "" #f #f)) (configf:key-sys-pr ( x key cmd ) (if allow-system |
| ︙ | ︙ |
Modified megatest-version.scm from [153c2593b2] to [de3b039615].
1 2 3 4 5 | ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) | | | 1 2 3 4 5 6 7 | ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) (define megatest-version 1.5407) |