Skip to content

Commit

Permalink
Incorrect dep on batteries, fix _oasis
Browse files Browse the repository at this point in the history
  • Loading branch information
thelema committed Dec 15, 2011
1 parent 03062dc commit f9062ad
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 14 deletions.
3 changes: 1 addition & 2 deletions INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(* OASIS_START *)
(* DO NOT EDIT (digest: 4852e1c830a4a5b1957ffb1569828dc4) *)
(* DO NOT EDIT (digest: de557c1fc9e7a563d6c6eb38a1f35407) *)
This is the INSTALL file for the bench distribution.

This package uses OASIS to generate its build system. See section OASIS for
Expand All @@ -11,7 +11,6 @@ Dependencies
In order to compile this package, you will need:
* ocaml for all, doc API
* findlib
* batteries (>= 2.0beta2)

Installing
==========
Expand Down
1 change: 0 additions & 1 deletion _oasis
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Authors: Edgar Friendly
License: LGPL-2.1 with OCaml linking exception
Plugins: META (0.2), StdFiles (0.2)
BuildTools: ocamlbuild
BuildDepends: batteries (>= 2.0beta2)

Library bench
Path: src/
Expand Down
3 changes: 1 addition & 2 deletions _tags
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: bb58645a9555e2c437de5009da8446d6)
# DO NOT EDIT (digest: 8525025d3d7335f7135738ec2c1823b7)
# 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,5 @@
"_darcs": not_hygienic
# Library bench
"src": include
<src/*.ml{,i}>: pkg_batteries
# OASIS_STOP
true: debug
9 changes: 2 additions & 7 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.2.1~alpha1 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 8fee725a7fdc8f635b8f06862e467328) *)
(* DO NOT EDIT (digest: 2ff7fc37243334c6e78ad78889f544bc) *)
(*
Regenerated by OASIS v0.2.1~alpha1
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -5007,12 +5007,7 @@ let setup_t =
bs_install = [(OASISExpr.EBool true, true)];
bs_path = "src/";
bs_compiled_object = Best;
bs_build_depends =
[
FindlibPackage
("batteries",
Some (OASISVersion.VGreaterEqual "2.0beta2"))
];
bs_build_depends = [];
bs_build_tools = [ExternalTool "ocamlbuild"];
bs_c_sources = [];
bs_data_files = [];
Expand Down
3 changes: 1 addition & 2 deletions src/META
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# OASIS_START
# DO NOT EDIT (digest: e2f504e62db2910a368c652306d6d00f)
# DO NOT EDIT (digest: 79d81d937d78063dbc78a880c42bd601)
version = "1.3"
description = "A benchmarking tool for statistically valid benchmarks"
requires = "batteries"
archive(byte) = "bench.cma"
archive(native) = "bench.cmxa"
exists_if = "bench.cma"
Expand Down

0 comments on commit f9062ad

Please sign in to comment.