Skip to content

Commit

Permalink
fix findlib subpackage for the resolver
Browse files Browse the repository at this point in the history
  • Loading branch information
avsm committed Apr 5, 2012
1 parent d69a617 commit aeac2df
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 64 deletions.
2 changes: 1 addition & 1 deletion _oasis
Expand Up @@ -26,7 +26,7 @@ Library server

Library resolver
Path: resolver
Findlibname: server
Findlibname: resolver
Modules: Dns_resolver
BuildDepends:
lwt, lwt.unix, lwt.syntax, bitstring, bitstring.syntax, uri, dns
Expand Down
4 changes: 2 additions & 2 deletions lib/META
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: 573686ebaa9cc1061909baf954f222c7)
# DO NOT EDIT (digest: 45400d260b5261d9e6c83b423f35db11)
version = "0.9-dev"
description = "DNS protocol library for Lwt"
requires = "bitstring bitstring.syntax re re.str uri cryptokit"
Expand All @@ -15,7 +15,7 @@ package "server" (
exists_if = "server.cma"
)

package "server" (
package "resolver" (
version = "0.9-dev"
description = "DNS protocol library for Lwt"
requires = "lwt lwt.unix lwt.syntax bitstring bitstring.syntax uri dns"
Expand Down
14 changes: 7 additions & 7 deletions myocamlbuild.ml
@@ -1,7 +1,7 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: 27a227d902cc3eef11413dc4b610e0e3) *)
(* DO NOT EDIT (digest: f24c7c7cf1020aa96825dd38b17b4bfb) *)
module OASISGettext = struct
# 21 "/Users/mort/research/mirage/src/oasis/src/oasis/OASISGettext.ml"
# 21 "/Users/avsm/src/darcs/oasis/src/oasis/OASISGettext.ml"

let ns_ str =
str
Expand All @@ -24,7 +24,7 @@ module OASISGettext = struct
end

module OASISExpr = struct
# 21 "/Users/mort/research/mirage/src/oasis/src/oasis/OASISExpr.ml"
# 21 "/Users/avsm/src/darcs/oasis/src/oasis/OASISExpr.ml"



Expand Down Expand Up @@ -115,7 +115,7 @@ end


module BaseEnvLight = struct
# 21 "/Users/mort/research/mirage/src/oasis/src/base/BaseEnvLight.ml"
# 21 "/Users/avsm/src/darcs/oasis/src/base/BaseEnvLight.ml"

module MapString = Map.Make(String)

Expand Down Expand Up @@ -212,7 +212,7 @@ end


module MyOCamlbuildFindlib = struct
# 21 "/Users/mort/research/mirage/src/oasis/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
# 21 "/Users/avsm/src/darcs/oasis/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"

(** OCamlbuild extension, copied from
* http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
Expand Down Expand Up @@ -321,7 +321,7 @@ module MyOCamlbuildFindlib = struct
end

module MyOCamlbuildBase = struct
# 21 "/Users/mort/research/mirage/src/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
# 21 "/Users/avsm/src/darcs/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"

(** Base functions for writing myocamlbuild.ml
@author Sylvain Le Gall
Expand All @@ -336,7 +336,7 @@ module MyOCamlbuildBase = struct
type name = string
type tag = string

# 55 "/Users/mort/research/mirage/src/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
# 55 "/Users/avsm/src/darcs/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"

type t =
{
Expand Down

0 comments on commit aeac2df

Please sign in to comment.