Changeset 15075 in project for chicken


Ignore:
Timestamp:
06/26/09 10:29:10 (10 years ago)
Author:
felix winkelmann
Message:

csi: -sx didn't ignore extra options and arguments; makedist.scm generates html

Location:
chicken/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/csi.scm

    r15049 r15075  
    845845        '()
    846846        (let ((x (car args)))
    847           (cond ((member x '("-s" "-ss" "-script" "--")) args)
     847          (cond ((member x '("-s" "-ss" "-script" "-sx" "--")) args)
    848848                ((and (fx> (##sys#size x) 2)
    849849                       (char=? #\- (##core#inline "C_subchar" x 0))
  • chicken/trunk/scripts/makedist.scm

    r13851 r15075  
    5050    (run (rm -fr ,distname)) ) )
    5151
     52(define (make-html)
     53  (unless (file-exists? "html")
     54    (create-directory "html"))
     55  (for-each
     56   (lambda (f)
     57     (run (,(or (get-environment-variable "CSI") "csi") -s scripts/wiki2html.scm
     58           html ,f)))
     59   (directory "manual")))
     60
    5261(define *makeargs*
    5362  (simple-args
     
    5867
    5968(run (,*make* -f ,(conc "Makefile." *platform*) distfiles ,@*makeargs*))
     69
     70(make-html)
     71(run (cp misc/manual.css html))
     72
    6073(release *release*)
  • chicken/trunk/scripts/tools.scm

    r13735 r15075  
    2424
    2525(define *tty-width*
    26   (or (and *tty*
     26  (or (and *tty*
     27           (not *windows-shell*)
    2728           (with-input-from-pipe "stty size 2>/dev/null"
    2829             (lambda () (read) (read))))
     
    8687                               (list (car line))
    8788                               (car line))])
    88                (if (ormap match? names)
     89               (if (any match? names)
    8990                   line
    9091                   (loop (cdr lines))))]))))
     
    9697  (and (or (list? spec) (form-error "specification is not a list" spec))
    9798       (or (pair? spec) (form-error "specification is an empty list" spec))
    98        (andmap
     99       (every
    99100        (lambda (line)
    100101          (and (or (and (list? line) (<= 2 (length line) 3))
     
    102103               (or (or (string? (car line))
    103104                       (and (list? (car line))
    104                             (andmap string? (car line))))
     105                            (every string? (car line))))
    105106                   (form-error "line does not start with a string or list of strings" line))
    106107               (let ([name (car line)])
    107108                 (or (list? (cadr line))
    108109                     (line-error "second part of line is not a list" (cadr line) name)
    109                      (andmap (lambda (dep)
     110                     (every (lambda (dep)
    110111                               (or (string? dep)
    111112                                   (form-error "dependency item is not a string" dep)))
     
    119120  (or (string? argv)
    120121      (and (vector? argv)
    121            (andmap string? (vector->list argv)))
     122           (every string? (vector->list argv)))
    122123      (error "argument is not a string or string vector" argv)))
    123124
     
    141142                      (let ([reason
    142143                             (or (not date)
    143                                  (ormap (lambda (dep)
     144                                 (any (lambda (dep)
    144145                                          (unless (file-exists? dep)
    145146                                            (quit "dependancy ~a was not made~%" dep))
  • chicken/trunk/scripts/wiki2html.scm

    r13710 r15075  
    11;;;; wiki2html.scm - quick-and-dirty svnwiki->HTML conversion
    2 ;
    3 ; usage: wiki2html <INPUTFILE >OUTPUTFILE
    42
    53
Note: See TracChangeset for help on using the changeset viewer.