Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update OASIS buildsystem

Ignore-this: f4dff1e2de751b14b6785080ffaa28aa

darcs-hash:20100831140232-a43a9-a4d60301f5555952f442cce61e89bc795d2db337
  • Loading branch information...
commit c3ab228dc582f2c9398843ac1277f8388ac6a619 1 parent ac37b54
Sylvain Le Gall authored August 31, 2010
7  README.txt
... ...
@@ -1,5 +1,5 @@
1 1
 (* OASIS_START *)
2  
-(* DO NOT EDIT (digest: 574b65678c599c6f3c771661e79c50b8) *)
  2
+(* DO NOT EDIT (digest: a319542397f6b38d6e3c3e8d3428c081) *)
3 3
 This is the README file for the oasis distribution.
4 4
 
5 5
 (C) 2008-2010 OCamlCore SARL
@@ -12,8 +12,9 @@ project and creates everything required.
12 12
 
13 13
 It uses external tools like OCamlbuild and it can be considered as the glue
14 14
 between various subsystems that do the job. It should support the following
15  
-tools: - OCamlbuild - OMake (todo) - OCamlMakefile (todo), - ocaml-autoconf
16  
-(todo)
  15
+tools:
  16
+
  17
+- OCamlbuild - OMake (todo) - OCamlMakefile (todo), - ocaml-autoconf (todo)
17 18
 
18 19
 It also features a do-it-yourself command line invocation and an internal
19 20
 configure/install scheme. Libraries are managed through findlib. It has been
14  myocamlbuild.ml
@@ -113,7 +113,7 @@ rule "ocamlify: %.mlify & %.mlify.depends -> %.ml"
113 113
 ;;
114 114
 
115 115
 (* OASIS_START *)
116  
-(* DO NOT EDIT (digest: cd9cd779a5fdd4ecf9d1e5db3989ee3f) *)
  116
+(* DO NOT EDIT (digest: 3769d3bf9bde4a51437151ce5b430165) *)
117 117
 module BaseEnvLight = struct
118 118
 # 21 "/home/gildor/programmation/oasis/src/base/BaseEnvLight.ml"
119 119
   
@@ -326,14 +326,15 @@ module MyOCamlbuildBase = struct
326 326
   open Ocamlbuild_plugin
327 327
   
328 328
   type dir = string 
  329
+  type file = string 
329 330
   type name = string 
330 331
   
331  
-# 53 "/home/gildor/programmation/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
  332
+# 54 "/home/gildor/programmation/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
332 333
   
333 334
   type t =
334 335
       {
335 336
         lib_ocaml: (name * dir list) list;
336  
-        lib_c:     (name * dir) list; 
  337
+        lib_c:     (name * dir * file list) list; 
337 338
         flags:     (string list * spec) list;
338 339
       } 
339 340
   
@@ -392,7 +393,7 @@ module MyOCamlbuildBase = struct
392 393
   
393 394
           (* Declare C libraries *)
394 395
           List.iter
395  
-            (fun (lib, dir) ->
  396
+            (fun (lib, dir, headers) ->
396 397
                  (* Handle C part of library *)
397 398
                  flag ["link"; "library"; "ocaml"; "byte"; "use_lib"^lib]
398 399
                    (S[A"-dllib"; A("-l"^lib); A"-cclib"; A("-l"^lib)]);
@@ -409,6 +410,11 @@ module MyOCamlbuildBase = struct
409 410
                  dep  ["link"; "ocaml"; "use_lib"^lib] 
410 411
                    [dir/"lib"^lib^"."^(!Options.ext_lib)];
411 412
   
  413
+                 (* TODO: be more specific about what depends on headers *)
  414
+                 (* Depends on .h files *)
  415
+                 dep ["compile"; "c"] 
  416
+                   headers;
  417
+  
412 418
                  (* Setup search path for lib *)
413 419
                  flag ["link"; "ocaml"; "use_"^lib] 
414 420
                    (S[A"-I"; P(dir)]);
20  setup.ml
@@ -20,9 +20,9 @@
20 20
 (********************************************************************************)
21 21
 
22 22
 (* OASIS_START *)
23  
-(* DO NOT EDIT (digest: 8bf09768a765a9bf1e81f304c7a17571) *)
  23
+(* DO NOT EDIT (digest: cd220b03be1a06f1862de4f2a91286c3) *)
24 24
 (*
25  
-   Regenerated by OASIS v0.2.0~alpha1
  25
+   Regenerated by OASIS v0.1.0
26 26
    Visit http://oasis.forge.ocamlcore.org for more information and
27 27
    documentation about functions used in this file.
28 28
 *)
@@ -5136,7 +5136,7 @@ let setup_t =
5136 5136
             "Architecture for building OCaml libraries and applications";
5137 5137
           description =
5138 5138
             Some
5139  
-              "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.";
  5139
+              "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.";
5140 5140
           categories = [];
5141 5141
           conf_type =
5142 5142
             ("internal",
@@ -5144,12 +5144,7 @@ let setup_t =
5144 5144
                 (OASISVersion.VInt
5145 5145
                    (0,
5146 5146
                      OASISVersion.VInt
5147  
-                       (2,
5148  
-                         OASISVersion.VInt
5149  
-                           (0,
5150  
-                             OASISVersion.VNonInt
5151  
-                               ("~alpha",
5152  
-                                 OASISVersion.VInt (1, OASISVersion.VEnd)))))));
  5147
+                       (1, OASISVersion.VInt (0, OASISVersion.VEnd)))));
5153 5148
           conf_custom =
5154 5149
             {
5155 5150
                pre_command = [(OASISExpr.EBool true, None)];
@@ -5178,12 +5173,7 @@ let setup_t =
5178 5173
                 (OASISVersion.VInt
5179 5174
                    (0,
5180 5175
                      OASISVersion.VInt
5181  
-                       (2,
5182  
-                         OASISVersion.VInt
5183  
-                           (0,
5184  
-                             OASISVersion.VNonInt
5185  
-                               ("~alpha",
5186  
-                                 OASISVersion.VInt (1, OASISVersion.VEnd)))))));
  5176
+                       (1, OASISVersion.VInt (0, OASISVersion.VEnd)))));
5187 5177
           install_custom =
5188 5178
             {
5189 5179
                pre_command = [(OASISExpr.EBool true, None)];

0 notes on commit c3ab228

Please sign in to comment.
Something went wrong with that request. Please try again.