Skip to content

Commit 47fde44

Browse files
mmottlmmottl
committed
Fixed package names
1 parent e299e1c commit 47fde44

File tree

22 files changed

+42
-42
lines changed

22 files changed

+42
-42
lines changed

‎base/async/examples/rpc/rpc_intf.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ let set_id_counter = Rpc.Rpc.create
1616
~bin_response:Unit.bin_t
1717

1818

19-
(* This type is here only for the purpose of getting the ability to bin-prot an int
19+
(* This type is here only for the purpose of getting the ability to bin_prot an int
2020
pair. *)
2121
module Int_pair = struct
2222
type t = int * int with bin_io

‎base/compare/oasis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ Library pa_compare
3535
FindlibName: syntax
3636
BuildDepends: camlp4.lib,
3737
camlp4.quotations,
38-
type-conv (>= 2.0.1)
38+
type_conv (>= 3.0.5)
3939
CompiledObject: byte
4040
XMETAType: syntax
41-
XMETARequires: camlp4,type-conv,comparelib
41+
XMETARequires: camlp4,type_conv,comparelib
4242
XMETADescription: Syntax extension for "with compare"
4343
EOF
4444

‎base/core/extended/lib/extended_linux.ml

+1-1
Original file line numberDiff line numberDiff 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 *)
22

33
open Core.Std
44
open Unix

‎base/core/extended/lib/extended_linux.mli

+1-1
Original file line numberDiff line numberDiff 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 *)
22
open Core.Std
33
open Unix
44

‎base/core/extended/lib/fold_map.ml

+1-1
Original file line numberDiff line numberDiff 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 *)
22

33
open Core.Std
44
module Map_intf = Core.Core_map_intf

‎base/core/extended/lib/malloc.ml

+1-1
Original file line numberDiff line numberDiff 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 *)
22
open Sexplib.Std
33
open Bin_prot.Std
44

‎base/core/lib/unpack_buffer.mli

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ module Unpack_one : sig
3030

3131
val map : ('a, 'partial_unpack) t -> f:('a -> 'b) -> ('b, 'partial_unpack) t
3232

33-
(** [create_bin_prot reader] returns an unpacker that reads the "size-prefixed" bin-prot
34-
encoding, in which a value is encoded by first writing the length of the bin-prot
33+
(** [create_bin_prot reader] returns an unpacker that reads the "size-prefixed" bin_prot
34+
encoding, in which a value is encoded by first writing the length of the bin_prot
3535
data as a 64-bit int, and then writing the data itself. This encoding makes it
3636
trivial to know if enough data is available in the buffer, so there is no need to
3737
represent partially unpacked values, and hence ['partial_unpack = unit]. *)
@@ -50,8 +50,8 @@ val create
5050
-> ('value, 'partial_unpack) t
5151

5252
(** [create_bin_prot reader] returns an unpack buffer that unpacks the "size-prefixed"
53-
bin-prot encoding, in which a value is encoded by first writing the length of the
54-
bin-prot data as a 64-bit int, and then writing the bin-prot data itself. This
53+
bin_prot encoding, in which a value is encoded by first writing the length of the
54+
bin_prot data as a 64-bit int, and then writing the bin_prot data itself. This
5555
encoding makes it trivial to know if enough data is available in the buffer, so there
5656
is no need to represent partially unpacked values, and hence ['partial_unpack =
5757
unit]. *)

‎base/core/lib_test/hashtbl/table_new.ml

+1-1
Original file line numberDiff line numberDiff 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 *)
22

33
open Core.Std
44

‎base/fieldslib/oasis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ Library pa_fields_conv
3636
FindlibName: syntax
3737
BuildDepends: camlp4.lib,
3838
camlp4.quotations,
39-
type-conv (>= 2.0.1)
39+
type_conv (>= 3.0.5)
4040
CompiledObject: byte
4141
XMETAType: syntax
42-
XMETARequires: camlp4,type-conv,fieldslib
42+
XMETARequires: camlp4,type_conv,fieldslib
4343
XMETADescription: Syntax extension for Fieldslib
4444
4545
Document "fieldslib"

‎base/pa_ounit/oasis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ Library pa_ounit
2828
FindlibName: pa_ounit
2929
BuildDepends: camlp4.lib,
3030
camlp4.quotations,
31-
type-conv (>= 2.0.1)
31+
type_conv (>= 3.0.5)
3232
CompiledObject: byte
3333
XMETAType: syntax
34-
XMETARequires: camlp4,type-conv,oUnit
34+
XMETARequires: camlp4,type_conv,oUnit
3535
XMETADescription: Syntax extension writing inline tests
3636
EOF
3737

‎base/pa_ounit/syntax/pa_ounit.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ open Camlp4.PreCast
99
1010
Since we are trying to play nicely with other extensions we try to not
1111
override any rules in the grammar. In particular we cannot override the
12-
module creation rule the way type-conv does it. In order to collect all tests
12+
module creation rule the way type_conv does it. In order to collect all tests
1313
we insert "breadcrumbs" items in the modules that have a very particular
1414
shape when generating the tests and then collect those breadcrumbs by folding
1515
over the AST.

‎base/pipebang/oasis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ Library pa_pipebang
2828
FindlibName: pa_pipebang
2929
BuildDepends: camlp4.lib,
3030
camlp4.quotations,
31-
type-conv (>= 2.0.1)
31+
type_conv (>= 3.0.5)
3232
CompiledObject: byte
3333
XMETAType: syntax
34-
XMETARequires: camlp4,type-conv,oUnit
34+
XMETARequires: camlp4,type_conv,oUnit
3535
XMETADescription: Syntax extension writing inline tests
3636
EOF
3737

‎base/sexplib/README

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ sub-expressions in S-expressions.
6363
*=*=*=*=*=*=*=*=*=*=*=
6464

6565

66-
Make sure you have installed the 'type-conv' package on your system, too. It
66+
Make sure you have installed the 'type_conv' package on your system, too. It
6767
should be obtainable at the same site as 'sexplib'.
6868

6969
The API (.mli-files) in the 'sexplib' library directory is fully documented.
@@ -104,16 +104,16 @@ how to extract and substitute sub-expressions.
104104

105105
To compile a file you will have to add a preprocessing flag to the compiler
106106
invocation, e.g. for foo.ml:
107-
<< ocamlc -pp "camlp4o -I {path to type-conv} \
107+
<< ocamlc -pp "camlp4o -I {path to type_conv} \
108108
-I {path to sexplib} pa_type_conv.cmo pa_sexp_conv.cmo" \
109109
-I {path to sexplib} foo.ml
110110
>>
111111

112112
If you are using OCamlMakefile, just put the following line at the top of
113-
the file, assuming you have installed both 'type-conv' and 'sexplib' with
113+
the file, assuming you have installed both 'type_conv' and 'sexplib' with
114114
ocamlfind. The comment must start at the beginning of the line, and you must
115115
not break lines (here broken for readability only):
116-
<< (*pp camlp4o -I `ocamlfind query type-conv` \
116+
<< (*pp camlp4o -I `ocamlfind query type_conv` \
117117
-I `ocamlfind query sexplib` \
118118
pa_type_conv.cmo pa_sexp_conv.cmo *)
119119
>>

‎base/sexplib/doc/README.tex

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ \section{What is ``Sexplib''?}
7171

7272
\section{How can you use it?}
7373

74-
Make sure you have installed the \verb=type-conv= package on your system,
74+
Make sure you have installed the \verb=type_conv= package on your system,
7575
too. It should be obtainable at the same site as \verb=sexplib=.\\
7676
\\
7777
The API (.mli-files) in the \verb=sexplib= library directory is
@@ -118,18 +118,18 @@ \subsection{Compiling and linking}
118118
compiler invocation, e.g. for foo.ml:
119119

120120
\begin{verbatim}
121-
ocamlc -pp "camlp4o -I {path to type-conv} \
121+
ocamlc -pp "camlp4o -I {path to type_conv} \
122122
-I {path to sexplib} pa_type_conv.cmo pa_sexp_conv.cmo" \
123123
-I {path to sexplib} foo.ml
124124
\end{verbatim}
125125

126126
If you are using OCamlMakefile, just put the following line at the
127-
top of the file, assuming you have installed both \verb=type-conv= and
127+
top of the file, assuming you have installed both \verb=type_conv= and
128128
\verb=sexplib= with ocamlfind. The comment must start at the beginning of
129129
the line, and you must not break lines (here broken for readability only):
130130

131131
\begin{verbatim}
132-
(*pp camlp4o -I `ocamlfind query type-conv` \
132+
(*pp camlp4o -I `ocamlfind query type_conv` \
133133
-I `ocamlfind query sexplib` \
134134
pa_type_conv.cmo pa_sexp_conv.cmo *)
135135
\end{verbatim}

‎base/sexplib/lib/intro.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ replace sub-expressions in S-expressions.
1818

1919
{2 How can you use it?}
2020

21-
Make sure you have installed the [type-conv] package on your system,
21+
Make sure you have installed the [type_conv] package on your system,
2222
too. It should be obtainable at the same site as [sexplib].
2323

2424
The API (.mli-files) in the [sexplib] library directory is

‎base/sexplib/oasis.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Library pa_sexp_conv
4747
FindlibName: syntax
4848
FindlibParent: sexplib
4949
Modules: Pa_sexp_conv
50-
BuildDepends: camlp4.quotations,camlp4.extend,type-conv (>= 3.0.4)
50+
BuildDepends: camlp4.quotations,camlp4.extend,type_conv (>= 3.0.5)
5151
CompiledObject: byte
5252
XMETAType: syntax
53-
XMETARequires: camlp4,type-conv,sexplib
53+
XMETARequires: camlp4,type_conv,sexplib
5454
XMETADescription: Syntax extension for Sexplib
5555
5656
Library sexplib_top
@@ -101,7 +101,7 @@ make_tags $HERE/_tags <<EOF
101101
$(tag_for_pack Sexplib $HERE/lib/*.ml{,l,y})
102102
103103
<lib/pre_sexp.ml>: pp(cpp -undef -traditional -Werror -I$HERE/syntax)
104-
<lib_test/*.ml{,i}>: syntax_camlp4o, pkg_type-conv.syntax
104+
<lib_test/*.ml{,i}>: syntax_camlp4o, pkg_type_conv.syntax
105105
<lib_test/conv_test.byte>: use_sexplib, pkg_unix, pkg_num, pkg_bigarray
106106
<syntax/pa_sexp_conv.ml>: syntax_camlp4o
107107
EOF

‎base/typehash/oasis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ Library pa_typehash
3434
FindlibName: syntax
3535
BuildDepends: camlp4.lib,
3636
camlp4.quotations,
37-
type-conv (>= 2.0.1)
37+
type_conv (>= 3.0.5)
3838
CompiledObject: byte
3939
XMETAType: syntax
40-
XMETARequires: camlp4,type-conv,typehashlib
40+
XMETARequires: camlp4,type_conv,typehashlib
4141
XMETADescription: Syntax extension for "with typehash"
4242
EOF
4343

‎base/variantslib/lib/META

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exists_if = "variantslib.cma"
88
package "syntax" (
99
version = "107.01"
1010
description = "Syntax extension for Variantslib"
11-
requires = "camlp4 type-conv variantslib"
11+
requires = "camlp4 type_conv variantslib"
1212
archive(syntax, preprocessor) = "pa_variants_conv.cma"
1313
archive(syntax, toploop) = "pa_variants_conv.cma"
1414
exists_if = "pa_variants_conv.cma"

‎base/variantslib/lib/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ OCAMLMAKEFILE = ../OCamlMakefile
33
SOURCES = variant.ml
44
LIB_PACK_NAME = variantslib
55
INCDIRS = +camlp4
6-
PACKS = type-conv
6+
PACKS = type_conv
77
RESULT = variantslib
88

99
TRASH = \

‎base/variantslib/oasis.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ Library pa_variants_conv
3636
FindlibName: syntax
3737
BuildDepends: camlp4.lib,
3838
camlp4.quotations,
39-
type-conv (>= 2.0.1)
39+
type_conv (>= 3.0.5)
4040
CompiledObject: byte
4141
XMETAType: syntax
42-
XMETARequires: camlp4,type-conv,variantslib
42+
XMETARequires: camlp4,type_conv,variantslib
4343
XMETADescription: Syntax extension for Variantslib
4444
4545
Document "variantslib"

‎build-and-install

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ esac
5656

5757
# in dependency topological order
5858
libraries="
59-
type-conv
59+
type_conv
6060
pipebang
6161
compare
6262
typehash
6363
fieldslib
6464
variantslib
6565
pa_ounit
66-
bin-prot
66+
bin_prot
6767
sexplib
6868
core
6969
core/extended

‎licensing/THIRD-PARTY.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
The repository contains 3rd-party code in the following locations and
22
under the following licenses:
33

4-
- type-conv, sexplib and bin-prot: based on Tywith, by Martin
5-
Sandin. License can be found in base/sexplib/LICENSE.Tywith,
6-
base/type-conv/LICENSE.Tywith, and base/bin-prot/LICENSE.Tywith.
4+
- type_conv, sexplib and bin_prot: based on Tywith, by Martin
5+
Sandin. License can be found in base/sexplib/LICENSE.Tywith,
6+
base/type_conv/LICENSE.Tywith, and base/bin_prot/LICENSE.Tywith.
77

88
- Core's implementation of union-find: based on an implementation by
99
Henry Matthew Fluet, Suresh Jagannathan, and Stephen Weeks. License

0 commit comments

Comments
 (0)