Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix the OASIS subpackages

There are now separate ones for each regexp-style
  • Loading branch information...
commit 191229137d8268e1847e13fbf3bd6522ab062a21 1 parent b8e484a
Anil Madhavapeddy authored January 11, 2012
44  _oasis
@@ -9,7 +9,49 @@ BuildTools: ocamlbuild
9 9
 
10 10
 Library re
11 11
   Path:       lib
12  
-  Modules: Re,Cset,Automata,Re_emacs,Re_posix,Re_perl,Re_glob,Re_str
  12
+  InternalModules: Cset, Automata
  13
+  Modules: Re
  14
+  Findlibname: re
  15
+
  16
+Library re_emacs
  17
+  Path: lib
  18
+  XMETADescription: Emacs-compatible regexps
  19
+  Modules: Re_emacs
  20
+  Findlibname: emacs
  21
+  FindlibParent: re
  22
+  BuildDepends: re
  23
+
  24
+Library re_str
  25
+  Path: lib
  26
+  XMETADescription: Str-compatible regexps
  27
+  Modules: Re_str
  28
+  Findlibname: str
  29
+  FindlibParent: re
  30
+  BuildDepends: re,re.emacs
  31
+
  32
+Library re_posix
  33
+  Path: lib
  34
+  Modules: Re_posix
  35
+  XMETADescription: POSIX-compatible regexps
  36
+  Findlibname: posix
  37
+  FindlibParent: re
  38
+  BuildDepends: re
  39
+
  40
+Library re_glob
  41
+  Path: lib
  42
+  Modules: Re_glob
  43
+  XMETADescription: Shell glob regexps
  44
+  Findlibname: glob
  45
+  FindlibParent: re
  46
+  BuildDepends: re
  47
+
  48
+Library re_perl
  49
+  Path: lib
  50
+  Modules: Re_perl
  51
+  XMETADescription: Perl-compatible regexps
  52
+  Findlibname: perl
  53
+  FindlibParent: re
  54
+  BuildDepends: re
13 55
   
14 56
 Flag tests
15 57
   Description:        Build and run tests
11  _tags
... ...
@@ -1,5 +1,5 @@
1 1
 # OASIS_START
2  
-# DO NOT EDIT (digest: ae3e45a771ffb399bcf8dff9394bc3ed)
  2
+# DO NOT EDIT (digest: 6fc959993b2d88e502cb62dab425bc82)
3 3
 # Ignore VCS directories, you can use the same kind of rule outside 
4 4
 # OASIS_START/STOP if you want to exclude directories that contains 
5 5
 # useless stuff for the build process
@@ -14,9 +14,16 @@
14 14
 "_darcs": -traverse
15 15
 "_darcs": not_hygienic
16 16
 # Library re
17  
-"lib": include
  17
+# Library re_emacs
  18
+# Library re_str
  19
+<lib/*.ml{,i}>: use_re_emacs
18 20
 # Executable re_match
19 21
 <lib_test/re_match.{native,byte}>: use_re
20 22
 <lib_test/*.ml{,i}>: use_re
21 23
 <lib_test/re_match.{native,byte}>: custom
  24
+# Library re_perl
  25
+# Library re_glob
  26
+# Library re_posix
  27
+"lib": include
  28
+<lib/*.ml{,i}>: use_re
22 29
 # OASIS_STOP
46  lib/META
... ...
@@ -1,9 +1,53 @@
1 1
 # OASIS_START
2  
-# DO NOT EDIT (digest: 50f4e2b5330b2d9e94554eba6b37b43c)
  2
+# DO NOT EDIT (digest: 74f55bd06cdf0cbca4ebdc3f647a082b)
3 3
 version = "0.9-dev"
4 4
 description = "Pure OCaml regular expression library"
5 5
 archive(byte) = "re.cma"
6 6
 archive(native) = "re.cmxa"
7 7
 exists_if = "re.cma"
  8
+package "posix" (
  9
+ version = "0.9-dev"
  10
+ description = "POSIX-compatible regexps"
  11
+ requires = "re"
  12
+ archive(byte) = "re_posix.cma"
  13
+ archive(native) = "re_posix.cmxa"
  14
+ exists_if = "re_posix.cma"
  15
+)
  16
+
  17
+package "glob" (
  18
+ version = "0.9-dev"
  19
+ description = "Shell glob regexps"
  20
+ requires = "re"
  21
+ archive(byte) = "re_glob.cma"
  22
+ archive(native) = "re_glob.cmxa"
  23
+ exists_if = "re_glob.cma"
  24
+)
  25
+
  26
+package "perl" (
  27
+ version = "0.9-dev"
  28
+ description = "Perl-compatible regexps"
  29
+ requires = "re"
  30
+ archive(byte) = "re_perl.cma"
  31
+ archive(native) = "re_perl.cmxa"
  32
+ exists_if = "re_perl.cma"
  33
+)
  34
+
  35
+package "str" (
  36
+ version = "0.9-dev"
  37
+ description = "Str-compatible regexps"
  38
+ requires = "re re.emacs"
  39
+ archive(byte) = "re_str.cma"
  40
+ archive(native) = "re_str.cmxa"
  41
+ exists_if = "re_str.cma"
  42
+)
  43
+
  44
+package "emacs" (
  45
+ version = "0.9-dev"
  46
+ description = "Emacs-compatible regexps"
  47
+ requires = "re"
  48
+ archive(byte) = "re_emacs.cma"
  49
+ archive(native) = "re_emacs.cmxa"
  50
+ exists_if = "re_emacs.cma"
  51
+)
8 52
 # OASIS_STOP
9 53
 
7  lib/re.mllib
... ...
@@ -1,11 +1,6 @@
1 1
 # OASIS_START
2  
-# DO NOT EDIT (digest: cf0653c0003392f5ff2d8315cdefdb3f)
  2
+# DO NOT EDIT (digest: 0a7dd4de0a81b2a07f8b93c4915dfbc9)
3 3
 Re
4 4
 Cset
5 5
 Automata
6  
-Re_emacs
7  
-Re_posix
8  
-Re_perl
9  
-Re_glob
10  
-Re_str
11 6
 # OASIS_STOP
4  lib/re_emacs.mllib
... ...
@@ -0,0 +1,4 @@
  1
+# OASIS_START
  2
+# DO NOT EDIT (digest: 05b5d967ad075a747ac1f5fa1aeaf527)
  3
+Re_emacs
  4
+# OASIS_STOP
4  lib/re_glob.mllib
... ...
@@ -0,0 +1,4 @@
  1
+# OASIS_START
  2
+# DO NOT EDIT (digest: 1506cb2624d26dc70fd66045bbadec27)
  3
+Re_glob
  4
+# OASIS_STOP
4  lib/re_perl.mllib
... ...
@@ -0,0 +1,4 @@
  1
+# OASIS_START
  2
+# DO NOT EDIT (digest: 0da0de88cc2ea375a725bb3124e688dc)
  3
+Re_perl
  4
+# OASIS_STOP
4  lib/re_posix.mllib
... ...
@@ -0,0 +1,4 @@
  1
+# OASIS_START
  2
+# DO NOT EDIT (digest: 1f05cbe7ce6cb8123eb3d95f49091839)
  3
+Re_posix
  4
+# OASIS_STOP
4  lib/re_str.mllib
... ...
@@ -0,0 +1,4 @@
  1
+# OASIS_START
  2
+# DO NOT EDIT (digest: bfe95f96a3ef4749a76fe1bb27311ad7)
  3
+Re_str
  4
+# OASIS_STOP
14  myocamlbuild.ml
... ...
@@ -1,5 +1,5 @@
1 1
 (* OASIS_START *)
2  
-(* DO NOT EDIT (digest: 8b0cd51d14ff4b0c4c05215e219d0c3d) *)
  2
+(* DO NOT EDIT (digest: 6e98ce2579212be9dc796aee9bbe7a56) *)
3 3
 module OASISGettext = struct
4 4
 # 21 "/Users/avsm/src/darcs/oasis/src/oasis/OASISGettext.ml"
5 5
   
@@ -452,7 +452,15 @@ end
452 452
 open Ocamlbuild_plugin;;
453 453
 let package_default =
454 454
   {
455  
-     MyOCamlbuildBase.lib_ocaml = [("lib/re", ["lib"])];
  455
+     MyOCamlbuildBase.lib_ocaml =
  456
+       [
  457
+          ("lib/re", ["lib"]);
  458
+          ("lib/re_emacs", ["lib"]);
  459
+          ("lib/re_str", ["lib"]);
  460
+          ("lib/re_perl", ["lib"]);
  461
+          ("lib/re_glob", ["lib"]);
  462
+          ("lib/re_posix", ["lib"])
  463
+       ];
456 464
      lib_c = [];
457 465
      flags = [];
458 466
      }
@@ -460,6 +468,6 @@ let package_default =
460 468
 
461 469
 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
462 470
 
463  
-# 464 "myocamlbuild.ml"
  471
+# 472 "myocamlbuild.ml"
464 472
 (* OASIS_STOP *)
465 473
 Ocamlbuild_plugin.dispatch dispatch_default;;
171  setup.ml
... ...
@@ -1,7 +1,7 @@
1 1
 (* setup.ml generated for the first time by OASIS v0.2.1~alpha1 *)
2 2
 
3 3
 (* OASIS_START *)
4  
-(* DO NOT EDIT (digest: 7157148bd13965b50766f3fb3b9a90f6) *)
  4
+(* DO NOT EDIT (digest: ecfa2148846bd6945a0646bce58b188c) *)
5 5
 (*
6 6
    Regenerated by OASIS v0.2.1~alpha1
7 7
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5243,21 +5243,72 @@ let setup_t =
5243 5243
                       bs_nativeopt = [(OASISExpr.EBool true, [])];
5244 5244
                       },
5245 5245
                    {
5246  
-                      lib_modules =
5247  
-                        [
5248  
-                           "Re";
5249  
-                           "Cset";
5250  
-                           "Automata";
5251  
-                           "Re_emacs";
5252  
-                           "Re_posix";
5253  
-                           "Re_perl";
5254  
-                           "Re_glob";
5255  
-                           "Re_str"
5256  
-                        ];
  5246
+                      lib_modules = ["Re"];
5257 5247
                       lib_pack = false;
5258  
-                      lib_internal_modules = [];
  5248
+                      lib_internal_modules = ["Cset"; "Automata"];
5259 5249
                       lib_findlib_parent = None;
5260  
-                      lib_findlib_name = None;
  5250
+                      lib_findlib_name = Some "re";
  5251
+                      lib_findlib_containers = [];
  5252
+                      });
  5253
+               Library
  5254
+                 ({
  5255
+                     cs_name = "re_emacs";
  5256
+                     cs_data = PropList.Data.create ();
  5257
+                     cs_plugin_data = [];
  5258
+                     },
  5259
+                   {
  5260
+                      bs_build = [(OASISExpr.EBool true, true)];
  5261
+                      bs_install = [(OASISExpr.EBool true, true)];
  5262
+                      bs_path = "lib";
  5263
+                      bs_compiled_object = Best;
  5264
+                      bs_build_depends = [InternalLibrary "re"];
  5265
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
  5266
+                      bs_c_sources = [];
  5267
+                      bs_data_files = [];
  5268
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
  5269
+                      bs_cclib = [(OASISExpr.EBool true, [])];
  5270
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
  5271
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
  5272
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
  5273
+                      bs_nativeopt = [(OASISExpr.EBool true, [])];
  5274
+                      },
  5275
+                   {
  5276
+                      lib_modules = ["Re_emacs"];
  5277
+                      lib_pack = false;
  5278
+                      lib_internal_modules = [];
  5279
+                      lib_findlib_parent = Some "re";
  5280
+                      lib_findlib_name = Some "emacs";
  5281
+                      lib_findlib_containers = [];
  5282
+                      });
  5283
+               Library
  5284
+                 ({
  5285
+                     cs_name = "re_str";
  5286
+                     cs_data = PropList.Data.create ();
  5287
+                     cs_plugin_data = [];
  5288
+                     },
  5289
+                   {
  5290
+                      bs_build = [(OASISExpr.EBool true, true)];
  5291
+                      bs_install = [(OASISExpr.EBool true, true)];
  5292
+                      bs_path = "lib";
  5293
+                      bs_compiled_object = Best;
  5294
+                      bs_build_depends =
  5295
+                        [InternalLibrary "re"; InternalLibrary "re_emacs"];
  5296
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
  5297
+                      bs_c_sources = [];
  5298
+                      bs_data_files = [];
  5299
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
  5300
+                      bs_cclib = [(OASISExpr.EBool true, [])];
  5301
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
  5302
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
  5303
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
  5304
+                      bs_nativeopt = [(OASISExpr.EBool true, [])];
  5305
+                      },
  5306
+                   {
  5307
+                      lib_modules = ["Re_str"];
  5308
+                      lib_pack = false;
  5309
+                      lib_internal_modules = [];
  5310
+                      lib_findlib_parent = Some "re";
  5311
+                      lib_findlib_name = Some "str";
5261 5312
                       lib_findlib_containers = [];
5262 5313
                       });
5263 5314
                Test
@@ -5319,6 +5370,96 @@ let setup_t =
5319 5370
                    {
5320 5371
                       flag_description = Some "Build and run tests";
5321 5372
                       flag_default = [(OASISExpr.EBool true, true)];
  5373
+                      });
  5374
+               Library
  5375
+                 ({
  5376
+                     cs_name = "re_perl";
  5377
+                     cs_data = PropList.Data.create ();
  5378
+                     cs_plugin_data = [];
  5379
+                     },
  5380
+                   {
  5381
+                      bs_build = [(OASISExpr.EBool true, true)];
  5382
+                      bs_install = [(OASISExpr.EBool true, true)];
  5383
+                      bs_path = "lib";
  5384
+                      bs_compiled_object = Best;
  5385
+                      bs_build_depends = [InternalLibrary "re"];
  5386
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
  5387
+                      bs_c_sources = [];
  5388
+                      bs_data_files = [];
  5389
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
  5390
+                      bs_cclib = [(OASISExpr.EBool true, [])];
  5391
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
  5392
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
  5393
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
  5394
+                      bs_nativeopt = [(OASISExpr.EBool true, [])];
  5395
+                      },
  5396
+                   {
  5397
+                      lib_modules = ["Re_perl"];
  5398
+                      lib_pack = false;
  5399
+                      lib_internal_modules = [];
  5400
+                      lib_findlib_parent = Some "re";
  5401
+                      lib_findlib_name = Some "perl";
  5402
+                      lib_findlib_containers = [];
  5403
+                      });
  5404
+               Library
  5405
+                 ({
  5406
+                     cs_name = "re_glob";
  5407
+                     cs_data = PropList.Data.create ();
  5408
+                     cs_plugin_data = [];
  5409
+                     },
  5410
+                   {
  5411
+                      bs_build = [(OASISExpr.EBool true, true)];
  5412
+                      bs_install = [(OASISExpr.EBool true, true)];
  5413
+                      bs_path = "lib";
  5414
+                      bs_compiled_object = Best;
  5415
+                      bs_build_depends = [InternalLibrary "re"];
  5416
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
  5417
+                      bs_c_sources = [];
  5418
+                      bs_data_files = [];
  5419
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
  5420
+                      bs_cclib = [(OASISExpr.EBool true, [])];
  5421
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
  5422
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
  5423
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
  5424
+                      bs_nativeopt = [(OASISExpr.EBool true, [])];
  5425
+                      },
  5426
+                   {
  5427
+                      lib_modules = ["Re_glob"];
  5428
+                      lib_pack = false;
  5429
+                      lib_internal_modules = [];
  5430
+                      lib_findlib_parent = Some "re";
  5431
+                      lib_findlib_name = Some "glob";
  5432
+                      lib_findlib_containers = [];
  5433
+                      });
  5434
+               Library
  5435
+                 ({
  5436
+                     cs_name = "re_posix";
  5437
+                     cs_data = PropList.Data.create ();
  5438
+                     cs_plugin_data = [];
  5439
+                     },
  5440
+                   {
  5441
+                      bs_build = [(OASISExpr.EBool true, true)];
  5442
+                      bs_install = [(OASISExpr.EBool true, true)];
  5443
+                      bs_path = "lib";
  5444
+                      bs_compiled_object = Best;
  5445
+                      bs_build_depends = [InternalLibrary "re"];
  5446
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
  5447
+                      bs_c_sources = [];
  5448
+                      bs_data_files = [];
  5449
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
  5450
+                      bs_cclib = [(OASISExpr.EBool true, [])];
  5451
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
  5452
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
  5453
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
  5454
+                      bs_nativeopt = [(OASISExpr.EBool true, [])];
  5455
+                      },
  5456
+                   {
  5457
+                      lib_modules = ["Re_posix"];
  5458
+                      lib_pack = false;
  5459
+                      lib_internal_modules = [];
  5460
+                      lib_findlib_parent = Some "re";
  5461
+                      lib_findlib_name = Some "posix";
  5462
+                      lib_findlib_containers = [];
5322 5463
                       })
5323 5464
             ];
5324 5465
           plugins = [(`Extra, "META", Some "0.2")];
@@ -5330,6 +5471,6 @@ let setup_t =
5330 5471
 
5331 5472
 let setup () = BaseSetup.setup setup_t;;
5332 5473
 
5333  
-# 5334 "setup.ml"
  5474
+# 5475 "setup.ml"
5334 5475
 (* OASIS_STOP *)
5335 5476
 let () = setup ();;

0 notes on commit 1912291

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