Skip to content

Commit bf6b2dc

Browse files
committed
Merge pull request #181 from frenetic-lang/opam2
Use `opam pin` for development
2 parents 7b329f7 + 8a03698 commit bf6b2dc

File tree

2 files changed

+35
-11
lines changed

2 files changed

+35
-11
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ or after installing the library:
2525
Development
2626
-----------
2727

28-
To build from source, first ensure that you've installed all dependencies,
29-
which are listed in the `_oasis` file under the openflow, async, and quickcheck
30-
`Library` sections. Then, run the following commands:
28+
To build and install from source, clone this repository and run the following
29+
command from its root directory:
3130

32-
./configure --enable-tests --enable-quickcheck --enable-async
33-
$ make
34-
$ make test
35-
$ make install
31+
opam pin add openflow .
3632

37-
While developing, you may want to install your latest changes for testing with
38-
other packages. `make install` will fail when trying to reinstall, so use this
39-
command instead:
4033

41-
$ make reinstall
34+
If you make changes to the code, run this command to rebuild the library and
35+
any other libraries that depend on it (e.g., the
36+
[frenetic][http://github.com/frenetic-lang/frenetic] library):
37+
38+
opam install openflow
39+
40+
When you add or remove dependencies, be sure to specify them both in the
41+
`_oasis` and `opam` file.
4242

4343
License
4444
-------

opam

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
opam-version: "1"
2+
ocaml-version: [ >= "4.01.0" ]
3+
version: "0.7.0"
4+
name: "openflow"
5+
maintainer: "Spiros Eliopoulos <[email protected]>"
6+
build: [
7+
["ocaml" "setup.ml" "-configure" "--%{async:enable}%-async" "--%{quickcheck:enable}%-quickcheck" ]
8+
["ocaml" "setup.ml" "-build"]
9+
["ocaml" "setup.ml" "-install"]
10+
]
11+
remove: [
12+
["ocamlfind" "remove" "openflow"]
13+
]
14+
depends: [
15+
"ocamlfind"
16+
"core"
17+
"cstruct" {>= "1.0.1"}
18+
"packet" {>= "0.3.0" }
19+
"sexplib"
20+
]
21+
depopts: [ "async" "quickcheck" ]
22+
conflicts: [
23+
"async_extra" { != "111.28.00" }
24+
]

0 commit comments

Comments
 (0)