Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update OASIS buildsystem

Ignore-this: f4dff1e2de751b14b6785080ffaa28aa

darcs-hash:20100831140232-a43a9-a4d60301f5555952f442cce61e89bc795d2db337
  • Loading branch information...
commit c3ab228dc582f2c9398843ac1277f8388ac6a619 1 parent ac37b54
@gildor478 gildor478 authored
Showing with 19 additions and 22 deletions.
  1. +4 −3 README.txt
  2. +10 −4 myocamlbuild.ml
  3. +5 −15 setup.ml
View
7 README.txt
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 574b65678c599c6f3c771661e79c50b8) *)
+(* DO NOT EDIT (digest: a319542397f6b38d6e3c3e8d3428c081) *)
This is the README file for the oasis distribution.
(C) 2008-2010 OCamlCore SARL
@@ -12,8 +12,9 @@ project and creates everything required.
It uses external tools like OCamlbuild and it can be considered as the glue
between various subsystems that do the job. It should support the following
-tools: - OCamlbuild - OMake (todo) - OCamlMakefile (todo), - ocaml-autoconf
-(todo)
+tools:
+
+- OCamlbuild - OMake (todo) - OCamlMakefile (todo), - ocaml-autoconf (todo)
It also features a do-it-yourself command line invocation and an internal
configure/install scheme. Libraries are managed through findlib. It has been
View
14 myocamlbuild.ml
@@ -113,7 +113,7 @@ rule "ocamlify: %.mlify & %.mlify.depends -> %.ml"
;;
(* OASIS_START *)
-(* DO NOT EDIT (digest: cd9cd779a5fdd4ecf9d1e5db3989ee3f) *)
+(* DO NOT EDIT (digest: 3769d3bf9bde4a51437151ce5b430165) *)
module BaseEnvLight = struct
# 21 "/home/gildor/programmation/oasis/src/base/BaseEnvLight.ml"
@@ -326,14 +326,15 @@ module MyOCamlbuildBase = struct
open Ocamlbuild_plugin
type dir = string
+ type file = string
type name = string
-# 53 "/home/gildor/programmation/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+# 54 "/home/gildor/programmation/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
type t =
{
lib_ocaml: (name * dir list) list;
- lib_c: (name * dir) list;
+ lib_c: (name * dir * file list) list;
flags: (string list * spec) list;
}
@@ -392,7 +393,7 @@ module MyOCamlbuildBase = struct
(* Declare C libraries *)
List.iter
- (fun (lib, dir) ->
+ (fun (lib, dir, headers) ->
(* Handle C part of library *)
flag ["link"; "library"; "ocaml"; "byte"; "use_lib"^lib]
(S[A"-dllib"; A("-l"^lib); A"-cclib"; A("-l"^lib)]);
@@ -409,6 +410,11 @@ module MyOCamlbuildBase = struct
dep ["link"; "ocaml"; "use_lib"^lib]
[dir/"lib"^lib^"."^(!Options.ext_lib)];
+ (* TODO: be more specific about what depends on headers *)
+ (* Depends on .h files *)
+ dep ["compile"; "c"]
+ headers;
+
(* Setup search path for lib *)
flag ["link"; "ocaml"; "use_"^lib]
(S[A"-I"; P(dir)]);
View
20 setup.ml
@@ -20,9 +20,9 @@
(********************************************************************************)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 8bf09768a765a9bf1e81f304c7a17571) *)
+(* DO NOT EDIT (digest: cd220b03be1a06f1862de4f2a91286c3) *)
(*
- Regenerated by OASIS v0.2.0~alpha1
+ Regenerated by OASIS v0.1.0
Visit http://oasis.forge.ocamlcore.org for more information and
documentation about functions used in this file.
*)
@@ -5136,7 +5136,7 @@ let setup_t =
"Architecture for building OCaml libraries and applications";
description =
Some
- "OASIS generates a full configure, build and install system for your\napplication. It starts with a simple `_oasis` file at the toplevel of your\nproject and creates everything required.\n\nIt uses external tools like OCamlbuild and it can be considered as the glue\nbetween various subsystems that do the job. It should support the following\ntools:\n- OCamlbuild\n- OMake (todo)\n- OCamlMakefile (todo),\n- ocaml-autoconf (todo)\n\nIt also features a do-it-yourself command line invocation and an internal\nconfigure/install scheme. Libraries are managed through findlib. It has been\ntested on GNU Linux and Windows.\n\nIt also allows to have standard entry points and description. It helps to\nintegrates your libraries and software with third parties tools like GODI.";
+ "OASIS generates a full configure, build and install system for your\napplication. It starts with a simple `_oasis` file at the toplevel of your\nproject and creates everything required.\n\nIt uses external tools like OCamlbuild and it can be considered as the glue\nbetween various subsystems that do the job. It should support the following\ntools:\n\n- OCamlbuild\n- OMake (todo)\n- OCamlMakefile (todo),\n- ocaml-autoconf (todo)\n\nIt also features a do-it-yourself command line invocation and an internal\nconfigure/install scheme. Libraries are managed through findlib. It has been\ntested on GNU Linux and Windows.\n\nIt also allows to have standard entry points and description. It helps to\nintegrates your libraries and software with third parties tools like GODI.";
categories = [];
conf_type =
("internal",
@@ -5144,12 +5144,7 @@ let setup_t =
(OASISVersion.VInt
(0,
OASISVersion.VInt
- (2,
- OASISVersion.VInt
- (0,
- OASISVersion.VNonInt
- ("~alpha",
- OASISVersion.VInt (1, OASISVersion.VEnd)))))));
+ (1, OASISVersion.VInt (0, OASISVersion.VEnd)))));
conf_custom =
{
pre_command = [(OASISExpr.EBool true, None)];
@@ -5178,12 +5173,7 @@ let setup_t =
(OASISVersion.VInt
(0,
OASISVersion.VInt
- (2,
- OASISVersion.VInt
- (0,
- OASISVersion.VNonInt
- ("~alpha",
- OASISVersion.VInt (1, OASISVersion.VEnd)))))));
+ (1, OASISVersion.VInt (0, OASISVersion.VEnd)))));
install_custom =
{
pre_command = [(OASISExpr.EBool true, None)];
Please sign in to comment.
Something went wrong with that request. Please try again.