Skip to content

Commit cca7997

Browse files
djs55djs55
committed
Merge pull request #57 from djs55/release.0.10.0
Prepare to release 0.10.0
2 parents 75fb572 + 4f1d2b4 commit cca7997

File tree

6 files changed

+273
-219
lines changed

6 files changed

+273
-219
lines changed

‎ChangeLog‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.10.0 (14-Aug-2015):
2+
* Preliminary support for FCoE
3+
* Support xapi `originator`
4+
* Prevent "xenapi" prefixed bridge monitoring
5+
16
0.9.5 (27-Sep-2014):
27
* Add man page and standard command-line options
38
* Use libnl to read stats from interfaces

‎_oasis‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OASISFormat: 0.3
22
Name: xcp-networkd
3-
Version: 0.9.5
3+
Version: 0.10.0
44
Synopsis: XCP Network Daemon
55
Authors: Rob Hoes
66
License: LGPL-2.1 with OCaml linking exception

‎_tags‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 69abe13a880191e9d4ddc9d091092ce0)
2+
# DO NOT EDIT (digest: 24d382d63f193063ab9b3c2a825d1463)
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
6+
true: annot, bin_annot
67
<**/.svn>: -traverse
78
<**/.svn>: not_hygienic
89
".bzr": -traverse
@@ -15,15 +16,15 @@
1516
"_darcs": not_hygienic
1617
# Library networklibs
1718
"lib/networklibs.cmxs": use_networklibs
18-
<lib/*.ml{,i}>: oasis_library_networklibs_ccopt
19+
<lib/*.ml{,i,y}>: oasis_library_networklibs_ccopt
1920
"lib/link_stubs.c": oasis_library_networklibs_ccopt
2021
<lib/networklibs.{cma,cmxa}>: use_libnetworklibs_stubs
21-
<lib/*.ml{,i}>: pkg_forkexec
22-
<lib/*.ml{,i}>: pkg_rpclib
23-
<lib/*.ml{,i}>: pkg_stdext
24-
<lib/*.ml{,i}>: pkg_threads
25-
<lib/*.ml{,i}>: pkg_xcp-inventory
26-
<lib/*.ml{,i}>: pkg_xcp.network
22+
<lib/*.ml{,i,y}>: pkg_forkexec
23+
<lib/*.ml{,i,y}>: pkg_rpclib
24+
<lib/*.ml{,i,y}>: pkg_stdext
25+
<lib/*.ml{,i,y}>: pkg_threads
26+
<lib/*.ml{,i,y}>: pkg_xcp-inventory
27+
<lib/*.ml{,i,y}>: pkg_xcp.network
2728
"lib/link_stubs.c": pkg_forkexec
2829
"lib/link_stubs.c": pkg_rpclib
2930
"lib/link_stubs.c": pkg_stdext
@@ -42,17 +43,17 @@
4243
<networkd/networkd.{native,byte}>: pkg_xcp.network
4344
<networkd/networkd.{native,byte}>: pkg_xen-api-client
4445
<networkd/networkd.{native,byte}>: use_networklibs
45-
<networkd/*.ml{,i}>: pkg_forkexec
46-
<networkd/*.ml{,i}>: pkg_netlink
47-
<networkd/*.ml{,i}>: pkg_rpclib
48-
<networkd/*.ml{,i}>: pkg_rpclib.unix
49-
<networkd/*.ml{,i}>: pkg_stdext
50-
<networkd/*.ml{,i}>: pkg_threads
51-
<networkd/*.ml{,i}>: pkg_xcp
52-
<networkd/*.ml{,i}>: pkg_xcp-inventory
53-
<networkd/*.ml{,i}>: pkg_xcp.network
54-
<networkd/*.ml{,i}>: pkg_xen-api-client
55-
<networkd/*.ml{,i}>: use_networklibs
46+
<networkd/*.ml{,i,y}>: pkg_forkexec
47+
<networkd/*.ml{,i,y}>: pkg_netlink
48+
<networkd/*.ml{,i,y}>: pkg_rpclib
49+
<networkd/*.ml{,i,y}>: pkg_rpclib.unix
50+
<networkd/*.ml{,i,y}>: pkg_stdext
51+
<networkd/*.ml{,i,y}>: pkg_threads
52+
<networkd/*.ml{,i,y}>: pkg_xcp
53+
<networkd/*.ml{,i,y}>: pkg_xcp-inventory
54+
<networkd/*.ml{,i,y}>: pkg_xcp.network
55+
<networkd/*.ml{,i,y}>: pkg_xen-api-client
56+
<networkd/*.ml{,i,y}>: use_networklibs
5657
<networkd/networkd.{native,byte}>: custom
5758
# Executable networkd_db
5859
<networkd_db/networkd_db.{native,byte}>: pkg_forkexec
@@ -62,13 +63,13 @@
6263
<networkd_db/networkd_db.{native,byte}>: pkg_xcp-inventory
6364
<networkd_db/networkd_db.{native,byte}>: pkg_xcp.network
6465
<networkd_db/networkd_db.{native,byte}>: use_networklibs
65-
<networkd_db/*.ml{,i}>: pkg_forkexec
66-
<networkd_db/*.ml{,i}>: pkg_rpclib
67-
<networkd_db/*.ml{,i}>: pkg_stdext
68-
<networkd_db/*.ml{,i}>: pkg_threads
69-
<networkd_db/*.ml{,i}>: pkg_xcp-inventory
70-
<networkd_db/*.ml{,i}>: pkg_xcp.network
71-
<networkd_db/*.ml{,i}>: use_networklibs
66+
<networkd_db/*.ml{,i,y}>: pkg_forkexec
67+
<networkd_db/*.ml{,i,y}>: pkg_rpclib
68+
<networkd_db/*.ml{,i,y}>: pkg_stdext
69+
<networkd_db/*.ml{,i,y}>: pkg_threads
70+
<networkd_db/*.ml{,i,y}>: pkg_xcp-inventory
71+
<networkd_db/*.ml{,i,y}>: pkg_xcp.network
72+
<networkd_db/*.ml{,i,y}>: use_networklibs
7273
<networkd_db/networkd_db.{native,byte}>: custom
7374
# Executable network_test
7475
<test/network_test.{native,byte}>: pkg_forkexec
@@ -79,14 +80,14 @@
7980
<test/network_test.{native,byte}>: pkg_xcp-inventory
8081
<test/network_test.{native,byte}>: pkg_xcp.network
8182
<test/network_test.{native,byte}>: use_networklibs
82-
<test/*.ml{,i}>: pkg_forkexec
83-
<test/*.ml{,i}>: pkg_oUnit
84-
<test/*.ml{,i}>: pkg_rpclib
85-
<test/*.ml{,i}>: pkg_stdext
86-
<test/*.ml{,i}>: pkg_threads
87-
<test/*.ml{,i}>: pkg_xcp-inventory
88-
<test/*.ml{,i}>: pkg_xcp.network
89-
<test/*.ml{,i}>: use_networklibs
83+
<test/*.ml{,i,y}>: pkg_forkexec
84+
<test/*.ml{,i,y}>: pkg_oUnit
85+
<test/*.ml{,i,y}>: pkg_rpclib
86+
<test/*.ml{,i,y}>: pkg_stdext
87+
<test/*.ml{,i,y}>: pkg_threads
88+
<test/*.ml{,i,y}>: pkg_xcp-inventory
89+
<test/*.ml{,i,y}>: pkg_xcp.network
90+
<test/*.ml{,i,y}>: use_networklibs
9091
# Executable cli
9192
<cli/network_cli.{native,byte}>: pkg_cmdliner
9293
<cli/network_cli.{native,byte}>: pkg_forkexec
@@ -97,14 +98,14 @@
9798
<cli/network_cli.{native,byte}>: pkg_xcp-inventory
9899
<cli/network_cli.{native,byte}>: pkg_xcp.network
99100
<cli/network_cli.{native,byte}>: use_networklibs
100-
<cli/*.ml{,i}>: pkg_cmdliner
101-
<cli/*.ml{,i}>: pkg_forkexec
102-
<cli/*.ml{,i}>: pkg_rpclib
103-
<cli/*.ml{,i}>: pkg_stdext
104-
<cli/*.ml{,i}>: pkg_threads
105-
<cli/*.ml{,i}>: pkg_xcp
106-
<cli/*.ml{,i}>: pkg_xcp-inventory
107-
<cli/*.ml{,i}>: pkg_xcp.network
108-
<cli/*.ml{,i}>: use_networklibs
101+
<cli/*.ml{,i,y}>: pkg_cmdliner
102+
<cli/*.ml{,i,y}>: pkg_forkexec
103+
<cli/*.ml{,i,y}>: pkg_rpclib
104+
<cli/*.ml{,i,y}>: pkg_stdext
105+
<cli/*.ml{,i,y}>: pkg_threads
106+
<cli/*.ml{,i,y}>: pkg_xcp
107+
<cli/*.ml{,i,y}>: pkg_xcp-inventory
108+
<cli/*.ml{,i,y}>: pkg_xcp.network
109+
<cli/*.ml{,i,y}>: use_networklibs
109110
# OASIS_STOP
110111

‎lib/META‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 1c79811cc8dd9ea01a505ead32a71432)
3-
version = "0.9.5"
2+
# DO NOT EDIT (digest: de99a9d89799ce8282274091a7a1fc5b)
3+
version = "0.10.0"
44
description = "XCP Network Daemon"
55
requires = "forkexec stdext threads rpclib stdext xcp-inventory xcp.network"
66
archive(byte) = "networklibs.cma"

‎myocamlbuild.ml‎

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

@@ -39,10 +39,10 @@ module OASISExpr = struct
3939
open OASISGettext
4040

4141

42-
type test = string
42+
type test = string
4343

4444

45-
type flag = string
45+
type flag = string
4646

4747

4848
type t =
@@ -52,10 +52,10 @@ module OASISExpr = struct
5252
| EOr of t * t
5353
| EFlag of flag
5454
| ETest of test * string
55-
5655

5756

58-
type 'a choices = (t * 'a) list
57+
58+
type 'a choices = (t * 'a) list
5959

6060

6161
let eval var_get t =
@@ -249,6 +249,9 @@ module MyOCamlbuildFindlib = struct
249249
*)
250250
open Ocamlbuild_plugin
251251

252+
type conf =
253+
{ no_automatic_syntax: bool;
254+
}
252255

253256
(* these functions are not really officially exported *)
254257
let run_and_read =
@@ -315,7 +318,7 @@ module MyOCamlbuildFindlib = struct
315318

316319
(* This lists all supported packages. *)
317320
let find_packages () =
318-
List.map before_space (split_nl & run_and_read "ocamlfind list")
321+
List.map before_space (split_nl & run_and_read (exec_from_conf "ocamlfind" ^ " list"))
319322

320323

321324
(* Mock to list available syntaxes. *)
@@ -338,7 +341,7 @@ module MyOCamlbuildFindlib = struct
338341
]
339342

340343

341-
let dispatch =
344+
let dispatch conf =
342345
function
343346
| After_options ->
344347
(* By using Before_options one let command line options have an higher
@@ -357,31 +360,39 @@ module MyOCamlbuildFindlib = struct
357360
* -linkpkg *)
358361
flag ["ocaml"; "link"; "program"] & A"-linkpkg";
359362

360-
(* For each ocamlfind package one inject the -package option when
361-
* compiling, computing dependencies, generating documentation and
362-
* linking. *)
363-
List.iter
364-
begin fun pkg ->
365-
let base_args = [A"-package"; A pkg] in
366-
(* TODO: consider how to really choose camlp4o or camlp4r. *)
367-
let syn_args = [A"-syntax"; A "camlp4o"] in
368-
let args =
369-
(* Heuristic to identify syntax extensions: whether they end in
370-
".syntax"; some might not.
371-
*)
372-
if Filename.check_suffix pkg "syntax" ||
373-
List.mem pkg well_known_syntax then
374-
syn_args @ base_args
375-
else
376-
base_args
377-
in
378-
flag ["ocaml"; "compile"; "pkg_"^pkg] & S args;
379-
flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
380-
flag ["ocaml"; "doc"; "pkg_"^pkg] & S args;
381-
flag ["ocaml"; "link"; "pkg_"^pkg] & S base_args;
382-
flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
383-
end
384-
(find_packages ());
363+
if not (conf.no_automatic_syntax) then begin
364+
(* For each ocamlfind package one inject the -package option when
365+
* compiling, computing dependencies, generating documentation and
366+
* linking. *)
367+
List.iter
368+
begin fun pkg ->
369+
let base_args = [A"-package"; A pkg] in
370+
(* TODO: consider how to really choose camlp4o or camlp4r. *)
371+
let syn_args = [A"-syntax"; A "camlp4o"] in
372+
let (args, pargs) =
373+
(* Heuristic to identify syntax extensions: whether they end in
374+
".syntax"; some might not.
375+
*)
376+
if Filename.check_suffix pkg "syntax" ||
377+
List.mem pkg well_known_syntax then
378+
(syn_args @ base_args, syn_args)
379+
else
380+
(base_args, [])
381+
in
382+
flag ["ocaml"; "compile"; "pkg_"^pkg] & S args;
383+
flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
384+
flag ["ocaml"; "doc"; "pkg_"^pkg] & S args;
385+
flag ["ocaml"; "link"; "pkg_"^pkg] & S base_args;
386+
flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
387+
388+
(* TODO: Check if this is allowed for OCaml < 3.12.1 *)
389+
flag ["ocaml"; "compile"; "package("^pkg^")"] & S pargs;
390+
flag ["ocaml"; "ocamldep"; "package("^pkg^")"] & S pargs;
391+
flag ["ocaml"; "doc"; "package("^pkg^")"] & S pargs;
392+
flag ["ocaml"; "infer_interface"; "package("^pkg^")"] & S pargs;
393+
end
394+
(find_packages ());
395+
end;
385396

386397
(* Like -package but for extensions syntax. Morover -syntax is useless
387398
* when linking. *)
@@ -430,10 +441,10 @@ module MyOCamlbuildBase = struct
430441
module OC = Ocamlbuild_pack.Ocaml_compiler
431442

432443

433-
type dir = string
434-
type file = string
435-
type name = string
436-
type tag = string
444+
type dir = string
445+
type file = string
446+
type name = string
447+
type tag = string
437448

438449

439450
(* # 62 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
@@ -448,7 +459,7 @@ module MyOCamlbuildBase = struct
448459
* directory.
449460
*)
450461
includes: (dir * dir list) list;
451-
}
462+
}
452463

453464

454465
let env_filename =
@@ -546,12 +557,13 @@ module MyOCamlbuildBase = struct
546557

547558
(* When ocaml link something that use the C library, then one
548559
need that file to be up to date.
560+
This holds both for programs and for libraries.
549561
*)
550-
dep ["link"; "ocaml"; "program"; tag_libstubs lib]
551-
[dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
562+
dep ["link"; "ocaml"; tag_libstubs lib]
563+
[dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
552564

553-
dep ["compile"; "ocaml"; "program"; tag_libstubs lib]
554-
[dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
565+
dep ["compile"; "ocaml"; tag_libstubs lib]
566+
[dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
555567

556568
(* TODO: be more specific about what depends on headers *)
557569
(* Depends on .h files *)
@@ -580,18 +592,18 @@ module MyOCamlbuildBase = struct
580592
()
581593

582594

583-
let dispatch_default t =
595+
let dispatch_default conf t =
584596
dispatch_combine
585597
[
586598
dispatch t;
587-
MyOCamlbuildFindlib.dispatch;
599+
MyOCamlbuildFindlib.dispatch conf;
588600
]
589601

590602

591603
end
592604

593605

594-
# 594 "myocamlbuild.ml"
606+
# 606 "myocamlbuild.ml"
595607
open Ocamlbuild_plugin;;
596608
let package_default =
597609
{
@@ -623,8 +635,10 @@ let package_default =
623635
}
624636
;;
625637

626-
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
638+
let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
639+
640+
let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
627641

628-
# 629 "myocamlbuild.ml"
642+
# 643 "myocamlbuild.ml"
629643
(* OASIS_STOP *)
630644
Ocamlbuild_plugin.dispatch dispatch_default;;

0 commit comments

Comments
 (0)