1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
| | From c0f281d2ef927686ed42f9c44828c501011a60dc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Tue, 5 Jul 2022 16:58:53 +0200
Subject: Require guile-config >= 0.5.0.
---
configure.ac | 5 +++++
gwl/config.scm.in | 14 +++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index a6897f4..eadc82f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,11 @@ GUILE_MODULE_REQUIRED(gcrypt hash)
GUILE_MODULE_REQUIRED(pfds sets)
GUILE_MODULE_REQUIRED(drmaa v1 high)
GUILE_MODULE_REQUIRED(config)
+GUILE_MODULE_CHECK(guile_config_too_old,(config api),(argument (name 'foo) (optional? 'old)),supports `optional?' field in argument definition)
+if test "x$guile_config_too_old" = "xyes"; then
+ AC_MSG_ERROR([Guile Config needs to be version 0.5.0 or higher.])
+fi
+
AC_PATH_PROG([DOT], [dot])
if test "x$DOT" = "x"; then
AC_MSG_ERROR(['dot' could not be found; please check your Graphviz installation.])
diff --git a/gwl/config.scm.in b/gwl/config.scm.in
index 20a562e..d64eca3 100644
--- a/gwl/config.scm.in
+++ b/gwl/config.scm.in
@@ -65,7 +65,6 @@ workflow.")
(list
(argument
(name 'file)
- (optional? #false)
(test file-exists?)
(handler identity)
(example "/path/to/my-workflow.w"))))
@@ -95,12 +94,19 @@ workflow.")
(character #\i)
(synopsis "Specify workflow input NAME, optionally mapped to FILE")
(example "NAME[=FILE]")
- (test string?))
+ (default #false)
+ (test (match-lambda
+ (#false #true)
+ (value (string? value)))))
(switch
(name 'output)
(character #\o)
(synopsis "Set LOCATION as output for a workflow")
- (example "LOCATION"))
+ (example "LOCATION")
+ (default #false)
+ (test (match-lambda
+ (#false #true)
+ (value (string? value)))))
(switch
(name 'engine)
(character #\e)
@@ -147,11 +153,9 @@ format) of the specified workflow.")
(list
(argument
(name 'file)
- (optional? #false)
(test file-exists?)
(handler identity)
(example "/path/to/my-workflow.w")))))
-
(configuration
(name 'web)
(synopsis "Start the web interface")
--
cgit v1.1
|