Skip to content

Commit

Permalink
Support (and require) type_conv-108.07.00+ and dyntype-0.9.0+
Browse files Browse the repository at this point in the history
  • Loading branch information
avsm committed Oct 1, 2012
1 parent 0c41dee commit f5e3588
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 4 additions & 0 deletions NEWS
@@ -1,3 +1,7 @@
0.7.0:

* Support (and require) type_conv-108.07.00 or greater [1 Oct 2012]

0.6.4:
* Fix toplevel usage in META file [29 Sep 2012]

Expand Down
8 changes: 5 additions & 3 deletions README.md
Expand Up @@ -5,13 +5,13 @@ Installation

You can download the latest distribution from Github at <http://github.com/mirage/orm>. It also depends on the following libraries:

* `dyntype` : available from <http://github.com/mirage/dyntype>
* `dyntype` : version 0.9.0+, available from <http://github.com/mirage/dyntype>

* `ocaml-sqlite3`: version 1.5.7+, available from <http://www.ocaml.info/home/ocaml_sources.html>. Earlier versions had crash bugs which are easily triggered by the ORM library, so please ensure you are up-to-date before reporting bugs.

* `type-conv`: available from <http://www.ocaml.info/home/ocaml_sources.html>
* `type-conv`: version 108.07.00+, available from <http://www.ocaml.info/home/ocaml_sources.html>

* `sqlite3`: version 3.6.22+, available from <http://www.sqlite.org/download.html>. Earlier versions had crash bugs which are easily triggered by the ORM library, so please ensure you are up-to-date before reporting bugs.
* `sqlite3`: version 3.6.22+, available from <http://www.sqlite.org/download.html>. Earlier versions had crash bugs which are easily triggered by the ORM library, so please ensure you are up-to-date before reporting bugs. Note that you may also need `pkg-config` installed for this to compile, so on MacOS X do `brew install pkg-config sqlite3` to get the latest dependencies for the OCaml bindings.

The library installs an ocamlfind META file, so use it with the `orm.syntax` package. To compile a file `foo.ml` with the ORM and findlib, do:

Expand All @@ -23,6 +23,8 @@ To link it into a standalone executable:

You can report issues using the Github issue tracker at <http://github.com/mirage/orm/issues>, or mail the authors at <mailto:mirage@recoil.org>. If you use the ORM somewhere, feel free to drop us a short line and we can add your project to the Wiki as well.

We recommend installation via the OPAM package manager, available at <http://opam.ocamlpro.com>. Simply do `opam install orm`.

Usage
=====

Expand Down
2 changes: 1 addition & 1 deletion lib/syntax/pa_hash.ml
Expand Up @@ -24,7 +24,7 @@ open Pa_type_conv

let _ =
add_generator "hash"
(fun tds ->
(fun _ tds ->
let _loc = loc_of_ctyp tds in
<:str_item< $P4_hash.gen tds$ >>
)
2 changes: 1 addition & 1 deletion lib/syntax/pa_orm.ml
Expand Up @@ -79,7 +79,7 @@ end

let _ =
add_generator_with_arg "orm" Key.orm_parms
(fun args tds ->
(fun args _ tds ->
let _loc = loc_of_ctyp tds in
let args = match args with None -> [] |Some x -> x in
let mode, keys = List.partition (function `Mode _ -> true |_ -> false) args in
Expand Down

0 comments on commit f5e3588

Please sign in to comment.