Update utop.opam and README.md

This commit is contained in:
Jérémie Dimino 2017-03-16 00:05:01 +00:00 committed by Jeremie Dimino
parent eae41f42a6
commit e8723c0b9b
2 changed files with 7 additions and 32 deletions

View File

@ -23,7 +23,8 @@ dependencies listed in the next section.
Dependencies
------------
* [OCaml](http://caml.inria.fr/ocaml/) (>= 4.01.0)
* [OCaml](http://caml.inria.fr/ocaml/) (>= 4.02.3)
* [Jbuilder](http://github.com/janestreet/jbuilder)
* [findlib](http://projects.camlcity.org/projects/findlib.html) (>= 1.4.0)
* [cppo](http://mjambon.com/cppo.html) (>= 1.0.1)
* [react](http://erratique.ch/software/react)
@ -31,27 +32,18 @@ Dependencies
* [Camomile](http://github.com/yoriyuki/Camomile) (>= 0.8)
* [zed](http://github.com/diml/zed) (>= 1.2)
* [lambda-term](http://github.com/diml/lambda-term) (>= 1.2)
* [camlp4](http://github.com/ocaml/camlp4) (optional)
For building the development version, you also need to install
[oasis](http://oasis.forge.ocamlcore.org/) (>= 0.4.0).
Installation from sources
-------------------------
To build and install utop:
$ ./configure
$ make
$ make install
If you want to be able to use camlp4, rather use:
$ ./configure --enable-camlp4
### Documentation and manual pages _(optional)_
To build the documentation:
To build the documentation (currently broken):
$ make doc
@ -59,9 +51,8 @@ It will then be installed by `make install`.
### Tests _(optional)_
To build and execute tests:
To build and execute tests (currently broken):
$ ./configure --enable-tests
$ make test
Usage

View File

@ -7,20 +7,7 @@ homepage: "https://github.com/diml/utop"
bug-reports: "https://github.com/diml/utop/issues"
dev-repo: "git://github.com/diml/utop.git"
build: [
["./configure"
"--prefix" prefix
"--%{camlp4:enable}%-camlp4"
"--%{ppx_tools:enable}%-interact"]
[make]
]
install: [
[make "install"]
]
build-doc: [
["ocaml" "setup.ml" "-doc"]
]
remove: [
["ocamlfind" "remove" "utop"]
["jbuilder" "build" "@install" "--root" "." "--only" "utop" "-j" jobs]
]
depends: [
"base-unix"
@ -29,12 +16,9 @@ depends: [
"lambda-term" {>= "1.2"}
"lwt"
"react" {>= "1.0.0"}
"cppo" {>= "1.1.2"}
"oasis" {build & >= "0.3.0"}
"cppo" {build & >= "1.1.2"}
]
conflicts: [ "oasis" {= "0.4.7"} ]
depopts: [
"camlp4"
"ppx_tools"
]
available: [ ocaml-version >= "4.01" ]
available: [ ocaml-version >= "4.02.3" ]