Fixed package names

mmottl · mmottl · commit 47fde44cc5bf · 2012-03-20T14:15:14.000-04:00
diff --git a/base/async/examples/rpc/rpc_intf.ml b/base/async/examples/rpc/rpc_intf.ml
@@ -16,7 +16,7 @@ let set_id_counter = Rpc.Rpc.create
   ~bin_response:Unit.bin_t
 
 
-(* This type is here only for the purpose of getting the ability to bin-prot an int
+(* This type is here only for the purpose of getting the ability to bin_prot an int
    pair. *)
 module Int_pair = struct
   type t = int * int with bin_io
diff --git a/base/compare/oasis.sh b/base/compare/oasis.sh
@@ -35,10 +35,10 @@ Library pa_compare
   FindlibName:        syntax
   BuildDepends:       camlp4.lib,
                       camlp4.quotations,
-                      type-conv (>= 2.0.1)
+                      type_conv (>= 3.0.5)
   CompiledObject:     byte
   XMETAType:          syntax
-  XMETARequires:      camlp4,type-conv,comparelib
+  XMETARequires:      camlp4,type_conv,comparelib
   XMETADescription:   Syntax extension for "with compare"
 EOF
 
diff --git a/base/core/extended/lib/extended_linux.ml b/base/core/extended/lib/extended_linux.ml
@@ -1,4 +1,4 @@
-(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type-conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
+(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type_conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
 
 open Core.Std
 open Unix
diff --git a/base/core/extended/lib/extended_linux.mli b/base/core/extended/lib/extended_linux.mli
@@ -1,4 +1,4 @@
-(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type-conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
+(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type_conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
 open Core.Std
 open Unix
 
diff --git a/base/core/extended/lib/fold_map.ml b/base/core/extended/lib/fold_map.ml
@@ -1,4 +1,4 @@
-(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type-conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
+(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type_conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
 
 open Core.Std
 module Map_intf = Core.Core_map_intf
diff --git a/base/core/extended/lib/malloc.ml b/base/core/extended/lib/malloc.ml
@@ -1,4 +1,4 @@
-(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type-conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
+(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type_conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
 open Sexplib.Std
 open Bin_prot.Std
 
diff --git a/base/core/lib/unpack_buffer.mli b/base/core/lib/unpack_buffer.mli
@@ -30,8 +30,8 @@ module Unpack_one : sig
 
   val map : ('a, 'partial_unpack) t -> f:('a -> 'b) -> ('b, 'partial_unpack) t
 
-  (** [create_bin_prot reader] returns an unpacker that reads the "size-prefixed" bin-prot
-      encoding, in which a value is encoded by first writing the length of the bin-prot
+  (** [create_bin_prot reader] returns an unpacker that reads the "size-prefixed" bin_prot
+      encoding, in which a value is encoded by first writing the length of the bin_prot
       data as a 64-bit int, and then writing the data itself.  This encoding makes it
       trivial to know if enough data is available in the buffer, so there is no need to
       represent partially unpacked values, and hence ['partial_unpack = unit]. *)
@@ -50,8 +50,8 @@ val create
   -> ('value, 'partial_unpack) t
 
 (** [create_bin_prot reader] returns an unpack buffer that unpacks the "size-prefixed"
-    bin-prot encoding, in which a value is encoded by first writing the length of the
-    bin-prot data as a 64-bit int, and then writing the bin-prot data itself.  This
+    bin_prot encoding, in which a value is encoded by first writing the length of the
+    bin_prot data as a 64-bit int, and then writing the bin_prot data itself.  This
     encoding makes it trivial to know if enough data is available in the buffer, so there
     is no need to represent partially unpacked values, and hence ['partial_unpack =
     unit]. *)
diff --git a/base/core/lib_test/hashtbl/table_new.ml b/base/core/lib_test/hashtbl/table_new.ml
@@ -1,4 +1,4 @@
-(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type-conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
+(*pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type_conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo *)
 
 open Core.Std
 
diff --git a/base/fieldslib/oasis.sh b/base/fieldslib/oasis.sh
@@ -36,10 +36,10 @@ Library pa_fields_conv
   FindlibName:        syntax
   BuildDepends:       camlp4.lib,
                       camlp4.quotations,
-                      type-conv (>= 2.0.1)
+                      type_conv (>= 3.0.5)
   CompiledObject:     byte
   XMETAType:          syntax
-  XMETARequires:      camlp4,type-conv,fieldslib
+  XMETARequires:      camlp4,type_conv,fieldslib
   XMETADescription:   Syntax extension for Fieldslib
 
 Document "fieldslib"
diff --git a/base/pa_ounit/oasis.sh b/base/pa_ounit/oasis.sh
@@ -28,10 +28,10 @@ Library pa_ounit
   FindlibName:        pa_ounit
   BuildDepends:       camlp4.lib,
                       camlp4.quotations,
-                      type-conv (>= 2.0.1)
+                      type_conv (>= 3.0.5)
   CompiledObject:     byte
   XMETAType:          syntax
-  XMETARequires:      camlp4,type-conv,oUnit
+  XMETARequires:      camlp4,type_conv,oUnit
   XMETADescription:   Syntax extension writing inline tests
 EOF
 
diff --git a/base/pa_ounit/syntax/pa_ounit.ml b/base/pa_ounit/syntax/pa_ounit.ml
@@ -9,7 +9,7 @@ open Camlp4.PreCast
 
    Since we are trying to play nicely with other extensions we try to not
    override any rules in the grammar. In particular we cannot override the
-   module creation rule the way type-conv does it. In order to collect all tests
+   module creation rule the way type_conv does it. In order to collect all tests
    we insert "breadcrumbs" items in the modules that have a very particular
    shape when generating the tests and then collect those breadcrumbs by folding
    over the AST.
diff --git a/base/pipebang/oasis.sh b/base/pipebang/oasis.sh
@@ -28,10 +28,10 @@ Library pa_pipebang
   FindlibName:        pa_pipebang
   BuildDepends:       camlp4.lib,
                       camlp4.quotations,
-                      type-conv (>= 2.0.1)
+                      type_conv (>= 3.0.5)
   CompiledObject:     byte
   XMETAType:          syntax
-  XMETARequires:      camlp4,type-conv,oUnit
+  XMETARequires:      camlp4,type_conv,oUnit
   XMETADescription:   Syntax extension writing inline tests
 EOF
 
diff --git a/base/sexplib/README b/base/sexplib/README
@@ -63,7 +63,7 @@ sub-expressions in S-expressions.
 *=*=*=*=*=*=*=*=*=*=*=
 
   
-  Make sure you have installed the 'type-conv' package on your system, too. It
+  Make sure you have installed the 'type_conv' package on your system, too. It
 should be obtainable at the same site as 'sexplib'.
   
   The API (.mli-files) in the 'sexplib' library directory is fully documented.
@@ -104,16 +104,16 @@ how to extract and substitute sub-expressions.
   
   To compile a file you will have to add a preprocessing flag to the compiler
 invocation, e.g. for foo.ml:
-<<  ocamlc -pp "camlp4o -I {path to type-conv} \
+<<  ocamlc -pp "camlp4o -I {path to type_conv} \
       -I {path to sexplib} pa_type_conv.cmo pa_sexp_conv.cmo" \
       -I {path to sexplib} foo.ml
 >>
   
   If you are using OCamlMakefile, just put the following line at the top of
-the file, assuming you have installed both 'type-conv' and 'sexplib' with
+the file, assuming you have installed both 'type_conv' and 'sexplib' with
 ocamlfind. The comment must start at the beginning of the line, and you must
 not break lines (here broken for readability only):
-<<  (*pp camlp4o -I `ocamlfind query type-conv` \
+<<  (*pp camlp4o -I `ocamlfind query type_conv` \
       -I `ocamlfind query sexplib` \
       pa_type_conv.cmo pa_sexp_conv.cmo *)
 >>
diff --git a/base/sexplib/doc/README.tex b/base/sexplib/doc/README.tex
@@ -71,7 +71,7 @@ \section{What is ``Sexplib''?}
 
 \section{How can you use it?}
 
-Make sure you have installed the \verb=type-conv= package on your system,
+Make sure you have installed the \verb=type_conv= package on your system,
 too.  It should be obtainable at the same site as \verb=sexplib=.\\
 \\
 The API (.mli-files) in the \verb=sexplib= library directory is
@@ -118,18 +118,18 @@ \subsection{Compiling and linking}
 compiler invocation, e.g. for foo.ml:
 
 \begin{verbatim}
-  ocamlc -pp "camlp4o -I {path to type-conv} \
+  ocamlc -pp "camlp4o -I {path to type_conv} \
     -I {path to sexplib} pa_type_conv.cmo pa_sexp_conv.cmo" \
     -I {path to sexplib} foo.ml
 \end{verbatim}
 
 If you are using OCamlMakefile, just put the following line at the
-top of the file, assuming you have installed both \verb=type-conv= and
+top of the file, assuming you have installed both \verb=type_conv= and
 \verb=sexplib= with ocamlfind.  The comment must start at the beginning of
 the line, and you must not break lines (here broken for readability only):
 
 \begin{verbatim}
-  (*pp camlp4o -I `ocamlfind query type-conv` \
+  (*pp camlp4o -I `ocamlfind query type_conv` \
     -I `ocamlfind query sexplib` \
     pa_type_conv.cmo pa_sexp_conv.cmo *)
 \end{verbatim}
diff --git a/base/sexplib/lib/intro.txt b/base/sexplib/lib/intro.txt
@@ -18,7 +18,7 @@ replace sub-expressions in S-expressions.
 
 {2 How can you use it?}
 
-Make sure you have installed the [type-conv] package on your system,
+Make sure you have installed the [type_conv] package on your system,
 too.  It should be obtainable at the same site as [sexplib].
 
 The API (.mli-files) in the [sexplib] library directory is
diff --git a/base/sexplib/oasis.sh b/base/sexplib/oasis.sh
@@ -47,10 +47,10 @@ Library pa_sexp_conv
   FindlibName:        syntax
   FindlibParent:      sexplib
   Modules:            Pa_sexp_conv
-  BuildDepends:       camlp4.quotations,camlp4.extend,type-conv (>= 3.0.4)
+  BuildDepends:       camlp4.quotations,camlp4.extend,type_conv (>= 3.0.5)
   CompiledObject:     byte
   XMETAType:          syntax
-  XMETARequires:      camlp4,type-conv,sexplib
+  XMETARequires:      camlp4,type_conv,sexplib
   XMETADescription:   Syntax extension for Sexplib
 
 Library sexplib_top
@@ -101,7 +101,7 @@ make_tags $HERE/_tags <<EOF
 $(tag_for_pack Sexplib $HERE/lib/*.ml{,l,y})
 
 <lib/pre_sexp.ml>: pp(cpp -undef -traditional -Werror -I$HERE/syntax)
-<lib_test/*.ml{,i}>: syntax_camlp4o, pkg_type-conv.syntax
+<lib_test/*.ml{,i}>: syntax_camlp4o, pkg_type_conv.syntax
 <lib_test/conv_test.byte>: use_sexplib, pkg_unix, pkg_num, pkg_bigarray
 <syntax/pa_sexp_conv.ml>: syntax_camlp4o
 EOF
diff --git a/base/typehash/oasis.sh b/base/typehash/oasis.sh
@@ -34,10 +34,10 @@ Library pa_typehash
   FindlibName:        syntax
   BuildDepends:       camlp4.lib,
                       camlp4.quotations,
-                      type-conv (>= 2.0.1)
+                      type_conv (>= 3.0.5)
   CompiledObject:     byte
   XMETAType:          syntax
-  XMETARequires:      camlp4,type-conv,typehashlib
+  XMETARequires:      camlp4,type_conv,typehashlib
   XMETADescription:   Syntax extension for "with typehash"
 EOF
 
diff --git a/base/variantslib/lib/META b/base/variantslib/lib/META
@@ -8,7 +8,7 @@ exists_if = "variantslib.cma"
 package "syntax" (
  version = "107.01"
  description = "Syntax extension for Variantslib"
- requires = "camlp4 type-conv variantslib"
+ requires = "camlp4 type_conv variantslib"
  archive(syntax, preprocessor) = "pa_variants_conv.cma"
  archive(syntax, toploop) = "pa_variants_conv.cma"
  exists_if = "pa_variants_conv.cma"
diff --git a/base/variantslib/lib/Makefile b/base/variantslib/lib/Makefile
@@ -3,7 +3,7 @@ OCAMLMAKEFILE = ../OCamlMakefile
 SOURCES = variant.ml 
 LIB_PACK_NAME = variantslib
 INCDIRS = +camlp4
-PACKS = type-conv
+PACKS = type_conv
 RESULT = variantslib
 
 TRASH = \
diff --git a/base/variantslib/oasis.sh b/base/variantslib/oasis.sh
@@ -36,10 +36,10 @@ Library pa_variants_conv
   FindlibName:        syntax
   BuildDepends:       camlp4.lib,
                       camlp4.quotations,
-                      type-conv (>= 2.0.1)
+                      type_conv (>= 3.0.5)
   CompiledObject:     byte
   XMETAType:          syntax
-  XMETARequires:      camlp4,type-conv,variantslib
+  XMETARequires:      camlp4,type_conv,variantslib
   XMETADescription:   Syntax extension for Variantslib
 
 Document "variantslib"
diff --git a/build-and-install b/build-and-install
@@ -56,14 +56,14 @@ esac
 
 # in dependency topological order
 libraries="
-type-conv
+type_conv
 pipebang
 compare
 typehash
 fieldslib
 variantslib
 pa_ounit
-bin-prot
+bin_prot
 sexplib
 core
 core/extended
diff --git a/licensing/THIRD-PARTY.txt b/licensing/THIRD-PARTY.txt
@@ -1,9 +1,9 @@
 The repository contains 3rd-party code in the following locations and
 under the following licenses:
 
-- type-conv, sexplib and bin-prot: based on Tywith, by Martin
-  Sandin. License can be found in base/sexplib/LICENSE.Tywith,
-  base/type-conv/LICENSE.Tywith, and base/bin-prot/LICENSE.Tywith.
+- type_conv, sexplib and bin_prot: based on Tywith, by Martin
+  Sandin.  License can be found in base/sexplib/LICENSE.Tywith,
+  base/type_conv/LICENSE.Tywith, and base/bin_prot/LICENSE.Tywith.
 
 - Core's implementation of union-find: based on an implementation by
   Henry Matthew Fluet, Suresh Jagannathan, and Stephen Weeks. License

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-(pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type-conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo )
	`1`	+(pp camlp4o -I `ocamlfind query sexplib` -I `ocamlfind query type_conv` -I `ocamlfind query bin_prot` pa_type_conv.cmo pa_sexp_conv.cmo pa_bin_prot.cmo )
`2`	`2`
`3`	`3`	`open Core.Std`
`4`	`4`	`open Unix`