File tree 6 files changed +20
-2
lines changed
6 files changed +20
-2
lines changed Original file line number Diff line number Diff line change 1
1
(use salmonella salmonella-log-parser)
2
+ (include " salmonella-version.scm" )
2
3
(include " salmonella-common.scm" )
3
4
4
5
(define default-verbosity 2)
94
95
(member " --help" args))
95
96
(usage exit-code: 0 ))
96
97
98
+ (when (member " --version" args)
99
+ (print salmonella-version)
100
+ (exit 0 ))
101
+
97
102
(let* ((this-egg? (or (and (member " --this-egg" args)
98
103
(begin
99
104
(print " WARNING: --this-egg is deprecated" )
Original file line number Diff line number Diff line change 1
1
(use posix salmonella salmonella-log-parser)
2
2
(include " salmonella-common.scm" )
3
+ (include " salmonella-version.scm" )
3
4
4
5
(define default-verbosity 0)
5
6
72
73
(when (or (member " -h" args)
73
74
(member " --help" args))
74
75
(usage exit-code: 0 epidemy?: #t ))
76
+ (when (member " --version" args)
77
+ (print salmonella-version)
78
+ (exit 0 ))
75
79
(let* ((chicken-installation-prefix
76
80
(cmd-line-arg '--chicken-installation-prefix args))
77
81
(salmonella-prefix
Original file line number Diff line number Diff line change 1
1
(use salmonella salmonella-log-parser)
2
2
(include " salmonella-common.scm" )
3
+ (include " salmonella-version.scm" )
3
4
4
5
(define (merge-logs log-files )
5
6
(let* ((logs (map read-log-file log-files))
47
48
(let ((args (command-line-arguments)))
48
49
(when (null? args)
49
50
(usage 1 ))
51
+ (when (member " --version" args)
52
+ (print salmonella-version)
53
+ (exit 0 ))
50
54
(let ((log-files
51
55
(remove (lambda (arg )
52
56
(string-prefix? " --" arg))
Original file line number Diff line number Diff line change 1
1
(use salmonella-log-parser)
2
+ (include " salmonella-version.scm" )
2
3
3
4
(define (concat l )
4
5
(string-intersperse (map ->string l) " " ))
51
52
(when (or (member " -h" args)
52
53
(member " --help" args))
53
54
(usage 0 ))
55
+ (when (member " --version" args)
56
+ (print salmonella-version)
57
+ (exit 0 ))
54
58
(view-log (car args)))
Original file line number Diff line number Diff line change
1
+ (define salmonella-version "2.6")
Original file line number Diff line number Diff line change 1
1
; ;; salmonella.setup -*- scheme -*-
2
2
3
+ (include " salmonella-version.scm" )
4
+
3
5
; ; Compile the extensions
4
6
(compile -S -s -O3 -d1 -J salmonella.scm)
5
7
(compile -S -s -O3 -d1 salmonella.import.scm)
13
15
(compile -S -O3 -d1 salmonella-log-viewer.scm -o salmonella-log-viewer)
14
16
(compile -S -O3 -d1 salmonella-log-merger.scm -o salmonella-log-merger)
15
17
16
- (define salmonella-version "2.6")
17
-
18
18
(install-extension 'salmonella
19
19
' (" salmonella.so" " salmonella.import.so" )
20
20
`((version ,salmonella-version)))
You can’t perform that action at this time.
0 commit comments