Permalink
Browse files

Add constraint that oasis must be at least version 0.4.2

  • Loading branch information...
1 parent d6813bd commit 178b1b7dde3803f9c6a2a3d9a5bff054b2608255 @Chris00 Chris00 committed Feb 24, 2014
Showing with 31 additions and 3 deletions.
  1. +1 −1 _oasis
  2. +29 −1 setup.ml
  3. +1 −1 src/BuildDepends.ml
View
2 _oasis
@@ -18,7 +18,7 @@ FilesAB: src/Conf.ml.ab
Executable oasis2opam
Path: src/
MainIs: oasis2opam.ml
- BuildDepends: oasis (>= 0.3.0), unix, str
+ BuildDepends: oasis (>= 0.4.2), unix, str
CompiledObject: best
BuildTools: ocamlbuild
Install: true
View
@@ -27,10 +27,38 @@ let () =
with Not_found -> ();;
(* OASIS_START *)
-(* DO NOT EDIT (digest: 7f47a529f70709161149c201ccd90f0b) *)
+(* DO NOT EDIT (digest: 9852805d5c19ca1cb6abefde2dcea323) *)
+(******************************************************************************)
+(* OASIS: architecture for building OCaml libraries and applications *)
+(* *)
+(* Copyright (C) 2011-2013, Sylvain Le Gall *)
+(* Copyright (C) 2008-2011, OCamlCore SARL *)
+(* *)
+(* This library is free software; you can redistribute it and/or modify it *)
+(* under the terms of the GNU Lesser General Public License as published by *)
+(* the Free Software Foundation; either version 2.1 of the License, or (at *)
+(* your option) any later version, with the OCaml static compilation *)
+(* exception. *)
+(* *)
+(* This library is distributed in the hope that it will be useful, but *)
+(* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY *)
+(* or FITNESS FOR A PARTICULAR PURPOSE. See the file COPYING for more *)
+(* details. *)
+(* *)
+(* You should have received a copy of the GNU Lesser General Public License *)
+(* along with this library; if not, write to the Free Software Foundation, *)
+(* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *)
+(******************************************************************************)
+
+let () =
+ try
+ Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH")
+ with Not_found -> ()
+;;
#use "topfind";;
#require "oasis.dynrun";;
open OASISDynRun;;
+
(* OASIS_STOP *)
#load "unix.cma";;
View
@@ -34,7 +34,7 @@ let opam_base_packages = [ "bigarray", "base-bigarray";
(* Findlib libraries coming with OCaml — no OPAM package. *)
let findlib_with_ocaml =
let pkg = [ "camlp4"; "dynlink"; "graphics"; "labltk"; "num";
- "ocamlbuild"; "stdlib"; "str"; "camlp4" ] in
+ "ocamlbuild"; "stdlib"; "str" ] in
List.fold_left (fun s e -> S.add e s) S.empty pkg
module Opam = struct

0 comments on commit 178b1b7

Please sign in to comment.