Skip to content

Commit 742f8ac

Browse files
seliopouseliopou
committed
v0.3.0-rc: bump version number to 0.3.0
1 parent 7ef4f26 commit 742f8ac

File tree

5 files changed

+200
-220
lines changed

5 files changed

+200
-220
lines changed

‎_oasis‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OASISFormat: 0.3
22
OCamlVersion: >= 4.01.0
33
Name: openflow
4-
Version: 0.2.0
4+
Version: 0.3.0
55
Synopsis: Serialization library for OpenFlow
66
Authors: https://github.com/frenetic-lang/ocaml-openflow/contributors
77
License: LGPL
@@ -74,13 +74,13 @@ Library quickcheck
7474
Path: quickcheck
7575
Build$: flag(tests) || flag(quickcheck)
7676
BuildDepends:
77-
quickcheck,
78-
openflow
77+
quickcheck,
78+
openflow
7979
Modules:
80-
Arbitrary_Base,
81-
Arbitrary_OpenFlow,
82-
Arbitrary_OpenFlow0x01,
83-
Arbitrary_SDN_Types
80+
Arbitrary_Base,
81+
Arbitrary_OpenFlow,
82+
Arbitrary_OpenFlow0x01,
83+
Arbitrary_SDN_Types
8484

8585
Executable testtool
8686
Path: test

‎_tags‎

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 872119f14ab3f21a5c84730a2ca36fe5)
2+
# DO NOT EDIT (digest: e1e26434aaae617000c026272165c731)
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
@@ -15,131 +15,129 @@
1515
"_darcs": not_hygienic
1616
# Library openflow
1717
"lib/openflow.cmxs": use_openflow
18+
<lib/*.ml{,i}>: package(threads)
1819
<lib/*.ml{,i}>: package(core)
19-
<lib/*.ml{,i}>: package(cstruct)
20-
<lib/*.ml{,i}>: package(cstruct.syntax)
2120
<lib/*.ml{,i}>: package(packet)
2221
<lib/*.ml{,i}>: package(sexplib.syntax)
2322
<lib/*.ml{,i}>: package(str)
24-
<lib/*.ml{,i}>: package(threads)
23+
<lib/*.ml{,i}>: package(cstruct)
24+
<lib/*.ml{,i}>: package(cstruct.syntax)
2525
# Library async
2626
"async/async.cmxs": use_async
27-
<async/*.ml{,i}>: package(async)
27+
<async/*.ml{,i}>: use_openflow
28+
<async/*.ml{,i}>: package(threads)
2829
<async/*.ml{,i}>: package(core)
29-
<async/*.ml{,i}>: package(cstruct)
30-
<async/*.ml{,i}>: package(cstruct.async)
31-
<async/*.ml{,i}>: package(cstruct.syntax)
30+
<async/*.ml{,i}>: package(async)
3231
<async/*.ml{,i}>: package(packet)
32+
<async/*.ml{,i}>: package(cstruct.async)
3333
<async/*.ml{,i}>: package(sexplib.syntax)
3434
<async/*.ml{,i}>: package(str)
35-
<async/*.ml{,i}>: package(threads)
36-
<async/*.ml{,i}>: use_openflow
35+
<async/*.ml{,i}>: package(cstruct)
36+
<async/*.ml{,i}>: package(cstruct.syntax)
3737
# Library quickcheck
3838
"quickcheck/quickcheck.cmxs": use_quickcheck
39+
<quickcheck/*.ml{,i}>: use_openflow
40+
<quickcheck/*.ml{,i}>: package(threads)
3941
<quickcheck/*.ml{,i}>: package(core)
40-
<quickcheck/*.ml{,i}>: package(cstruct)
41-
<quickcheck/*.ml{,i}>: package(cstruct.syntax)
4242
<quickcheck/*.ml{,i}>: package(packet)
4343
<quickcheck/*.ml{,i}>: package(quickcheck)
4444
<quickcheck/*.ml{,i}>: package(sexplib.syntax)
4545
<quickcheck/*.ml{,i}>: package(str)
46-
<quickcheck/*.ml{,i}>: package(threads)
47-
<quickcheck/*.ml{,i}>: use_openflow
46+
<quickcheck/*.ml{,i}>: package(cstruct)
47+
<quickcheck/*.ml{,i}>: package(cstruct.syntax)
4848
# Executable testtool
49+
"test/Test.byte": use_quickcheck
50+
"test/Test.byte": use_openflow
51+
"test/Test.byte": package(threads)
4952
"test/Test.byte": package(core)
50-
"test/Test.byte": package(cstruct)
51-
"test/Test.byte": package(cstruct.syntax)
53+
"test/Test.byte": package(packet)
5254
"test/Test.byte": package(oUnit)
5355
"test/Test.byte": package(pa_ounit)
5456
"test/Test.byte": package(pa_ounit.syntax)
55-
"test/Test.byte": package(packet)
5657
"test/Test.byte": package(quickcheck)
5758
"test/Test.byte": package(sexplib.syntax)
5859
"test/Test.byte": package(str)
59-
"test/Test.byte": package(threads)
60-
"test/Test.byte": use_openflow
61-
"test/Test.byte": use_quickcheck
60+
"test/Test.byte": package(cstruct)
61+
"test/Test.byte": package(cstruct.syntax)
62+
<test/*.ml{,i}>: use_quickcheck
63+
<test/*.ml{,i}>: use_openflow
64+
<test/*.ml{,i}>: package(threads)
6265
<test/*.ml{,i}>: package(core)
63-
<test/*.ml{,i}>: package(cstruct)
64-
<test/*.ml{,i}>: package(cstruct.syntax)
66+
<test/*.ml{,i}>: package(packet)
6567
<test/*.ml{,i}>: package(oUnit)
6668
<test/*.ml{,i}>: package(pa_ounit)
6769
<test/*.ml{,i}>: package(pa_ounit.syntax)
68-
<test/*.ml{,i}>: package(packet)
6970
<test/*.ml{,i}>: package(quickcheck)
7071
<test/*.ml{,i}>: package(sexplib.syntax)
7172
<test/*.ml{,i}>: package(str)
72-
<test/*.ml{,i}>: package(threads)
73-
<test/*.ml{,i}>: use_openflow
74-
<test/*.ml{,i}>: use_quickcheck
73+
<test/*.ml{,i}>: package(cstruct)
74+
<test/*.ml{,i}>: package(cstruct.syntax)
7575
# Executable ping_test
76-
"ping-test/PingTest.byte": package(async)
76+
"ping-test/PingTest.byte": use_async
77+
"ping-test/PingTest.byte": use_openflow
78+
"ping-test/PingTest.byte": package(threads)
7779
"ping-test/PingTest.byte": package(core)
78-
"ping-test/PingTest.byte": package(cstruct)
80+
"ping-test/PingTest.byte": package(async)
81+
"ping-test/PingTest.byte": package(packet)
7982
"ping-test/PingTest.byte": package(cstruct.async)
80-
"ping-test/PingTest.byte": package(cstruct.syntax)
8183
"ping-test/PingTest.byte": package(oUnit)
8284
"ping-test/PingTest.byte": package(pa_ounit)
8385
"ping-test/PingTest.byte": package(pa_ounit.syntax)
84-
"ping-test/PingTest.byte": package(packet)
8586
"ping-test/PingTest.byte": package(sexplib.syntax)
8687
"ping-test/PingTest.byte": package(str)
87-
"ping-test/PingTest.byte": package(threads)
88-
"ping-test/PingTest.byte": use_async
89-
"ping-test/PingTest.byte": use_openflow
90-
<ping-test/*.ml{,i}>: package(async)
88+
"ping-test/PingTest.byte": package(cstruct)
89+
"ping-test/PingTest.byte": package(cstruct.syntax)
90+
<ping-test/*.ml{,i}>: use_async
91+
<ping-test/*.ml{,i}>: use_openflow
92+
<ping-test/*.ml{,i}>: package(threads)
9193
<ping-test/*.ml{,i}>: package(core)
92-
<ping-test/*.ml{,i}>: package(cstruct)
94+
<ping-test/*.ml{,i}>: package(async)
95+
<ping-test/*.ml{,i}>: package(packet)
9396
<ping-test/*.ml{,i}>: package(cstruct.async)
94-
<ping-test/*.ml{,i}>: package(cstruct.syntax)
9597
<ping-test/*.ml{,i}>: package(oUnit)
9698
<ping-test/*.ml{,i}>: package(pa_ounit)
9799
<ping-test/*.ml{,i}>: package(pa_ounit.syntax)
98-
<ping-test/*.ml{,i}>: package(packet)
99100
<ping-test/*.ml{,i}>: package(sexplib.syntax)
100101
<ping-test/*.ml{,i}>: package(str)
101-
<ping-test/*.ml{,i}>: package(threads)
102-
<ping-test/*.ml{,i}>: use_async
103-
<ping-test/*.ml{,i}>: use_openflow
102+
<ping-test/*.ml{,i}>: package(cstruct)
103+
<ping-test/*.ml{,i}>: package(cstruct.syntax)
104104
# Executable Hypervisor
105-
"examples/Hypervisor.byte": package(async)
105+
"examples/Hypervisor.byte": use_async
106+
"examples/Hypervisor.byte": use_openflow
107+
"examples/Hypervisor.byte": package(threads)
106108
"examples/Hypervisor.byte": package(core)
107-
"examples/Hypervisor.byte": package(cstruct)
108-
"examples/Hypervisor.byte": package(cstruct.async)
109-
"examples/Hypervisor.byte": package(cstruct.syntax)
109+
"examples/Hypervisor.byte": package(async)
110110
"examples/Hypervisor.byte": package(packet)
111+
"examples/Hypervisor.byte": package(cstruct.async)
111112
"examples/Hypervisor.byte": package(sexplib.syntax)
112113
"examples/Hypervisor.byte": package(str)
113-
"examples/Hypervisor.byte": package(threads)
114-
"examples/Hypervisor.byte": use_async
115-
"examples/Hypervisor.byte": use_openflow
114+
"examples/Hypervisor.byte": package(cstruct)
115+
"examples/Hypervisor.byte": package(cstruct.syntax)
116116
# Executable learning_switch
117-
"examples/Learning_Switch.byte": package(async)
117+
"examples/Learning_Switch.byte": use_async
118+
"examples/Learning_Switch.byte": use_openflow
119+
"examples/Learning_Switch.byte": package(threads)
118120
"examples/Learning_Switch.byte": package(core)
119-
"examples/Learning_Switch.byte": package(cstruct)
120-
"examples/Learning_Switch.byte": package(cstruct.async)
121-
"examples/Learning_Switch.byte": package(cstruct.syntax)
121+
"examples/Learning_Switch.byte": package(async)
122122
"examples/Learning_Switch.byte": package(packet)
123+
"examples/Learning_Switch.byte": package(cstruct.async)
123124
"examples/Learning_Switch.byte": package(sexplib.syntax)
124125
"examples/Learning_Switch.byte": package(str)
125-
"examples/Learning_Switch.byte": package(threads)
126-
"examples/Learning_Switch.byte": use_async
127-
"examples/Learning_Switch.byte": use_openflow
128-
<examples/*.ml{,i}>: package(async)
126+
"examples/Learning_Switch.byte": package(cstruct)
127+
"examples/Learning_Switch.byte": package(cstruct.syntax)
128+
<examples/*.ml{,i}>: use_async
129+
<examples/*.ml{,i}>: use_openflow
130+
<examples/*.ml{,i}>: package(threads)
129131
<examples/*.ml{,i}>: package(core)
130-
<examples/*.ml{,i}>: package(cstruct)
131-
<examples/*.ml{,i}>: package(cstruct.async)
132-
<examples/*.ml{,i}>: package(cstruct.syntax)
132+
<examples/*.ml{,i}>: package(async)
133133
<examples/*.ml{,i}>: package(packet)
134+
<examples/*.ml{,i}>: package(cstruct.async)
134135
<examples/*.ml{,i}>: package(sexplib.syntax)
135136
<examples/*.ml{,i}>: package(str)
136-
<examples/*.ml{,i}>: package(threads)
137-
<examples/*.ml{,i}>: use_async
138-
<examples/*.ml{,i}>: use_openflow
137+
<examples/*.ml{,i}>: package(cstruct)
138+
<examples/*.ml{,i}>: package(cstruct.syntax)
139139
# OASIS_STOP
140140
<lib/*.ml>: syntax_camlp4o
141-
<lwt/*.ml>: syntax_camlp4o
142141
<async/*.ml>: syntax_camlp4o
143142
<test/*.ml>: syntax_camlp4o
144143
<examples/*.ml>: syntax_camlp4o
145-
<of13test/*.ml>: syntax_camlp4o

‎lib/META‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 1c838b69b24adcd8387ed95f9166c840)
3-
version = "0.2.0"
2+
# DO NOT EDIT (digest: c6492aee0dc64a6c8fdb707e88fe46ef)
3+
version = "0.3.0"
44
description = "Serialization library for OpenFlow"
55
requires = "str cstruct cstruct.syntax packet core sexplib.syntax threads"
66
archive(byte) = "openflow.cma"
@@ -9,7 +9,7 @@ archive(native) = "openflow.cmxa"
99
archive(native, plugin) = "openflow.cmxs"
1010
exists_if = "openflow.cma"
1111
package "quickcheck" (
12-
version = "0.2.0"
12+
version = "0.3.0"
1313
description = "Serialization library for OpenFlow"
1414
requires = "quickcheck openflow"
1515
archive(byte) = "quickcheck.cma"
@@ -20,7 +20,7 @@ package "quickcheck" (
2020
)
2121

2222
package "async" (
23-
version = "0.2.0"
23+
version = "0.3.0"
2424
description = "Serialization library for OpenFlow"
2525
requires = "async openflow cstruct.async threads sexplib.syntax"
2626
archive(byte) = "async.cma"

‎myocamlbuild.ml‎

Lines changed: 31 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(* OASIS_START *)
2-
(* DO NOT EDIT (digest: 0033a12558b72c01d3b44bdf3aef3fdf) *)
2+
(* DO NOT EDIT (digest: e55731d28dfe72908834e5aad8131d7a) *)
33
module OASISGettext = struct
44
(* # 22 "src/oasis/OASISGettext.ml" *)
55

@@ -204,27 +204,26 @@ module BaseEnvLight = struct
204204
end
205205

206206

207-
let rec var_expand str env =
208-
let buff =
209-
Buffer.create ((String.length str) * 2)
210-
in
211-
Buffer.add_substitute
212-
buff
213-
(fun var ->
214-
try
215-
var_expand (MapString.find var env) env
216-
with Not_found ->
217-
failwith
218-
(Printf.sprintf
219-
"No variable %s defined when trying to expand %S."
220-
var
221-
str))
222-
str;
223-
Buffer.contents buff
224-
225-
226207
let var_get name env =
227-
var_expand (MapString.find name env) env
208+
let rec var_expand str =
209+
let buff =
210+
Buffer.create ((String.length str) * 2)
211+
in
212+
Buffer.add_substitute
213+
buff
214+
(fun var ->
215+
try
216+
var_expand (MapString.find var env)
217+
with Not_found ->
218+
failwith
219+
(Printf.sprintf
220+
"No variable %s defined when trying to expand %S."
221+
var
222+
str))
223+
str;
224+
Buffer.contents buff
225+
in
226+
var_expand (MapString.find name env)
228227

229228

230229
let var_choose lst env =
@@ -234,7 +233,7 @@ module BaseEnvLight = struct
234233
end
235234

236235

237-
# 237 "myocamlbuild.ml"
236+
# 236 "myocamlbuild.ml"
238237
module MyOCamlbuildFindlib = struct
239238
(* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
240239

@@ -307,22 +306,6 @@ module MyOCamlbuildFindlib = struct
307306
let find_syntaxes () = ["camlp4o"; "camlp4r"]
308307

309308

310-
let well_known_syntax = [
311-
"camlp4.quotations.o";
312-
"camlp4.quotations.r";
313-
"camlp4.exceptiontracer";
314-
"camlp4.extend";
315-
"camlp4.foldgenerator";
316-
"camlp4.listcomprehension";
317-
"camlp4.locationstripper";
318-
"camlp4.macro";
319-
"camlp4.mapgenerator";
320-
"camlp4.metagenerator";
321-
"camlp4.profiler";
322-
"camlp4.tracer"
323-
]
324-
325-
326309
let dispatch =
327310
function
328311
| Before_options ->
@@ -348,17 +331,13 @@ module MyOCamlbuildFindlib = struct
348331
List.iter
349332
begin fun pkg ->
350333
let base_args = [A"-package"; A pkg] in
351-
(* TODO: consider how to really choose camlp4o or camlp4r. *)
352334
let syn_args = [A"-syntax"; A "camlp4o"] in
353335
let args =
354-
(* Heuristic to identify syntax extensions: whether they end in
355-
".syntax"; some might not.
356-
*)
357-
if Filename.check_suffix pkg "syntax" ||
358-
List.mem pkg well_known_syntax then
359-
syn_args @ base_args
360-
else
361-
base_args
336+
(* Heuristic to identify syntax extensions: whether they end in
337+
* ".syntax"; some might not *)
338+
if Filename.check_suffix pkg "syntax"
339+
then syn_args @ base_args
340+
else base_args
362341
in
363342
flag ["ocaml"; "compile"; "pkg_"^pkg] & S args;
364343
flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
@@ -552,14 +531,10 @@ module MyOCamlbuildBase = struct
552531
(* Add flags *)
553532
List.iter
554533
(fun (tags, cond_specs) ->
555-
let spec = BaseEnvLight.var_choose cond_specs env in
556-
let rec eval_specs =
557-
function
558-
| S lst -> S (List.map eval_specs lst)
559-
| A str -> A (BaseEnvLight.var_expand str env)
560-
| spec -> spec
534+
let spec =
535+
BaseEnvLight.var_choose cond_specs env
561536
in
562-
flag tags & (eval_specs spec))
537+
flag tags & spec)
563538
t.flags
564539
| _ ->
565540
()
@@ -576,7 +551,7 @@ module MyOCamlbuildBase = struct
576551
end
577552

578553

579-
# 579 "myocamlbuild.ml"
554+
# 554 "myocamlbuild.ml"
580555
open Ocamlbuild_plugin;;
581556
let package_default =
582557
{
@@ -601,6 +576,6 @@ let package_default =
601576

602577
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
603578

604-
# 605 "myocamlbuild.ml"
579+
# 580 "myocamlbuild.ml"
605580
(* OASIS_STOP *)
606581
Ocamlbuild_plugin.dispatch dispatch_default;;

0 commit comments

Comments
 (0)