Merge pull request mirage#60 from avsm/fix-checksum-modules

Do not expose the `Tcpip_checksum` module twice in the `oasis`
samoht · Jul 20, 2014 · 9d92ded · 9d92ded
2 parents ad49f4a + ba03051
commit 9d92ded
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 18 deletions.
diff --git a/_oasis b/_oasis
@@ -11,23 +11,23 @@ Library tcpip
   CompiledObject:     best
   Path:               lib
   Findlibname:        tcpip
-  Modules:            Wire_structs
+  Modules:            Wire_structs, Tcpip_checksum
   BuildDepends:       io-page,mirage-types,ipaddr,cstruct
 
 Library ethif
   CompiledObject:     best
   Path:               lib
   Findlibparent:      tcpip
   Findlibname:        ethif
-  Modules:            Ethif, Arpv4, Tcpip_checksum
+  Modules:            Ethif, Arpv4
   BuildDepends:       tcpip,io-page,mirage-types,ipaddr,cstruct,cstruct.syntax,lwt.syntax,lwt
 
 Library ipv4
   CompiledObject:     best
   Path:               lib
   Findlibparent:      tcpip
   Findlibname:        ipv4
-  Modules:            Ipv4, Tcpip_checksum
+  Modules:            Ipv4
   BuildDepends:       io-page,mirage-types,ipaddr,cstruct,cstruct.syntax,lwt.syntax,lwt,tcpip
 
 Library udpv4

diff --git a/lib/ethif.mldylib b/lib/ethif.mldylib
@@ -1,6 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 2b7c737ea78eec32e6ca6ff80e37b7f6)
+# DO NOT EDIT (digest: 44dee88ac86ae169b17ccb33ee5e8eb4)
 Ethif
 Arpv4
-Tcpip_checksum
 # OASIS_STOP
diff --git a/lib/ethif.mllib b/lib/ethif.mllib
@@ -1,6 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 2b7c737ea78eec32e6ca6ff80e37b7f6)
+# DO NOT EDIT (digest: 44dee88ac86ae169b17ccb33ee5e8eb4)
 Ethif
 Arpv4
-Tcpip_checksum
 # OASIS_STOP
diff --git a/lib/ipv4.mldylib b/lib/ipv4.mldylib
@@ -1,5 +1,4 @@
 # OASIS_START
-# DO NOT EDIT (digest: c82b9080a7392074bb86153d9c076fce)
+# DO NOT EDIT (digest: e53211788365c0a2b1be74b682c19983)
 Ipv4
-Tcpip_checksum
 # OASIS_STOP
diff --git a/lib/ipv4.mllib b/lib/ipv4.mllib
@@ -1,5 +1,4 @@
 # OASIS_START
-# DO NOT EDIT (digest: c82b9080a7392074bb86153d9c076fce)
+# DO NOT EDIT (digest: e53211788365c0a2b1be74b682c19983)
 Ipv4
-Tcpip_checksum
 # OASIS_STOP
diff --git a/lib/tcpip.mldylib b/lib/tcpip.mldylib
@@ -1,4 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 31f4fa2f2465bdb5b522cf1b586477f2)
+# DO NOT EDIT (digest: a07ffbcee93ea16e7d07a95e494f446d)
 Wire_structs
+Tcpip_checksum
 # OASIS_STOP
diff --git a/lib/tcpip.mllib b/lib/tcpip.mllib
@@ -1,4 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 31f4fa2f2465bdb5b522cf1b586477f2)
+# DO NOT EDIT (digest: a07ffbcee93ea16e7d07a95e494f446d)
 Wire_structs
+Tcpip_checksum
 # OASIS_STOP
diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.4 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: f0cb2b0f5f0a502bd2059d1621c49276) *)
+(* DO NOT EDIT (digest: d184c741759263f9960743e546e05554) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6720,7 +6720,7 @@ let setup_t =
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
-                      lib_modules = ["Wire_structs"];
+                      lib_modules = ["Wire_structs"; "Tcpip_checksum"];
                       lib_pack = false;
                       lib_internal_modules = [];
                       lib_findlib_parent = None;
@@ -6760,7 +6760,7 @@ let setup_t =
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
-                      lib_modules = ["Ethif"; "Arpv4"; "Tcpip_checksum"];
+                      lib_modules = ["Ethif"; "Arpv4"];
                       lib_pack = false;
                       lib_internal_modules = [];
                       lib_findlib_parent = Some "tcpip";
@@ -6800,7 +6800,7 @@ let setup_t =
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
-                      lib_modules = ["Ipv4"; "Tcpip_checksum"];
+                      lib_modules = ["Ipv4"];
                       lib_pack = false;
                       lib_internal_modules = [];
                       lib_findlib_parent = Some "tcpip";
@@ -7341,7 +7341,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
-     oasis_digest = Some "\014\153ú\tçAâC\t0\nFD6C\156";
+     oasis_digest = Some "\027\145:\012\156*(cRßÁ\003;ÿã\145";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false