Changeset 11978 in project

Timestamp:

09/22/08 11:44:02 (12 years ago)

Author:

felix winkelmann

Message:

henrietta fixes

Location:

chicken/branches/hygienic

Files:

• henrietta.scm (modified) (3 diffs)
• rules.make (modified) (1 diff)

chicken/branches/hygienic/henrietta.scm

@@ -53 +53 @@
 
   (define (test-file? path)
-    (string-match "(\\./)?tests/.*" path))
+    (string-match "(\\./)?tests(/.*)?" path))
 
   (define (retrieve name version)
@@ -73 +73 @@
           (for-each
            (lambda (f)
-             (unless (test-file? f)
+             (when (or *tests* (not (test-file? f)))
                (let ((ff (string-append dir "/" f))
                      (pf (string-append prefix "/" f)))
@@ -96 +96 @@
             (version #f))
         (let loop ((qs (if m (cadr m) qs)))
-          (let* ((m (string-search-positions "^(\\w+)=([^&]+)" qs))
+          (let* ((m (string-search-positions "^&?(\\w+)=([^&]+)" qs))
                  (ms (and m (apply substring qs (cadr m))))
                  (rest (and m (substring qs (cadar m)))))

chicken/branches/hygienic/rules.make

@@ -1369 +1369 @@
         gzip -d -c $(SRCDIR)/bootstrap.tar.gz | tar xvf -
         touch *.c
-        $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) STATICBUILD=1 chicken$(EXE)
+        $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) STATICBUILD=1 DEBUGBUILD=1 \
+          chicken$(EXE)
         cp chicken$(EXE) chicken-boot$(EXE)
         touch *.scm