Skip to content

Commit abf8e70

Browse files
committed
depend on fieldslib and the syntax extension
For mirage#38
1 parent 8f24e8e commit abf8e70

File tree

4 files changed

+45
-8
lines changed

4 files changed

+45
-8
lines changed

_oasis

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Library cohttp
1212
Findlibname: cohttp
1313
Pack: true
1414
Modules: IO, Code, Header, Cookie, Request, Response, Transfer, Accept, Accept_parser, Accept_lexer, Base64, Auth, Header_io, Transfer_io, Client
15-
BuildDepends: re, uri (>= 1.3.8), uri.services
15+
BuildDepends: re, uri (>= 1.3.8), uri.services, fieldslib, fieldslib.syntax
1616

1717
Flag lwt
1818
Description: build the Lwt library

_tags

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: a952834f500b83eea06ca53d69394888)
2+
# DO NOT EDIT (digest: 089787a6c5457a0274e3a8e4ceb59b20)
33
# Ignore VCS directories, you can use the same kind of rule outside
44
# OASIS_START/STOP if you want to exclude directories that contains
55
# useless stuff for the build process
@@ -33,6 +33,8 @@
3333
<cohttp/*.ml{,i}>: pkg_uri
3434
<cohttp/*.ml{,i}>: pkg_re
3535
<cohttp/*.ml{,i}>: pkg_uri.services
36+
<cohttp/*.ml{,i}>: pkg_fieldslib
37+
<cohttp/*.ml{,i}>: pkg_fieldslib.syntax
3638
# Library cohttp_lwt_unix
3739
"lwt/cohttp_lwt_unix.cmxs": use_cohttp_lwt_unix
3840
<lwt/*.ml{,i}>: pkg_lwt.unix
@@ -48,6 +50,8 @@
4850
<lwt/*.ml{,i}>: pkg_mirage-net
4951
<lwt/*.ml{,i}>: pkg_cstruct
5052
<lwt/*.ml{,i}>: pkg_uri.services
53+
<lwt/*.ml{,i}>: pkg_fieldslib
54+
<lwt/*.ml{,i}>: pkg_fieldslib.syntax
5155
# Library cohttp_async
5256
"async/cohttp_async.cmxs": use_cohttp_async
5357
<async/*.ml{,i}>: use_cohttp
@@ -58,6 +62,8 @@
5862
<async/*.ml{,i}>: pkg_async
5963
<async/*.ml{,i}>: pkg_re
6064
<async/*.ml{,i}>: pkg_uri.services
65+
<async/*.ml{,i}>: pkg_fieldslib
66+
<async/*.ml{,i}>: pkg_fieldslib.syntax
6167
# Executable test_parser
6268
<lib_test/test_parser.{native,byte}>: use_cohttp_lwt_unix
6369
<lib_test/test_parser.{native,byte}>: use_cohttp
@@ -69,20 +75,26 @@
6975
<lib_test/test_parser.{native,byte}>: pkg_lwt
7076
<lib_test/test_parser.{native,byte}>: pkg_lwt.ssl
7177
<lib_test/test_parser.{native,byte}>: pkg_uri.services
78+
<lib_test/test_parser.{native,byte}>: pkg_fieldslib
79+
<lib_test/test_parser.{native,byte}>: pkg_fieldslib.syntax
7280
<lib_test/test_parser.{native,byte}>: custom
7381
# Executable test_accept
7482
<lib_test/test_accept.{native,byte}>: use_cohttp
7583
<lib_test/test_accept.{native,byte}>: pkg_oUnit
7684
<lib_test/test_accept.{native,byte}>: pkg_uri
7785
<lib_test/test_accept.{native,byte}>: pkg_re
7886
<lib_test/test_accept.{native,byte}>: pkg_uri.services
87+
<lib_test/test_accept.{native,byte}>: pkg_fieldslib
88+
<lib_test/test_accept.{native,byte}>: pkg_fieldslib.syntax
7989
<lib_test/test_accept.{native,byte}>: custom
8090
# Executable test_header
8191
<lib_test/test_header.{native,byte}>: use_cohttp
8292
<lib_test/test_header.{native,byte}>: pkg_oUnit
8393
<lib_test/test_header.{native,byte}>: pkg_uri
8494
<lib_test/test_header.{native,byte}>: pkg_re
8595
<lib_test/test_header.{native,byte}>: pkg_uri.services
96+
<lib_test/test_header.{native,byte}>: pkg_fieldslib
97+
<lib_test/test_header.{native,byte}>: pkg_fieldslib.syntax
8698
<lib_test/test_header.{native,byte}>: custom
8799
# Executable test_net_lwt
88100
<lib_test/test_net_lwt.{native,byte}>: use_cohttp_lwt_unix
@@ -95,6 +107,8 @@
95107
<lib_test/test_net_lwt.{native,byte}>: pkg_lwt
96108
<lib_test/test_net_lwt.{native,byte}>: pkg_lwt.ssl
97109
<lib_test/test_net_lwt.{native,byte}>: pkg_uri.services
110+
<lib_test/test_net_lwt.{native,byte}>: pkg_fieldslib
111+
<lib_test/test_net_lwt.{native,byte}>: pkg_fieldslib.syntax
98112
<lib_test/test_net_lwt.{native,byte}>: custom
99113
# Executable test_net_lwt_google
100114
<lib_test/test_net_lwt_google.{native,byte}>: use_cohttp_lwt_unix
@@ -106,6 +120,8 @@
106120
<lib_test/test_net_lwt_google.{native,byte}>: pkg_lwt
107121
<lib_test/test_net_lwt_google.{native,byte}>: pkg_lwt.ssl
108122
<lib_test/test_net_lwt_google.{native,byte}>: pkg_uri.services
123+
<lib_test/test_net_lwt_google.{native,byte}>: pkg_fieldslib
124+
<lib_test/test_net_lwt_google.{native,byte}>: pkg_fieldslib.syntax
109125
<lib_test/test_net_lwt_google.{native,byte}>: custom
110126
# Executable test_net_lwt_lastminute
111127
<lib_test/test_net_lwt_lastminute.{native,byte}>: use_cohttp_lwt_unix
@@ -117,6 +133,8 @@
117133
<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_lwt
118134
<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_lwt.ssl
119135
<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_uri.services
136+
<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_fieldslib
137+
<lib_test/test_net_lwt_lastminute.{native,byte}>: pkg_fieldslib.syntax
120138
<lib_test/test_net_lwt_lastminute.{native,byte}>: custom
121139
# Executable test_net_lwt_server
122140
<lib_test/test_net_lwt_server.{native,byte}>: use_cohttp_lwt_unix
@@ -128,6 +146,8 @@
128146
<lib_test/test_net_lwt_server.{native,byte}>: pkg_lwt
129147
<lib_test/test_net_lwt_server.{native,byte}>: pkg_lwt.ssl
130148
<lib_test/test_net_lwt_server.{native,byte}>: pkg_uri.services
149+
<lib_test/test_net_lwt_server.{native,byte}>: pkg_fieldslib
150+
<lib_test/test_net_lwt_server.{native,byte}>: pkg_fieldslib.syntax
131151
<lib_test/test_net_lwt_server.{native,byte}>: custom
132152
# Executable test_net_lwt_multi_get
133153
<lib_test/test_net_lwt_multi_get.{native,byte}>: use_cohttp_lwt_unix
@@ -139,6 +159,8 @@
139159
<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_lwt
140160
<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_lwt.ssl
141161
<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_uri.services
162+
<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_fieldslib
163+
<lib_test/test_net_lwt_multi_get.{native,byte}>: pkg_fieldslib.syntax
142164
<lib_test/test_net_lwt_multi_get.{native,byte}>: custom
143165
# Executable test_net_lwt_client_and_server
144166
<lib_test/test_net_lwt_client_and_server.{native,byte}>: use_cohttp_lwt_unix
@@ -150,6 +172,8 @@
150172
<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_lwt
151173
<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_lwt.ssl
152174
<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_uri.services
175+
<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_fieldslib
176+
<lib_test/test_net_lwt_client_and_server.{native,byte}>: pkg_fieldslib.syntax
153177
<lib_test/*.ml{,i}>: use_cohttp_lwt_unix
154178
<lib_test/*.ml{,i}>: pkg_lwt.syntax
155179
<lib_test/*.ml{,i}>: pkg_lwt.unix
@@ -167,6 +191,8 @@
167191
<lib_test/test_net_async.{native,byte}>: pkg_async
168192
<lib_test/test_net_async.{native,byte}>: pkg_re
169193
<lib_test/test_net_async.{native,byte}>: pkg_uri.services
194+
<lib_test/test_net_async.{native,byte}>: pkg_fieldslib
195+
<lib_test/test_net_async.{native,byte}>: pkg_fieldslib.syntax
170196
<lib_test/test_net_async.{native,byte}>: custom
171197
# Executable test_net_async_http10
172198
<lib_test/test_net_async_http10.{native,byte}>: use_cohttp_async
@@ -179,6 +205,8 @@
179205
<lib_test/test_net_async_http10.{native,byte}>: pkg_async
180206
<lib_test/test_net_async_http10.{native,byte}>: pkg_re
181207
<lib_test/test_net_async_http10.{native,byte}>: pkg_uri.services
208+
<lib_test/test_net_async_http10.{native,byte}>: pkg_fieldslib
209+
<lib_test/test_net_async_http10.{native,byte}>: pkg_fieldslib.syntax
182210
<lib_test/test_net_async_http10.{native,byte}>: custom
183211
# Executable test_net_async_multi_get
184212
<lib_test/test_net_async_multi_get.{native,byte}>: use_cohttp_async
@@ -191,6 +219,8 @@
191219
<lib_test/test_net_async_multi_get.{native,byte}>: pkg_async
192220
<lib_test/test_net_async_multi_get.{native,byte}>: pkg_re
193221
<lib_test/test_net_async_multi_get.{native,byte}>: pkg_uri.services
222+
<lib_test/test_net_async_multi_get.{native,byte}>: pkg_fieldslib
223+
<lib_test/test_net_async_multi_get.{native,byte}>: pkg_fieldslib.syntax
194224
<lib_test/test_net_async_multi_get.{native,byte}>: custom
195225
# Executable test_net_async_server
196226
<lib_test/test_net_async_server.{native,byte}>: use_cohttp_async
@@ -203,6 +233,8 @@
203233
<lib_test/test_net_async_server.{native,byte}>: pkg_async
204234
<lib_test/test_net_async_server.{native,byte}>: pkg_re
205235
<lib_test/test_net_async_server.{native,byte}>: pkg_uri.services
236+
<lib_test/test_net_async_server.{native,byte}>: pkg_fieldslib
237+
<lib_test/test_net_async_server.{native,byte}>: pkg_fieldslib.syntax
206238
<lib_test/*.ml{,i}>: use_cohttp_async
207239
<lib_test/*.ml{,i}>: use_cohttp
208240
<lib_test/*.ml{,i}>: pkg_oUnit
@@ -213,8 +245,11 @@
213245
<lib_test/*.ml{,i}>: pkg_async
214246
<lib_test/*.ml{,i}>: pkg_re
215247
<lib_test/*.ml{,i}>: pkg_uri.services
248+
<lib_test/*.ml{,i}>: pkg_fieldslib
249+
<lib_test/*.ml{,i}>: pkg_fieldslib.syntax
216250
<lib_test/test_net_async_server.{native,byte}>: custom
217251
# OASIS_STOP
218252
<lib_test/{test_parser,test_net_lwt,test_net_lwt_server,test_net_mirage_server,test_net_lwt_client_and_server}.ml>: syntax_camlp4o, pkg_lwt.syntax
253+
<cohttp/request.*> or <cohttp/response.*>: syntax_camlp4o, pkg_fieldslib.syntax
219254
<lwt/*>: syntax_camlp4o, pkg_lwt.syntax
220255
true: annot, bin_annot, debug, strict_sequence, principal

cohttp/META

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 7bf24c643dda32c927ea8b69743286c8)
2+
# DO NOT EDIT (digest: 6986af1ee7d3541b9e1fb0656ec3ac2c)
33
version = "0.9.12"
44
description = "HTTP library for Lwt, Async and Mirage"
5-
requires = "re uri uri.services"
5+
requires = "re uri uri.services fieldslib fieldslib.syntax"
66
archive(byte) = "cohttp.cma"
77
archive(byte, plugin) = "cohttp.cma"
88
archive(native) = "cohttp.cmxa"

setup.ml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(* setup.ml generated for the first time by OASIS v0.3.0 *)
22

33
(* OASIS_START *)
4-
(* DO NOT EDIT (digest: 593ccbddb9983c23e4c4346604032ae0) *)
4+
(* DO NOT EDIT (digest: 5034fb7227d1c4839f4277cf84844014) *)
55
(*
66
Regenerated by OASIS v0.3.0
77
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5929,7 +5929,9 @@ let setup_t =
59295929
FindlibPackage
59305930
("uri",
59315931
Some (OASISVersion.VGreaterEqual "1.3.8"));
5932-
FindlibPackage ("uri.services", None)
5932+
FindlibPackage ("uri.services", None);
5933+
FindlibPackage ("fieldslib", None);
5934+
FindlibPackage ("fieldslib.syntax", None)
59335935
];
59345936
bs_build_tools = [ExternalTool "ocamlbuild"];
59355937
bs_c_sources = [];
@@ -6905,14 +6907,14 @@ let setup_t =
69056907
};
69066908
oasis_fn = Some "_oasis";
69076909
oasis_version = "0.3.0";
6908-
oasis_digest = Some "ó·í^\020?\148Nf«\1547\143JWæ";
6910+
oasis_digest = Some "t\016;ªYþ\024jÍTl\134t\t|=";
69096911
oasis_exec = None;
69106912
oasis_setup_args = [];
69116913
setup_update = false;
69126914
};;
69136915

69146916
let setup () = BaseSetup.setup setup_t;;
69156917

6916-
# 6917 "setup.ml"
6918+
# 6919 "setup.ml"
69176919
(* OASIS_STOP *)
69186920
let () = setup ();;

0 commit comments

Comments
 (0)