Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

bump version to 0.3.0

  • Loading branch information...
commit a146bb91994d91bdf858d5b63a556376a3b9e916 1 parent ad3a4a5
Dave Scott authored

Showing 4 changed files with 131 additions and 420 deletions. Show diff stats Hide diff stats

  1. +1 1  _oasis
  2. +5 5 lib/META
  3. +26 56 myocamlbuild.ml
  4. +99 358 setup.ml
2  _oasis
... ... @@ -1,6 +1,6 @@
1 1 OASISFormat: 0.3
2 2 Name: shared-memory-ring
3   -Version: 0.2.0
  3 +Version: 0.3.0
4 4 Synopsis: Xen-style shared memory rings
5 5 Authors: Anil Madhavapeddy, David Scott
6 6 License: ISC
10 lib/META
... ... @@ -1,6 +1,6 @@
1 1 # OASIS_START
2   -# DO NOT EDIT (digest: 8dd02c0090fe9cda27c2dcc376b5c662)
3   -version = "0.2.0"
  2 +# DO NOT EDIT (digest: f51ec9bbf3347d0faceb3e16c3efcdcc)
  3 +version = "0.3.0"
4 4 description = "Xen-style shared memory rings"
5 5 requires = "cstruct cstruct.syntax"
6 6 archive(byte) = "shared_memory_ring.cma"
@@ -9,7 +9,7 @@ archive(native) = "shared_memory_ring.cmxa"
9 9 archive(native, plugin) = "shared_memory_ring.cmxs"
10 10 exists_if = "shared_memory_ring.cma"
11 11 package "xenstore" (
12   - version = "0.2.0"
  12 + version = "0.3.0"
13 13 description = "Xen-style shared memory rings"
14 14 requires = "shared-memory-ring"
15 15 archive(byte) = "xenstore_ring.cma"
@@ -20,7 +20,7 @@ package "xenstore" (
20 20 )
21 21
22 22 package "lwt" (
23   - version = "0.2.0"
  23 + version = "0.3.0"
24 24 description = "Xen-style shared memory rings"
25 25 requires = "shared-memory-ring lwt lwt.syntax"
26 26 archive(byte) = "lwt_shared_memory_ring.cma"
@@ -31,7 +31,7 @@ package "lwt" (
31 31 )
32 32
33 33 package "console" (
34   - version = "0.2.0"
  34 + version = "0.3.0"
35 35 description = "Xen-style shared memory rings"
36 36 requires = "shared-memory-ring"
37 37 archive(byte) = "console_ring.cma"
82 myocamlbuild.ml
... ... @@ -1,7 +1,7 @@
1 1 (* OASIS_START *)
2   -(* DO NOT EDIT (digest: fa01762308f97d953e3d7ec39aa4f64f) *)
  2 +(* DO NOT EDIT (digest: a51fbcdf3b8d7b71c48da37fc9976961) *)
3 3 module OASISGettext = struct
4   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
  4 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml" *)
5 5
6 6 let ns_ str =
7 7 str
@@ -24,7 +24,7 @@ module OASISGettext = struct
24 24 end
25 25
26 26 module OASISExpr = struct
27   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
  27 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
28 28
29 29
30 30
@@ -116,7 +116,7 @@ end
116 116
117 117 # 117 "myocamlbuild.ml"
118 118 module BaseEnvLight = struct
119   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
  119 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseEnvLight.ml" *)
120 120
121 121 module MapString = Map.Make(String)
122 122
@@ -214,7 +214,7 @@ end
214 214
215 215 # 215 "myocamlbuild.ml"
216 216 module MyOCamlbuildFindlib = struct
217   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
  217 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
218 218
219 219 (** OCamlbuild extension, copied from
220 220 * http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
@@ -234,21 +234,19 @@ module MyOCamlbuildFindlib = struct
234 234 Ocamlbuild_pack.Lexers.blank_sep_strings
235 235
236 236 let split s ch =
237   - let buf = Buffer.create 13 in
238   - let x = ref [] in
239   - let flush () =
240   - x := (Buffer.contents buf) :: !x;
241   - Buffer.clear buf
  237 + let x =
  238 + ref []
242 239 in
243   - String.iter
244   - (fun c ->
245   - if c = ch then
246   - flush ()
247   - else
248   - Buffer.add_char buf c)
249   - s;
250   - flush ();
251   - List.rev !x
  240 + let rec go s =
  241 + let pos =
  242 + String.index s ch
  243 + in
  244 + x := (String.before s pos)::!x;
  245 + go (String.after s (pos + 1))
  246 + in
  247 + try
  248 + go s
  249 + with Not_found -> !x
252 250
253 251 let split_nl s = split s '\n'
254 252
@@ -283,27 +281,17 @@ module MyOCamlbuildFindlib = struct
283 281
284 282 (* When one link an OCaml library/binary/package, one should use -linkpkg *)
285 283 flag ["ocaml"; "link"; "program"] & A"-linkpkg";
286   - flag ["ocaml"; "link"; "output_obj"] & A"-linkpkg";
287 284
288 285 (* For each ocamlfind package one inject the -package option when
289 286 * compiling, computing dependencies, generating documentation and
290 287 * linking. *)
291 288 List.iter
292 289 begin fun pkg ->
293   - let base_args = [A"-package"; A pkg] in
294   - let syn_args = [A"-syntax"; A "camlp4o"] in
295   - let args =
296   - (* heuristic to identify syntax extensions:
297   - whether they end in ".syntax"; some might not *)
298   - if Filename.check_suffix pkg "syntax"
299   - then syn_args @ base_args
300   - else base_args
301   - in
302   - flag ["ocaml"; "compile"; "pkg_"^pkg] & S args;
303   - flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
304   - flag ["ocaml"; "doc"; "pkg_"^pkg] & S args;
305   - flag ["ocaml"; "link"; "pkg_"^pkg] & S base_args;
306   - flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
  290 + flag ["ocaml"; "compile"; "pkg_"^pkg] & S[A"-package"; A pkg];
  291 + flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S[A"-package"; A pkg];
  292 + flag ["ocaml"; "doc"; "pkg_"^pkg] & S[A"-package"; A pkg];
  293 + flag ["ocaml"; "link"; "pkg_"^pkg] & S[A"-package"; A pkg];
  294 + flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S[A"-package"; A pkg];
307 295 end
308 296 (find_packages ());
309 297
@@ -335,7 +323,7 @@ module MyOCamlbuildFindlib = struct
335 323 end
336 324
337 325 module MyOCamlbuildBase = struct
338   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
  326 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
339 327
340 328 (** Base functions for writing myocamlbuild.ml
341 329 @author Sylvain Le Gall
@@ -351,7 +339,7 @@ module MyOCamlbuildBase = struct
351 339 type name = string
352 340 type tag = string
353 341
354   -(* # 56 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
  342 +(* # 56 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
355 343
356 344 type t =
357 345 {
@@ -464,24 +452,6 @@ module MyOCamlbuildBase = struct
464 452 )
465 453 t.lib_c;
466 454
467   - (* Add output_obj rules mapped to .nobj.o *)
468   - let native_output_obj x =
469   - OC.link_gen "cmx" "cmxa" !Options.ext_lib [!Options.ext_obj; "cmi"]
470   - OC.ocamlopt_link_prog
471   - (fun tags -> tags++"ocaml"++"link"++"native"++"output_obj") x
472   - in
473   - rule "ocaml: cmx* and o* -> .nobj.o" ~prod:"%.nobj.o" ~deps:["%.cmx"; "%.o"]
474   - (native_output_obj "%.cmx" "%.nobj.o");
475   -
476   - (* Add output_obj rules mapped to .bobj.o *)
477   - let bytecode_output_obj x =
478   - OC.link_gen "cmo" "cma" !Options.ext_lib [!Options.ext_obj; "cmi"]
479   - OC.ocamlc_link_prog
480   - (fun tags -> tags++"ocaml"++"link"++"byte"++"output_obj") x
481   - in
482   - rule "ocaml: cmo* -> .nobj.o" ~prod:"%.bobj.o" ~deps:["%.cmo"]
483   - (bytecode_output_obj "%.cmo" "%.bobj.o");
484   -
485 455 (* Add flags *)
486 456 List.iter
487 457 (fun (tags, cond_specs) ->
@@ -503,7 +473,7 @@ module MyOCamlbuildBase = struct
503 473 end
504 474
505 475
506   -# 506 "myocamlbuild.ml"
  476 +# 476 "myocamlbuild.ml"
507 477 open Ocamlbuild_plugin;;
508 478 let package_default =
509 479 {
@@ -538,6 +508,6 @@ let package_default =
538 508
539 509 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
540 510
541   -# 542 "myocamlbuild.ml"
  511 +# 512 "myocamlbuild.ml"
542 512 (* OASIS_STOP *)
543 513 Ocamlbuild_plugin.dispatch dispatch_default;;
457 setup.ml
... ... @@ -1,14 +1,14 @@
1 1 (* setup.ml generated for the first time by OASIS v0.3.0 *)
2 2
3 3 (* OASIS_START *)
4   -(* DO NOT EDIT (digest: 75901346795ad5335019b0bc3c27080b) *)
  4 +(* DO NOT EDIT (digest: c48a3b4c78c0d8c9884b43ba6e27c5b8) *)
5 5 (*
6   - Regenerated by OASIS v0.3.1
  6 + Regenerated by OASIS v0.3.0
7 7 Visit http://oasis.forge.ocamlcore.org for more information and
8 8 documentation about functions used in this file.
9 9 *)
10 10 module OASISGettext = struct
11   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISGettext.ml" *)
  11 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISGettext.ml" *)
12 12
13 13 let ns_ str =
14 14 str
@@ -31,7 +31,7 @@ module OASISGettext = struct
31 31 end
32 32
33 33 module OASISContext = struct
34   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISContext.ml" *)
  34 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISContext.ml" *)
35 35
36 36 open OASISGettext
37 37
@@ -92,7 +92,7 @@ module OASISContext = struct
92 92 end
93 93
94 94 module OASISString = struct
95   -(* # 1 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISString.ml" *)
  95 +(* # 1 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISString.ml" *)
96 96
97 97
98 98
@@ -217,7 +217,7 @@ module OASISString = struct
217 217 end
218 218
219 219 module OASISUtils = struct
220   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISUtils.ml" *)
  220 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISUtils.ml" *)
221 221
222 222 open OASISGettext
223 223
@@ -312,7 +312,7 @@ module OASISUtils = struct
312 312 end
313 313
314 314 module PropList = struct
315   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/PropList.ml" *)
  315 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml" *)
316 316
317 317 open OASISGettext
318 318
@@ -352,7 +352,7 @@ module PropList = struct
352 352 let clear t =
353 353 Hashtbl.clear t
354 354
355   -(* # 71 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/PropList.ml" *)
  355 +(* # 71 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/PropList.ml" *)
356 356 end
357 357
358 358 module Schema =
@@ -593,7 +593,7 @@ module PropList = struct
593 593 end
594 594
595 595 module OASISMessage = struct
596   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISMessage.ml" *)
  596 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISMessage.ml" *)
597 597
598 598
599 599 open OASISGettext
@@ -632,7 +632,7 @@ module OASISMessage = struct
632 632 end
633 633
634 634 module OASISVersion = struct
635   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISVersion.ml" *)
  635 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISVersion.ml" *)
636 636
637 637 open OASISGettext
638 638
@@ -811,7 +811,7 @@ module OASISVersion = struct
811 811 end
812 812
813 813 module OASISLicense = struct
814   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISLicense.ml" *)
  814 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISLicense.ml" *)
815 815
816 816 (** License for _oasis fields
817 817 @author Sylvain Le Gall
@@ -851,7 +851,7 @@ module OASISLicense = struct
851 851 end
852 852
853 853 module OASISExpr = struct
854   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExpr.ml" *)
  854 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExpr.ml" *)
855 855
856 856
857 857
@@ -941,7 +941,7 @@ module OASISExpr = struct
941 941 end
942 942
943 943 module OASISTypes = struct
944   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTypes.ml" *)
  944 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml" *)
945 945
946 946
947 947
@@ -964,8 +964,6 @@ module OASISTypes = struct
964 964 type compiled_object =
965 965 | Byte
966 966 | Native
967   - | Native_object
968   - | Bytecode_object
969 967 | Best
970 968
971 969
@@ -1020,7 +1018,7 @@ module OASISTypes = struct
1020 1018
1021 1019 type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
1022 1020
1023   -(* # 104 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTypes.ml" *)
  1021 +(* # 102 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISTypes.ml" *)
1024 1022
1025 1023 type 'a conditional = 'a OASISExpr.choices
1026 1024
@@ -1068,13 +1066,6 @@ module OASISTypes = struct
1068 1066 lib_findlib_containers: findlib_name list;
1069 1067 }
1070 1068
1071   -
1072   - type object_ =
1073   - {
1074   - obj_modules: string list;
1075   - obj_findlib_fullname: findlib_name list option;
1076   - }
1077   -
1078 1069 type executable =
1079 1070 {
1080 1071 exec_custom: bool;
@@ -1135,7 +1126,6 @@ module OASISTypes = struct
1135 1126
1136 1127 type section =
1137 1128 | Library of common_section * build_section * library
1138   - | Object of common_section * build_section * object_
1139 1129 | Executable of common_section * build_section * executable
1140 1130 | Flag of common_section * flag
1141 1131 | SrcRepo of common_section * source_repository
@@ -1144,7 +1134,7 @@ module OASISTypes = struct
1144 1134
1145 1135
1146 1136 type section_kind =
1147   - [ `Library | `Object | `Executable | `Flag | `SrcRepo | `Test | `Doc ]
  1137 + [ `Library | `Executable | `Flag | `SrcRepo | `Test | `Doc ]
1148 1138
1149 1139 type package =
1150 1140 {
@@ -1186,7 +1176,7 @@ module OASISTypes = struct
1186 1176 end
1187 1177
1188 1178 module OASISUnixPath = struct
1189   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISUnixPath.ml" *)
  1179 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISUnixPath.ml" *)
1190 1180
1191 1181 type unix_filename = string
1192 1182 type unix_dirname = string
@@ -1270,7 +1260,7 @@ module OASISUnixPath = struct
1270 1260 end
1271 1261
1272 1262 module OASISHostPath = struct
1273   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISHostPath.ml" *)
  1263 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISHostPath.ml" *)
1274 1264
1275 1265
1276 1266 open Filename
@@ -1303,7 +1293,7 @@ module OASISHostPath = struct
1303 1293 end
1304 1294
1305 1295 module OASISSection = struct
1306   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISSection.ml" *)
  1296 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISSection.ml" *)
1307 1297
1308 1298 open OASISTypes
1309 1299
@@ -1311,8 +1301,6 @@ module OASISSection = struct
1311 1301 function
1312 1302 | Library (cs, _, _) ->
1313 1303 `Library, cs
1314   - | Object (cs, _, _) ->
1315   - `Object, cs
1316 1304 | Executable (cs, _, _) ->
1317 1305 `Executable, cs
1318 1306 | Flag (cs, _) ->
@@ -1330,7 +1318,6 @@ module OASISSection = struct
1330 1318 let section_common_set cs =
1331 1319 function
1332 1320 | Library (_, bs, lib) -> Library (cs, bs, lib)
1333   - | Object (_, bs, obj) -> Object (cs, bs, obj)
1334 1321 | Executable (_, bs, exec) -> Executable (cs, bs, exec)
1335 1322 | Flag (_, flg) -> Flag (cs, flg)
1336 1323 | SrcRepo (_, src_repo) -> SrcRepo (cs, src_repo)
@@ -1351,7 +1338,6 @@ module OASISSection = struct
1351 1338 in
1352 1339 (match k with
1353 1340 | `Library -> "library"
1354   - | `Object -> "object"
1355 1341 | `Executable -> "executable"
1356 1342 | `Flag -> "flag"
1357 1343 | `SrcRepo -> "src repository"
@@ -1386,12 +1372,12 @@ module OASISSection = struct
1386 1372 end
1387 1373
1388 1374 module OASISBuildSection = struct
1389   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISBuildSection.ml" *)
  1375 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISBuildSection.ml" *)
1390 1376
1391 1377 end
1392 1378
1393 1379 module OASISExecutable = struct
1394   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExecutable.ml" *)
  1380 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExecutable.ml" *)
1395 1381
1396 1382 open OASISTypes
1397 1383
@@ -1404,8 +1390,6 @@ module OASISExecutable = struct
1404 1390 let is_native_exec =
1405 1391 match bs.bs_compiled_object with
1406 1392 | Native -> true
1407   - | Native_object -> false
1408   - | Bytecode_object -> false
1409 1393 | Best -> is_native ()
1410 1394 | Byte -> false
1411 1395 in
@@ -1424,15 +1408,30 @@ module OASISExecutable = struct
1424 1408 end
1425 1409
1426 1410 module OASISLibrary = struct
1427   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISLibrary.ml" *)
  1411 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISLibrary.ml" *)
1428 1412
1429 1413 open OASISTypes
1430 1414 open OASISUtils
1431 1415 open OASISGettext
1432 1416 open OASISSection
1433 1417
  1418 + type library_name = name
  1419 + type findlib_part_name = name
  1420 + type 'a map_of_findlib_part_name = 'a OASISUtils.MapString.t
  1421 +
  1422 + exception InternalLibraryNotFound of library_name
  1423 + exception FindlibPackageNotFound of findlib_name
  1424 +
  1425 + type group_t =
  1426 + | Container of findlib_name * group_t list
  1427 + | Package of (findlib_name *
  1428 + common_section *
  1429 + build_section *
  1430 + library *
  1431 + group_t list)
  1432 +
1434 1433 (* Look for a module file, considering capitalization or not. *)
1435   - let find_module source_file_exists bs modul =
  1434 + let find_module source_file_exists (cs, bs, lib) modul =
1436 1435 let possible_base_fn =
1437 1436 List.map
1438 1437 (OASISUnixPath.concat bs.bs_path)
@@ -1473,7 +1472,7 @@ module OASISLibrary = struct
1473 1472 let source_unix_files ~ctxt (cs, bs, lib) source_file_exists =
1474 1473 List.fold_left
1475 1474 (fun acc modul ->
1476   - match find_module source_file_exists bs modul with
  1475 + match find_module source_file_exists (cs, bs, lib) modul with
1477 1476 | `Sources (base_fn, lst) ->
1478 1477 (base_fn, lst) :: acc
1479 1478 | `No_sources _ ->
@@ -1497,7 +1496,7 @@ module OASISLibrary = struct
1497 1496
1498 1497 let find_modules lst ext =
1499 1498 let find_module modul =
1500   - match find_module source_file_exists bs modul with
  1499 + match find_module source_file_exists (cs, bs, lib) modul with
1501 1500 | `Sources (base_fn, _) ->
1502 1501 [base_fn]
1503 1502 | `No_sources lst ->
@@ -1532,8 +1531,6 @@ module OASISLibrary = struct
1532 1531 (not lib.lib_pack) && (* Do not install .cmx packed submodules *)
1533 1532 match bs.bs_compiled_object with
1534 1533 | Native -> true
1535   - | Native_object -> false
1536   - | Bytecode_object -> false
1537 1534 | Best -> is_native
1538 1535 | Byte -> false
1539 1536 in
@@ -1571,11 +1568,11 @@ module OASISLibrary = struct
1571 1568 [cs.cs_name^".cmxa"] :: [cs.cs_name^ext_lib] :: acc
1572 1569 in
1573 1570 match bs.bs_compiled_object with
1574   - | Native | Native_object ->
  1571 + | Native ->
1575 1572 byte (native acc_nopath)
1576 1573 | Best when is_native ->
1577 1574 byte (native acc_nopath)
1578   - | Byte | Bytecode_object | Best ->
  1575 + | Byte | Best ->
1579 1576 byte acc_nopath
1580 1577 in
1581 1578
@@ -1601,100 +1598,7 @@ module OASISLibrary = struct
1601 1598 acc_nopath)
1602 1599 (headers @ cmxs)
1603 1600
1604   -end
1605   -
1606   -module OASISObject = struct
1607   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISObject.ml" *)
1608   -
1609   - open OASISTypes
1610   - open OASISGettext
1611   -
1612   - let source_unix_files ~ctxt (cs, bs, obj) source_file_exists =
1613   - List.fold_left
1614   - (fun acc modul ->
1615   - match OASISLibrary.find_module source_file_exists bs modul with
1616   - | `Sources (base_fn, lst) ->
1617   - (base_fn, lst) :: acc
1618   - | `No_sources _ ->
1619   - OASISMessage.warning
1620   - ~ctxt
1621   - (f_ "Cannot find source file matching \
1622   - module '%s' in object %s")
1623   - modul cs.cs_name;
1624   - acc)
1625   - []
1626   - obj.obj_modules
1627   -
1628   -
1629   - let generated_unix_files
1630   - ~ctxt
1631   - ~is_native
1632   - ~source_file_exists
1633   - (cs, bs, obj) =
1634   -
1635   - let find_module ext modul =
1636   - match OASISLibrary.find_module source_file_exists bs modul with
1637   - | `Sources (base_fn, _) -> [base_fn ^ ext]
1638   - | `No_sources lst ->
1639   - OASISMessage.warning
1640   - ~ctxt
1641   - (f_ "Cannot find source file matching \
1642   - module '%s' in object %s")
1643   - modul cs.cs_name ;
1644   - lst
1645   - in
1646   -
1647   - let header, byte, native, c_object, f =
1648   - match obj.obj_modules with
1649   - | [ m ] -> (find_module ".cmi" m,
1650   - find_module ".cmo" m,
1651   - find_module ".cmx" m,
1652   - find_module ".o" m,
1653   - fun x -> x)
1654   - | _ -> ([cs.cs_name ^ ".cmi"],
1655   - [cs.cs_name ^ ".cmo"],
1656   - [cs.cs_name ^ ".cmx"],
1657   - [cs.cs_name ^ ".o"],
1658   - OASISUnixPath.concat bs.bs_path)
1659   - in
1660   - List.map (List.map f) (
1661   - match bs.bs_compiled_object with
1662   - | Native | Native_object ->
1663   - native :: c_object :: byte :: header :: []
1664   - | Best when is_native ->
1665   - native :: c_object :: byte :: header :: []
1666   - | Byte | Bytecode_object | Best ->
1667   - byte :: header :: [])
1668   -
1669   -end
1670   -
1671   -module OASISFindlib = struct
1672   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFindlib.ml" *)
1673   -
1674   -
1675   - open OASISTypes
1676   - open OASISUtils
1677   - open OASISGettext
1678   - open OASISSection
1679   -
1680   - type library_name = name
1681   - type findlib_part_name = name
1682   - type 'a map_of_findlib_part_name = 'a OASISUtils.MapString.t
1683   -
1684   - exception InternalLibraryNotFound of library_name
1685   - exception FindlibPackageNotFound of findlib_name
1686   -
1687   - type group_t =
1688   - | Container of findlib_name * group_t list
1689   - | Package of (findlib_name *
1690   - common_section *
1691   - build_section *
1692   - [`Library of library | `Object of object_] *
1693   - group_t list)
1694   -
1695   - type data = common_section *
1696   - build_section *
1697   - [`Library of library | `Object of object_]
  1601 + type data = common_section * build_section * library
1698 1602 type tree =
1699 1603 | Node of (data option) * (tree MapString.t)
1700 1604 | Leaf of data
@@ -1737,23 +1641,6 @@ module OASISFindlib = struct
1737 1641 mp
1738 1642 end
1739 1643
1740   - | Object (cs, _, obj) ->
1741   - begin
1742   - let obj_name = cs.cs_name in
1743   - if MapString.mem obj_name mp then
1744   - failwithf
1745   - (f_ "The object name '%s' is used more than once.")
1746   - obj_name;
1747   - let findlib_full_name = match obj.obj_findlib_fullname with
1748   - | Some ns -> String.concat "." ns
1749   - | None -> obj_name
1750   - in
1751   - MapString.add
1752   - obj_name
1753   - (`Solved findlib_full_name)
1754   - mp
1755   - end
1756   -
1757 1644 | Executable _ | Test _ | Flag _ | SrcRepo _ | Doc _ ->
1758 1645 mp)
1759 1646 MapString.empty
@@ -1891,9 +1778,7 @@ module OASISFindlib = struct
1891 1778 (fun mp ->
1892 1779 function
1893 1780 | Library (cs, bs, lib) ->
1894   - add (cs, bs, `Library lib) mp
1895   - | Object (cs, bs, obj) ->
1896   - add (cs, bs, `Object obj) mp
  1781 + add (cs, bs, lib) mp
1897 1782 | _ ->
1898 1783 mp)
1899 1784 MapString.empty
@@ -1956,32 +1841,32 @@ module OASISFindlib = struct
1956 1841 end
1957 1842
1958 1843 module OASISFlag = struct
1959   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFlag.ml" *)
  1844 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISFlag.ml" *)
1960 1845
1961 1846 end
1962 1847
1963 1848 module OASISPackage = struct
1964   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISPackage.ml" *)
  1849 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISPackage.ml" *)
1965 1850
1966 1851 end
1967 1852
1968 1853 module OASISSourceRepository = struct
1969   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISSourceRepository.ml" *)
  1854 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISSourceRepository.ml" *)
1970 1855
1971 1856 end
1972 1857
1973 1858 module OASISTest = struct
1974   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISTest.ml" *)
  1859 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISTest.ml" *)
1975 1860
1976 1861 end
1977 1862
1978 1863 module OASISDocument = struct
1979   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISDocument.ml" *)
  1864 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISDocument.ml" *)
1980 1865
1981 1866 end
1982 1867
1983 1868 module OASISExec = struct
1984   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISExec.ml" *)
  1869 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISExec.ml" *)
1985 1870
1986 1871 open OASISGettext
1987 1872 open OASISUtils
@@ -2059,7 +1944,7 @@ module OASISExec = struct
2059 1944 end
2060 1945
2061 1946 module OASISFileUtil = struct
2062   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/oasis/OASISFileUtil.ml" *)
  1947 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/oasis/OASISFileUtil.ml" *)
2063 1948
2064 1949 open OASISGettext
2065 1950
@@ -2254,9 +2139,9 @@ module OASISFileUtil = struct
2254 2139 end
2255 2140
2256 2141
2257   -# 2257 "setup.ml"
  2142 +# 2142 "setup.ml"
2258 2143 module BaseEnvLight = struct
2259   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnvLight.ml" *)
  2144 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseEnvLight.ml" *)
2260 2145
2261 2146 module MapString = Map.Make(String)
2262 2147
@@ -2352,9 +2237,9 @@ module BaseEnvLight = struct
2352 2237 end
2353 2238
2354 2239
2355   -# 2355 "setup.ml"
  2240 +# 2240 "setup.ml"
2356 2241 module BaseContext = struct
2357   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseContext.ml" *)
  2242 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseContext.ml" *)
2358 2243
2359 2244 open OASISContext
2360 2245
@@ -2365,7 +2250,7 @@ module BaseContext = struct
2365 2250 end
2366 2251
2367 2252 module BaseMessage = struct
2368   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseMessage.ml" *)
  2253 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseMessage.ml" *)
2369 2254
2370 2255 (** Message to user, overrid for Base
2371 2256 @author Sylvain Le Gall
@@ -2384,7 +2269,7 @@ module BaseMessage = struct
2384 2269 end
2385 2270
2386 2271 module BaseEnv = struct
2387   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseEnv.ml" *)
  2272 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseEnv.ml" *)
2388 2273
2389 2274 open OASISGettext
2390 2275 open OASISUtils
@@ -2844,7 +2729,7 @@ module BaseEnv = struct
2844 2729 end
2845 2730
2846 2731 module BaseArgExt = struct
2847   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseArgExt.ml" *)
  2732 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseArgExt.ml" *)
2848 2733
2849 2734 open OASISUtils
2850 2735 open OASISGettext
@@ -2872,7 +2757,7 @@ module BaseArgExt = struct
2872 2757 end
2873 2758
2874 2759 module BaseCheck = struct
2875   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseCheck.ml" *)
  2760 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseCheck.ml" *)
2876 2761
2877 2762 open BaseEnv
2878 2763 open BaseMessage
@@ -2998,7 +2883,7 @@ module BaseCheck = struct
2998 2883 end
2999 2884
3000 2885 module BaseOCamlcConfig = struct
3001   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseOCamlcConfig.ml" *)
  2886 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseOCamlcConfig.ml" *)
3002 2887
3003 2888
3004 2889 open BaseEnv
@@ -3114,7 +2999,7 @@ module BaseOCamlcConfig = struct
3114 2999 end
3115 3000
3116 3001 module BaseStandardVar = struct
3117   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseStandardVar.ml" *)
  3002 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseStandardVar.ml" *)
3118 3003
3119 3004
3120 3005 open OASISGettext
@@ -3478,7 +3363,7 @@ module BaseStandardVar = struct
3478 3363 end
3479 3364
3480 3365 module BaseFileAB = struct
3481   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseFileAB.ml" *)
  3366 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseFileAB.ml" *)
3482 3367
3483 3368 open BaseEnv
3484 3369 open OASISGettext
@@ -3526,7 +3411,7 @@ module BaseFileAB = struct
3526 3411 end
3527 3412
3528 3413 module BaseLog = struct
3529   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseLog.ml" *)
  3414 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseLog.ml" *)
3530 3415
3531 3416 open OASISUtils
3532 3417
@@ -3645,7 +3530,7 @@ module BaseLog = struct
3645 3530 end
3646 3531
3647 3532 module BaseBuilt = struct
3648   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseBuilt.ml" *)
  3533 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseBuilt.ml" *)
3649 3534
3650 3535 open OASISTypes
3651 3536 open OASISGettext
@@ -3656,7 +3541,6 @@ module BaseBuilt = struct
3656 3541 | BExec (* Executable *)
3657 3542 | BExecLib (* Library coming with executable *)
3658 3543 | BLib (* Library *)
3659   - | BObj (* Library *)
3660 3544 | BDoc (* Document *)
3661 3545
3662 3546 let to_log_event_file t nm =
@@ -3665,7 +3549,6 @@ module BaseBuilt = struct
3665 3549 | BExec -> "exec"
3666 3550 | BExecLib -> "exec_lib"
3667 3551 | BLib -> "lib"
3668   - | BObj -> "obj"
3669 3552 | BDoc -> "doc")^
3670 3553 "_"^nm
3671 3554
@@ -3729,8 +3612,6 @@ module BaseBuilt = struct
3729 3612 (f_ "executable %s")
3730 3613 | BLib ->
3731 3614 (f_ "library %s")
3732   - | BObj ->
3733   - (f_ "object %s")
3734 3615 | BDoc ->
3735 3616 (f_ "documentation %s"))
3736 3617 nm);
@@ -3793,27 +3674,10 @@ module BaseBuilt = struct
3793 3674 in
3794 3675 evs, unix_lst
3795 3676
3796   -
3797   - let of_object ffn (cs, bs, obj) =
3798   - let unix_lst =
3799   - OASISObject.generated_unix_files
3800   - ~ctxt:!BaseContext.default
3801   - ~source_file_exists:(fun fn ->
3802   - OASISFileUtil.file_exists_case (OASISHostPath.of_unix fn))
3803   - ~is_native:(bool_of_string (is_native ()))
3804   - (cs, bs, obj)
3805   - in
3806   - let evs =
3807   - [BObj,
3808   - cs.cs_name,
3809   - List.map (List.map ffn) unix_lst]
3810   - in
3811   - evs, unix_lst
3812   -
3813 3677 end
3814 3678
3815 3679 module BaseCustom = struct
3816   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseCustom.ml" *)
  3680 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseCustom.ml" *)
3817 3681
3818 3682 open BaseEnv
3819 3683 open BaseMessage
@@ -3863,7 +3727,7 @@ module BaseCustom = struct
3863 3727 end
3864 3728
3865 3729 module BaseDynVar = struct
3866   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseDynVar.ml" *)
  3730 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseDynVar.ml" *)
3867 3731
3868 3732
3869 3733 open OASISTypes
@@ -3904,13 +3768,13 @@ module BaseDynVar = struct
3904 3768 (f_ "Executable '%s' not yet built.")
3905 3769 cs.cs_name)))))
3906 3770
3907   - | Library _ | Object _ | Flag _ | Test _ | SrcRepo _ | Doc _ ->
  3771 + | Library _ | Flag _ | Test _ | SrcRepo _ | Doc _ ->
3908 3772 ())
3909 3773 pkg.sections
3910 3774 end
3911 3775
3912 3776 module BaseTest = struct
3913   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseTest.ml" *)
  3777 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseTest.ml" *)
3914 3778
3915 3779 open BaseEnv
3916 3780 open BaseMessage
@@ -4000,7 +3864,7 @@ module BaseTest = struct
4000 3864 end
4001 3865
4002 3866 module BaseDoc = struct
4003   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseDoc.ml" *)
  3867 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseDoc.ml" *)
4004 3868
4005 3869 open BaseEnv
4006 3870 open BaseMessage
@@ -4035,7 +3899,7 @@ module BaseDoc = struct
4035 3899 end
4036 3900
4037 3901 module BaseSetup = struct
4038   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/base/BaseSetup.ml" *)
  3902 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/base/BaseSetup.ml" *)
4039 3903
4040 3904 open BaseEnv
4041 3905 open BaseMessage
@@ -4282,7 +4146,6 @@ module BaseSetup = struct
4282 4146 (f t.package (cs, doc))
4283 4147 args
4284 4148 | Library _
4285   - | Object _
4286 4149 | Executable _
4287 4150 | Flag _
4288 4151 | SrcRepo _ ->
@@ -4614,9 +4477,9 @@ module BaseSetup = struct
4614 4477 end
4615 4478
4616 4479
4617   -# 4617 "setup.ml"
  4480 +# 4480 "setup.ml"
4618 4481 module InternalConfigurePlugin = struct
4619   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/internal/InternalConfigurePlugin.ml" *)
  4482 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalConfigurePlugin.ml" *)
4620 4483
4621 4484 (** Configure using internal scheme
4622 4485 @author Sylvain Le Gall
@@ -4793,20 +4656,6 @@ module InternalConfigurePlugin = struct
4793 4656 | None ->
4794 4657 ()
4795 4658 end;
4796   - (* Make sure the findlib version is fine for the OCaml compiler. *)
4797   - begin
4798   - let ocaml_ge4 =
4799   - OASISVersion.version_compare
4800   - (OASISVersion.version_of_string (BaseStandardVar.ocaml_version()))
4801   - (OASISVersion.version_of_string "4.0.0") >= 0 in
4802   - if ocaml_ge4 then
4803   - let findlib_lt132 =
4804   - OASISVersion.version_compare
4805   - (OASISVersion.version_of_string (BaseStandardVar.findlib_version()))
4806   - (OASISVersion.version_of_string "1.3.2") < 0 in
4807   - if findlib_lt132 then
4808   - add_errors "OCaml >= 4.0.0 requires Findlib version >= 1.3.2"
4809   - end;
4810 4659
4811 4660 (* FlexDLL *)
4812 4661 if BaseStandardVar.os_type () = "Win32" ||
@@ -4872,7 +4721,7 @@ module InternalConfigurePlugin = struct
4872 4721 end
4873 4722
4874 4723 module InternalInstallPlugin = struct
4875   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/internal/InternalInstallPlugin.ml" *)
  4724 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/internal/InternalInstallPlugin.ml" *)
4876 4725
4877 4726 (** Install using internal scheme
4878 4727 @author Sylvain Le Gall
@@ -4882,7 +4731,7 @@ module InternalInstallPlugin = struct
4882 4731 open BaseStandardVar
4883 4732 open BaseMessage
4884 4733 open OASISTypes
4885   - open OASISFindlib
  4734 + open OASISLibrary
4886 4735 open OASISGettext
4887 4736 open OASISUtils
4888 4737
@@ -4892,9 +4741,6 @@ module InternalInstallPlugin = struct
4892 4741 let lib_hook =
4893 4742 ref (fun (cs, bs, lib) -> cs, bs, lib, [])
4894 4743
4895   - let obj_hook =
4896   - ref (fun (cs, bs, obj) -> cs, bs, obj, [])
4897   -
4898 4744 let doc_hook =
4899 4745 ref (fun (cs, doc) -> cs, doc)
4900 4746
@@ -5115,75 +4961,6 @@ module InternalInstallPlugin = struct
5115 4961 begin
5116 4962 (f_data, acc)
5117 4963 end
5118   - and files_of_object (f_data, acc) data_obj =
5119   - let cs, bs, obj, obj_extra =
5120   - !obj_hook data_obj
5121   - in
5122   - if var_choose bs.bs_install &&
5123   - BaseBuilt.is_built BaseBuilt.BObj cs.cs_name then
5124   - begin
5125   - let acc =
5126   - (* Start with acc + obj_extra *)
5127   - List.rev_append obj_extra acc
5128   - in
5129   - let acc =
5130   - (* Add uncompiled header from the source tree *)
5131   - let path =
5132   - OASISHostPath.of_unix bs.bs_path
5133   - in
5134   - List.fold_left
5135   - (fun acc modul ->
5136   - try
5137   - List.find
5138   - OASISFileUtil.file_exists_case
5139   - (List.map
5140   - (Filename.concat path)
5141   - [modul^".mli";
5142   - modul^".ml";
5143   - String.uncapitalize modul^".mli";
5144   - String.capitalize modul^".mli";
5145   - String.uncapitalize modul^".ml";
5146   - String.capitalize modul^".ml"])
5147   - :: acc
5148   - with Not_found ->
5149   - begin
5150   - warning
5151   - (f_ "Cannot find source header for module %s \
5152   - in object %s")
5153   - modul cs.cs_name;
5154   - acc
5155   - end)
5156   - acc
5157   - obj.obj_modules
5158   - in
5159   -
5160   - let acc =
5161   - (* Get generated files *)
5162   - BaseBuilt.fold
5163   - BaseBuilt.BObj
5164   - cs.cs_name
5165   - (fun acc fn -> fn :: acc)
5166   - acc
5167   - in
5168   -
5169   - let f_data () =
5170   - (* Install data associated with the object *)
5171   - install_data
5172   - bs.bs_path
5173   - bs.bs_data_files
5174   - (Filename.concat
5175   - (datarootdir ())
5176   - pkg.name);
5177   - f_data ()
5178   - in
5179   -
5180   - (f_data, acc)
5181   - end
5182   - else
5183   - begin
5184   - (f_data, acc)
5185   - end
5186   -
5187 4964 in
5188 4965
5189 4966 (* Install one group of library *)
@@ -5194,10 +4971,8 @@ module InternalInstallPlugin = struct
5194 4971 match grp with
5195 4972 | Container (_, children) ->
5196 4973 data_and_files, children
5197   - | Package (_, cs, bs, `Library lib, children) ->
  4974 + | Package (_, cs, bs, lib, children) ->
5198 4975 files_of_library data_and_files (cs, bs, lib), children
5199   - | Package (_, cs, bs, `Object obj, children) ->
5200   - files_of_object data_and_files (cs, bs, obj), children
5201 4976 in
5202 4977 List.fold_left
5203 4978 install_group_lib_aux
@@ -5455,9 +5230,9 @@ module InternalInstallPlugin = struct
5455 5230 end
5456 5231
5457 5232
5458   -# 5458 "setup.ml"
  5233 +# 5233 "setup.ml"
5459 5234 module OCamlbuildCommon = struct
5460   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
  5235 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildCommon.ml" *)
5461 5236
5462 5237 (** Functions common to OCamlbuild build and doc plugin
5463 5238 *)
@@ -5559,7 +5334,7 @@ module OCamlbuildCommon = struct
5559 5334 end
5560 5335
5561 5336 module OCamlbuildPlugin = struct
5562   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
  5337 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildPlugin.ml" *)
5563 5338
5564 5339 (** Build using ocamlbuild
5565 5340 @author Sylvain Le Gall
@@ -5590,19 +5365,6 @@ module OCamlbuildPlugin = struct
5590 5365 in_build_dir (OASISHostPath.of_unix fn)
5591 5366 in
5592 5367
5593   - (* Checks if the string [fn] ends with [nd] *)
5594   - let ends_with nd fn =
5595   - let nd_len =
5596   - String.length nd
5597   - in
5598   - (String.length fn >= nd_len)
5599   - &&
5600   - (String.sub
5601   - fn
5602   - (String.length fn - nd_len)
5603   - nd_len) = nd
5604   - in
5605   -
5606 5368 let cond_targets =
5607 5369 List.fold_left
5608 5370 (fun acc ->
@@ -5615,6 +5377,18 @@ module OCamlbuildPlugin = struct
5615 5377 (cs, bs, lib)
5616 5378 in
5617 5379
  5380 + let ends_with nd fn =
  5381 + let nd_len =
  5382 + String.length nd
  5383 + in
  5384 + (String.length fn >= nd_len)
  5385 + &&
  5386 + (String.sub
  5387 + fn
  5388 + (String.length fn - nd_len)
  5389 + nd_len) = nd
  5390 + in
  5391 +
5618 5392 let tgts =
5619 5393 List.flatten
5620 5394 (List.filter
@@ -5639,35 +5413,6 @@ module OCamlbuildPlugin = struct
5639 5413 cs.cs_name
5640 5414 end
5641 5415
5642   - | Object (cs, bs, obj) when var_choose bs.bs_build ->
5643   - begin
5644   - let evs, unix_files =
5645   - BaseBuilt.of_object
5646   - in_build_dir_of_unix
5647   - (cs, bs, obj)
5648   - in
5649   -
5650   - let tgts =
5651   - List.flatten
5652   - (List.filter
5653   - (fun l -> l <> [])
5654   - (List.map
5655   - (List.filter
5656   - (fun fn ->
5657   - ends_with ".cmo" fn
5658   - || ends_with ".cmx" fn))
5659   - unix_files))
5660   - in
5661   -
5662   - match tgts with
5663   - | _ :: _ ->
5664   - (evs, tgts) :: acc
5665   - | [] ->
5666   - failwithf
5667   - (f_ "No possible ocamlbuild targets for object %s")
5668   - cs.cs_name
5669   - end
5670   -
5671 5416 | Executable (cs, bs, exec) when var_choose bs.bs_build ->
5672 5417 begin
5673 5418 let evs, unix_exec_is, unix_dll_opt =
@@ -5699,12 +5444,8 @@ module OCamlbuildPlugin = struct
5699 5444 (* Add executable *)
5700 5445 let acc =
5701 5446 match bs.bs_compiled_object with
5702   - | Native_object ->
5703   - (target ".nobj.o") :: acc
5704   - | Bytecode_object ->
5705   - (target ".bobj.o") :: acc
5706 5447 | Native ->
5707   - (target ".native") :: acc
  5448 + (target ".native") :: acc
5708 5449 | Best when bool_of_string (is_native ()) ->
5709 5450 (target ".native") :: acc
5710 5451 | Byte
@@ -5714,7 +5455,7 @@ module OCamlbuildPlugin = struct
5714 5455 acc
5715 5456 end
5716 5457
5717   - | Library _ | Object _ | Executable _ | Test _
  5458 + | Library _ | Executable _ | Test _
5718 5459 | SrcRepo _ | Flag _ | Doc _ ->
5719 5460 acc)
5720 5461 []
@@ -5766,7 +5507,7 @@ module OCamlbuildPlugin = struct
5766 5507 end
5767 5508
5768 5509 module OCamlbuildDocPlugin = struct
5769   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
  5510 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml" *)
5770 5511
5771 5512 (* Create documentation using ocamlbuild .odocl files
5772 5513 @author Sylvain Le Gall
@@ -5814,9 +5555,9 @@ module OCamlbuildDocPlugin = struct
5814 5555 end
5815 5556
5816 5557
5817   -# 5817 "setup.ml"
  5558 +# 5558 "setup.ml"
5818 5559 module CustomPlugin = struct
5819   -(* # 21 "/home/avsm/.opam/system/build/oasis-mirage.0.3.0a/src/plugins/custom/CustomPlugin.ml" *)
  5560 +(* # 21 "/home/djs/.opam/system/build/oasis.0.3.0/src/plugins/custom/CustomPlugin.ml" *)
5820 5561
5821 5562 (** Generate custom configure/build/doc/test/install system
5822 5563 @author
@@ -5950,7 +5691,7 @@ module CustomPlugin = struct
5950 5691 end
5951 5692
5952 5693
5953   -# 5953 "setup.ml"
  5694 +# 5694 "setup.ml"
5954 5695 open OASISTypes;;
5955 5696
5956 5697 let setup_t =
@@ -6027,7 +5768,7 @@ let setup_t =
6027 5768 ocaml_version = None;
6028 5769 findlib_version = None;
6029 5770 name = "shared-memory-ring";
6030   - version = "0.2.0";
  5771 + version = "0.3.0";
6031 5772 license =
6032 5773 OASISLicense.DEP5License
6033 5774 (OASISLicense.DEP5Unit
@@ -6348,8 +6089,8 @@ let setup_t =
6348 6089 plugin_data = [];
6349 6090 };
6350 6091 oasis_fn = Some "_oasis";
6351   - oasis_version = "0.3.1";
6352   - oasis_digest = Some "tk\158?\157\181M[/\223\252\240X\019\254c";
  6092 + oasis_version = "0.3.0";
  6093 + oasis_digest = Some "\249\173\127Q\182H\1338>\187\155>\156\250\016\158";