~ chicken-core (chicken-5) 2dbe4d40e0f197f24e27191d8564b2ee3d9867f7
commit 2dbe4d40e0f197f24e27191d8564b2ee3d9867f7 Author: felix <felix@call-with-current-continuation.org> AuthorDate: Sat Mar 27 16:19:53 2010 +0100 Commit: felix <felix@call-with-current-continuation.org> CommitDate: Sat Mar 27 16:19:53 2010 +0100 fixed bug in csc (use of unbound INSTALL_RC_COMPILER); fix in mini-salmonella; fix in wiki2html by zbigniew diff --git a/csc.scm b/csc.scm index d8513918..63260e1e 100644 --- a/csc.scm +++ b/csc.scm @@ -32,7 +32,7 @@ (define-foreign-variable INSTALL_BIN_HOME c-string "C_INSTALL_BIN_HOME") (define-foreign-variable INSTALL_CC c-string "C_INSTALL_CC") (define-foreign-variable INSTALL_CXX c-string "C_INSTALL_CXX") -(define-foreign-variable TARGET_RC_COMPILER c-string "C_INSTALL_RC_COMPILER") +(define-foreign-variable INSTALL_RC_COMPILER c-string "C_INSTALL_RC_COMPILER") (define-foreign-variable TARGET_CC c-string "C_TARGET_CC") (define-foreign-variable TARGET_CXX c-string "C_TARGET_CXX") (define-foreign-variable TARGET_RC_COMPILER c-string "C_TARGET_RC_COMPILER") diff --git a/scripts/mini-salmonella.scm b/scripts/mini-salmonella.scm index 6c925125..5af7d267 100644 --- a/scripts/mini-salmonella.scm +++ b/scripts/mini-salmonella.scm @@ -61,7 +61,7 @@ (if (null? tags) (or trunkdir ed) (make-pathname ed (string-append "tags/" (first tags)))))) - (else ed)))) + (else (or trunkdir ed))))) (define (report egg msg . args) (printf "~a..~?~%" (make-string (max 2 (- 32 (string-length egg))) #\.) @@ -94,9 +94,10 @@ "" (string-append "-t local -l " (normalize-pathname *eggdir*) " ")) egg " " - (if (not *debug*) - (sprintf "2>~a >>~a.out" *tmplogfile* *logfile*) - "")))) + (cond ((not *debug*) + (delete-file* (string-append *logfile* ".out")) + (sprintf "2>~a >>~a.out" *tmplogfile* *logfile*)) + (else ""))))) (when *debug* (print " " command)) (let ((status (system command))) diff --git a/scripts/wiki2html.scm b/scripts/wiki2html.scm index ebbc03c7..c885f95b 100644 --- a/scripts/wiki2html.scm +++ b/scripts/wiki2html.scm @@ -154,7 +154,7 @@ (push-tag `(ol . ,(string-length (second m))) out) (set! *list-continuation* #t) (fprintf out "<li>~a~%" (inline (third m))))) - (else (error "unknown block match" m))´) + (else (error "unknown block match" m))) (loop))))))Trap