Skip to content

Commit 7e7913e

Browse files
committed
Command line tools handle --version (suggested by Michael Stapelberg)
1 parent cca5267 commit 7e7913e

6 files changed

+20
-2
lines changed

salmonella-cmd.scm

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(use salmonella salmonella-log-parser)
2+
(include "salmonella-version.scm")
23
(include "salmonella-common.scm")
34

45
(define default-verbosity 2)
@@ -94,6 +95,10 @@ EOF
9495
(member "--help" args))
9596
(usage exit-code: 0))
9697

98+
(when (member "--version" args)
99+
(print salmonella-version)
100+
(exit 0))
101+
97102
(let* ((this-egg? (or (and (member "--this-egg" args)
98103
(begin
99104
(print "WARNING: --this-egg is deprecated")

salmonella-epidemy.scm

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(use posix salmonella salmonella-log-parser)
22
(include "salmonella-common.scm")
3+
(include "salmonella-version.scm")
34

45
(define default-verbosity 0)
56

@@ -72,6 +73,9 @@
7273
(when (or (member "-h" args)
7374
(member "--help" args))
7475
(usage exit-code: 0 epidemy?: #t))
76+
(when (member "--version" args)
77+
(print salmonella-version)
78+
(exit 0))
7579
(let* ((chicken-installation-prefix
7680
(cmd-line-arg '--chicken-installation-prefix args))
7781
(salmonella-prefix

salmonella-log-merger.scm

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(use salmonella salmonella-log-parser)
22
(include "salmonella-common.scm")
3+
(include "salmonella-version.scm")
34

45
(define (merge-logs log-files)
56
(let* ((logs (map read-log-file log-files))
@@ -47,6 +48,9 @@
4748
(let ((args (command-line-arguments)))
4849
(when (null? args)
4950
(usage 1))
51+
(when (member "--version" args)
52+
(print salmonella-version)
53+
(exit 0))
5054
(let ((log-files
5155
(remove (lambda (arg)
5256
(string-prefix? "--" arg))

salmonella-log-viewer.scm

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(use salmonella-log-parser)
2+
(include "salmonella-version.scm")
23

34
(define (concat l)
45
(string-intersperse (map ->string l) ""))
@@ -51,4 +52,7 @@
5152
(when (or (member "-h" args)
5253
(member "--help" args))
5354
(usage 0))
55+
(when (member "--version" args)
56+
(print salmonella-version)
57+
(exit 0))
5458
(view-log (car args)))

salmonella-version.scm

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
(define salmonella-version "2.6")

salmonella.setup

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
;;; salmonella.setup -*- scheme -*-
22

3+
(include "salmonella-version.scm")
4+
35
;; Compile the extensions
46
(compile -S -s -O3 -d1 -J salmonella.scm)
57
(compile -S -s -O3 -d1 salmonella.import.scm)
@@ -13,8 +15,6 @@
1315
(compile -S -O3 -d1 salmonella-log-viewer.scm -o salmonella-log-viewer)
1416
(compile -S -O3 -d1 salmonella-log-merger.scm -o salmonella-log-merger)
1517

16-
(define salmonella-version "2.6")
17-
1818
(install-extension 'salmonella
1919
'("salmonella.so" "salmonella.import.so")
2020
`((version ,salmonella-version)))

0 commit comments

Comments
 (0)