Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename Manager to Tcpip_socket_direct, and expose socket/direct versi…
…ons explicitly as separate ocamlfind packages.
  • Loading branch information
avsm committed Jan 28, 2014
1 parent 00dacf1 commit 3c7cb09
Show file tree
Hide file tree
Showing 16 changed files with 257 additions and 53 deletions.
61 changes: 51 additions & 10 deletions _oasis
Expand Up @@ -81,12 +81,12 @@ Library dhcpv4
lwt,
tcpip.udpv4

Library manager
Library "tcpip-stack-direct"
CompiledObject: best
Path: lib
Findlibparent: tcpip
Findlibname: manager
Modules: Manager
Findlibname: stack-direct
Modules: Tcpip_stack_direct
BuildDepends: io-page,
mirage-types,
ipaddr,
Expand Down Expand Up @@ -125,20 +125,34 @@ Library "udpv4-unix"
Path: unix
Findlibparent: tcpip
Findlibname: udpv4-unix
Modules: Udpv4_unix,Udpv4_socket
Modules: Udpv4_unix
BuildDepends: tcpip.udpv4,
tcpip.ipv4-unix,
lwt,
lwt.unix,
ipaddr.unix,
cstruct.lwt
cstruct.lwt,
io-page.unix

Library "udpv4-socket"
CompiledObject: best
Path: unix
Findlibparent: tcpip
Findlibname: udpv4-socket
Modules: Udpv4_socket
BuildDepends: tcpip.udpv4,
lwt,
lwt.unix,
ipaddr.unix,
cstruct.lwt,
io-page.unix

Library "tcpv4-unix"
CompiledObject: best
Path: unix
Findlibparent: tcpip
Findlibname: tcpv4-unix
Modules: Tcpv4_unix,Tcpv4_socket
Modules: Tcpv4_unix
BuildDepends: tcpip.tcpv4,
tcpip.ipv4-unix,
tcpip.channel,
Expand All @@ -147,21 +161,48 @@ Library "tcpv4-unix"
mirage-unix,
mirage-clock-unix,
ipaddr.unix,
cstruct.lwt
cstruct.lwt,
io-page.unix

Library "tcpv4-socket"
CompiledObject: best
Path: unix
Findlibparent: tcpip
Findlibname: tcpv4-socket
Modules: Tcpv4_socket
BuildDepends: lwt,
lwt.unix,
ipaddr.unix,
cstruct.lwt,
io-page.unix

Library "tcpip-stack-unix"
CompiledObject: best
Path: unix
Findlibparent: tcpip
Findlibname: stack-unix
Modules: Tcpip_stack_unix,Tcpip_stack_socket
Modules: Tcpip_stack_unix
BuildDepends: tcpip.udpv4-unix,
tcpip.tcpv4-unix,
tcpip.manager,
tcpip.stack-direct,
lwt,
lwt.unix,
ipaddr.unix,
mirage-unix,
mirage-clock-unix,
mirage-console-unix,
mirage-types.lwt
mirage-types.lwt,
io-page.unix

Library "tcpip-stack-socket"
CompiledObject: best
Path: unix
Findlibparent: tcpip
Findlibname: stack-socket
Modules: Tcpip_stack_socket
BuildDepends: tcpip.udpv4-socket,
tcpip.tcpv4-socket,
lwt,
lwt.unix,
ipaddr.unix,
io-page.unix
28 changes: 18 additions & 10 deletions _tags
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: ef1454a0f7608ee9e18e60e927295b3b)
# DO NOT EDIT (digest: 92191a3d50f99a5cf70b233e032f1262)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
Expand Down Expand Up @@ -62,8 +62,8 @@
<dhcp/*.ml{,i}>: pkg_cstruct
<dhcp/*.ml{,i}>: pkg_cstruct.syntax
<dhcp/*.ml{,i}>: pkg_lwt.syntax
# Library manager
"lib/manager.cmxs": use_manager
# Library tcpip-stack-direct
"lib/tcpip-stack-direct.cmxs": use_tcpip-stack-direct
<lib/*.ml{,i}>: use_tcpv4
<lib/*.ml{,i}>: use_dhcpv4
<lib/*.ml{,i}>: use_udpv4
Expand All @@ -81,31 +81,39 @@
"unix/ipv4-unix.cmxs": use_ipv4-unix
# Library udpv4-unix
"unix/udpv4-unix.cmxs": use_udpv4-unix
# Library udpv4-socket
"unix/udpv4-socket.cmxs": use_udpv4-socket
# Library tcpv4-unix
"unix/tcpv4-unix.cmxs": use_tcpv4-unix
# Library tcpv4-socket
"unix/tcpv4-socket.cmxs": use_tcpv4-socket
# Library tcpip-stack-unix
"unix/tcpip-stack-unix.cmxs": use_tcpip-stack-unix
<unix/*.ml{,i}>: use_tcpv4-unix
<unix/*.ml{,i}>: use_manager
<unix/*.ml{,i}>: use_tcpip-stack-direct
<unix/*.ml{,i}>: use_tcpv4
<unix/*.ml{,i}>: use_udpv4-unix
<unix/*.ml{,i}>: use_dhcpv4
<unix/*.ml{,i}>: use_udpv4
<unix/*.ml{,i}>: use_ipv4-unix
<unix/*.ml{,i}>: use_ipv4
<unix/*.ml{,i}>: use_ethif-unix
<unix/*.ml{,i}>: use_ethif
<unix/*.ml{,i}>: use_tcpip
<unix/*.ml{,i}>: use_channel
<unix/*.ml{,i}>: pkg_lwt
<unix/*.ml{,i}>: pkg_lwt.unix
<unix/*.ml{,i}>: pkg_ipaddr.unix
<unix/*.ml{,i}>: pkg_mirage-unix
<unix/*.ml{,i}>: pkg_mirage-clock-unix
<unix/*.ml{,i}>: pkg_mirage-console-unix
<unix/*.ml{,i}>: pkg_mirage-types.lwt
<unix/*.ml{,i}>: pkg_cstruct.lwt
<unix/*.ml{,i}>: pkg_mirage-net-unix
# Library tcpip-stack-socket
"unix/tcpip-stack-socket.cmxs": use_tcpip-stack-socket
<unix/*.ml{,i}>: use_udpv4-socket
<unix/*.ml{,i}>: use_udpv4
<unix/*.ml{,i}>: use_tcpip
<unix/*.ml{,i}>: use_tcpv4-socket
<unix/*.ml{,i}>: pkg_lwt
<unix/*.ml{,i}>: pkg_lwt.unix
<unix/*.ml{,i}>: pkg_ipaddr.unix
<unix/*.ml{,i}>: pkg_cstruct.lwt
<unix/*.ml{,i}>: pkg_io-page
<unix/*.ml{,i}>: pkg_mirage-types
<unix/*.ml{,i}>: pkg_ipaddr
Expand Down
49 changes: 41 additions & 8 deletions lib/META
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: 8f50e4931fbfa099b08952c033408a9f)
# DO NOT EDIT (digest: be701ce6df42cdbeeb20abe87d0814b6)
version = "1.0.0"
description = "Ethernet and IP driver"
requires = "io-page mirage-types ipaddr cstruct"
Expand All @@ -20,6 +20,17 @@ package "udpv4-unix" (
exists_if = "udpv4-unix.cma"
)

package "udpv4-socket" (
version = "1.0.0"
description = "Ethernet and IP driver"
requires = "tcpip.udpv4 lwt lwt.unix ipaddr.unix cstruct.lwt"
archive(byte) = "udpv4-socket.cma"
archive(byte, plugin) = "udpv4-socket.cma"
archive(native) = "udpv4-socket.cmxa"
archive(native, plugin) = "udpv4-socket.cmxs"
exists_if = "udpv4-socket.cma"
)

package "udpv4" (
version = "1.0.0"
description = "Ethernet and IP driver"
Expand All @@ -44,6 +55,17 @@ package "tcpv4-unix" (
exists_if = "tcpv4-unix.cma"
)

package "tcpv4-socket" (
version = "1.0.0"
description = "Ethernet and IP driver"
requires = "lwt lwt.unix ipaddr.unix cstruct.lwt"
archive(byte) = "tcpv4-socket.cma"
archive(byte, plugin) = "tcpv4-socket.cma"
archive(native) = "tcpv4-socket.cmxa"
archive(native, plugin) = "tcpv4-socket.cmxs"
exists_if = "tcpv4-socket.cma"
)

package "tcpv4" (
version = "1.0.0"
description = "Ethernet and IP driver"
Expand All @@ -60,24 +82,35 @@ package "stack-unix" (
version = "1.0.0"
description = "Ethernet and IP driver"
requires =
"tcpip.udpv4-unix tcpip.tcpv4-unix tcpip.manager lwt lwt.unix ipaddr.unix mirage-unix mirage-clock-unix mirage-console-unix mirage-types.lwt"
"tcpip.udpv4-unix tcpip.tcpv4-unix tcpip.stack-direct lwt lwt.unix ipaddr.unix mirage-unix mirage-clock-unix mirage-console-unix mirage-types.lwt"
archive(byte) = "tcpip-stack-unix.cma"
archive(byte, plugin) = "tcpip-stack-unix.cma"
archive(native) = "tcpip-stack-unix.cmxa"
archive(native, plugin) = "tcpip-stack-unix.cmxs"
exists_if = "tcpip-stack-unix.cma"
)

package "manager" (
package "stack-socket" (
version = "1.0.0"
description = "Ethernet and IP driver"
requires = "tcpip.udpv4-socket tcpip.tcpv4-socket lwt lwt.unix ipaddr.unix"
archive(byte) = "tcpip-stack-socket.cma"
archive(byte, plugin) = "tcpip-stack-socket.cma"
archive(native) = "tcpip-stack-socket.cmxa"
archive(native, plugin) = "tcpip-stack-socket.cmxs"
exists_if = "tcpip-stack-socket.cma"
)

package "stack-direct" (
version = "1.0.0"
description = "Ethernet and IP driver"
requires =
"io-page mirage-types ipaddr cstruct cstruct.syntax lwt.syntax lwt tcpip.udpv4 tcpip.tcpv4 tcpip.dhcp"
archive(byte) = "manager.cma"
archive(byte, plugin) = "manager.cma"
archive(native) = "manager.cmxa"
archive(native, plugin) = "manager.cmxs"
exists_if = "manager.cma"
archive(byte) = "tcpip-stack-direct.cma"
archive(byte, plugin) = "tcpip-stack-direct.cma"
archive(native) = "tcpip-stack-direct.cmxa"
archive(native, plugin) = "tcpip-stack-direct.cmxs"
exists_if = "tcpip-stack-direct.cma"
)

package "ipv4-unix" (
Expand Down
4 changes: 0 additions & 4 deletions lib/manager.mllib

This file was deleted.

4 changes: 4 additions & 0 deletions lib/tcpip-stack-direct.mllib
@@ -0,0 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 48538d3c2701c6ff41cff1bdbca1cb15)
Tcpip_stack_direct
# OASIS_STOP
File renamed without changes.
File renamed without changes.
11 changes: 7 additions & 4 deletions myocamlbuild.ml
@@ -1,5 +1,5 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: 27a8fa425009254eec76d7385d314246) *)
(* DO NOT EDIT (digest: 269a0e8f3f1eefd2b1d7191923418d98) *)
module OASISGettext = struct
(* # 22 "src/oasis/OASISGettext.ml" *)

Expand Down Expand Up @@ -564,12 +564,15 @@ let package_default =
("tcpv4", ["tcp"], []);
("channel", ["channel"], []);
("dhcpv4", ["dhcp"], []);
("manager", ["lib"], []);
("tcpip-stack-direct", ["lib"], []);
("ethif-unix", ["unix"], []);
("ipv4-unix", ["unix"], []);
("udpv4-unix", ["unix"], []);
("udpv4-socket", ["unix"], []);
("tcpv4-unix", ["unix"], []);
("tcpip-stack-unix", ["unix"], [])
("tcpv4-socket", ["unix"], []);
("tcpip-stack-unix", ["unix"], []);
("tcpip-stack-socket", ["unix"], [])
];
lib_c = [];
flags = [];
Expand All @@ -585,6 +588,6 @@ let package_default =

let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;

# 589 "myocamlbuild.ml"
# 592 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;

0 comments on commit 3c7cb09

Please sign in to comment.