Skip to content

Commit

Permalink
Merge pull request #35 from frenetic-lang/v0.1.0-rc
Browse files Browse the repository at this point in the history
v0.1.0
  • Loading branch information
basus committed Mar 18, 2014
2 parents da499f2 + 5a2452d commit 490509d
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ echo OPAM versions
opam --version
opam --git-version

(cd $HOME && curl "https://s3.amazonaws.com/opam-street/opam-street.tar.gz" | tar xz)
opam init
eval `opam config env`
opam install ${OPAM_DEPENDS}

Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ script: bash -ex .travis-ci.sh
env:
global:
- OPAM_DEPENDS="ocamlgraph"
- FRENETIC_DEPENDS="ocaml-packet core"
matrix:
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0
- OCAML_VERSION=3.12.1 OPAM_VERSION=1.1.0
notifications:
irc:
channels:
Expand Down
25 changes: 25 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,28 @@ A library for working with network topologies.

[![Build Status](https://travis-ci.org/frenetic-lang/ocaml-topology.png)](https://travis-ci.org/frenetic-lang/ocaml-topology)

Installation
------------

You can install the latest release from [OPAM][http://opam.ocamlpro.com/] using
the following command:

$ opam install topology

To build from source, first ensure that you've installed all dependencies,
which are listed in the `_oasis` file under the `Library topology` section.
Then, run the following commands:

$ make
$ make install

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

$ make reinstall

License
-------

LGPLv3, see LICENSE file for its text.
3 changes: 1 addition & 2 deletions _oasis
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
OASISFormat: 0.3
OCamlVersion: >= 4.01.0
Name: topology
Version: 0.9
Version: 0.1.0
Synopsis: Network topologies
Authors: https://github.com/frenetic-lang/ocaml-topology/contributors
License: LGPL
Expand Down
6 changes: 3 additions & 3 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: e00b7180b701ea036c5a569a717555b1)
# DO NOT EDIT (digest: 9a9423c6caa2a81a7808c0a20add1525)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
Expand All @@ -15,6 +15,6 @@
"_darcs": not_hygienic
# Library topology
"lib/topology.cmxs": use_topology
<lib/*.ml{,i}>: package(ocamlgraph)
<lib/*.ml{,i}>: package(threads)
<lib/*.ml{,i}>: pkg_ocamlgraph
<lib/*.ml{,i}>: pkg_threads
# OASIS_STOP
4 changes: 2 additions & 2 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 01ac29d09e869509417993cfa2eb8bfa)
version = "0.9"
# DO NOT EDIT (digest: e515ef1193f36eb3ec179e7bafa2fac5)
version = "0.1.0"
description = "Network topologies"
requires = "ocamlgraph threads"
archive(byte) = "topology.cma"
Expand Down
8 changes: 4 additions & 4 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: dc7a70132b1c2495835f83d2ff746a31) *)
(* DO NOT EDIT (digest: c14470851250cc2e3d484df6c861e37e) *)
(*
Regenerated by OASIS v0.4.1
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6547,12 +6547,12 @@ let setup_t =
package =
{
oasis_version = "0.3";
ocaml_version = Some (OASISVersion.VGreaterEqual "4.01.0");
ocaml_version = None;
findlib_version = None;
alpha_features = [];
beta_features = [];
name = "topology";
version = "0.9";
version = "0.1.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -6647,7 +6647,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.1";
oasis_digest = Some "1\238\211\026!DV]1/\201\223\211H`\168";
oasis_digest = Some "\2002-ga\196\215\184\127\254,`\128S\159o";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
Expand Down

0 comments on commit 490509d

Please sign in to comment.