From cb66af826596b7bfba0fa45f8eb25fcf1613bc13 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 15 Oct 2023 12:13:58 +0100 Subject: ccwl: Make #:stderr and #:stdout first class parameters. #:stderr and #:stdout, especially #:stdout, are commonly required. They ought to be first class parameters and not tucked away into #:other. * ccwl/ccwl.scm ()[stderr, stdout]: New fields. * ccwl/ccwl.scm (command): Accept #:stderr and #:stdout as first class parameters. * ccwl/cwl.scm (command->cwl-scm): Serialize stderr and stdout fields. * doc/capture-stdout.scm (print), doc/decompress-compile-run.scm (run), doc/checksum.scm (md5sum, sha1sum, sha256sum), doc/spell-check.scm (find-misspellings): Capture stdout in file. * doc/checksum.scm, doc/decompress-compile-run.scm: * doc/ccwl.skb (Tutorial)[Capturing the standard output stream of a command]: Document #:stdout first class parameter. * doc/ccwl.skb (Tutorial)[Workflow with multiple steps]: Capture stdout in explicitly named files. * tests/ccwl.scm ("commands with non-string #:stderr parameters must raise a &ccwl-violation condition", "commands with non-string #:stdout parameters must raise a &ccwl-violation condition"): New tests. --- doc/checksum.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'doc/checksum.scm') diff --git a/doc/checksum.scm b/doc/checksum.scm index 297ac14..9474964 100644 --- a/doc/checksum.scm +++ b/doc/checksum.scm @@ -1,17 +1,20 @@ (define md5sum (command #:inputs (file #:type File) #:run "md5sum" file - #:outputs (md5 #:type stdout))) + #:outputs (md5 #:type stdout) + #:stdout "md5")) (define sha1sum (command #:inputs (file #:type File) #:run "sha1sum" file - #:outputs (sha1 #:type stdout))) + #:outputs (sha1 #:type stdout) + #:stdout "sha1")) (define sha256sum (command #:inputs (file #:type File) #:run "sha256sum" file - #:outputs (sha256 #:type stdout))) + #:outputs (sha256 #:type stdout) + #:stdout "sha256")) (workflow ((file #:type File)) (tee (md5sum #:file file) -- cgit v1.2.3