Permalink
Browse files

fix the OASIS subpackages

There are now separate ones for each regexp-style
  • Loading branch information...
1 parent b8e484a commit 191229137d8268e1847e13fbf3bd6522ab062a21 @avsm avsm committed Jan 11, 2012
Showing with 285 additions and 28 deletions.
  1. +43 −1 _oasis
  2. +9 −2 _tags
  3. +45 −1 lib/META
  4. +1 −6 lib/re.mllib
  5. +4 −0 lib/re_emacs.mllib
  6. +4 −0 lib/re_glob.mllib
  7. +4 −0 lib/re_perl.mllib
  8. +4 −0 lib/re_posix.mllib
  9. +4 −0 lib/re_str.mllib
  10. +11 −3 myocamlbuild.ml
  11. +156 −15 setup.ml
View
@@ -9,7 +9,49 @@ BuildTools: ocamlbuild
Library re
Path: lib
- Modules: Re,Cset,Automata,Re_emacs,Re_posix,Re_perl,Re_glob,Re_str
+ InternalModules: Cset, Automata
+ Modules: Re
+ Findlibname: re
+
+Library re_emacs
+ Path: lib
+ XMETADescription: Emacs-compatible regexps
+ Modules: Re_emacs
+ Findlibname: emacs
+ FindlibParent: re
+ BuildDepends: re
+
+Library re_str
+ Path: lib
+ XMETADescription: Str-compatible regexps
+ Modules: Re_str
+ Findlibname: str
+ FindlibParent: re
+ BuildDepends: re,re.emacs
+
+Library re_posix
+ Path: lib
+ Modules: Re_posix
+ XMETADescription: POSIX-compatible regexps
+ Findlibname: posix
+ FindlibParent: re
+ BuildDepends: re
+
+Library re_glob
+ Path: lib
+ Modules: Re_glob
+ XMETADescription: Shell glob regexps
+ Findlibname: glob
+ FindlibParent: re
+ BuildDepends: re
+
+Library re_perl
+ Path: lib
+ Modules: Re_perl
+ XMETADescription: Perl-compatible regexps
+ Findlibname: perl
+ FindlibParent: re
+ BuildDepends: re
Flag tests
Description: Build and run tests
View
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: ae3e45a771ffb399bcf8dff9394bc3ed)
+# DO NOT EDIT (digest: 6fc959993b2d88e502cb62dab425bc82)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -14,9 +14,16 @@
"_darcs": -traverse
"_darcs": not_hygienic
# Library re
-"lib": include
+# Library re_emacs
+# Library re_str
+<lib/*.ml{,i}>: use_re_emacs
# Executable re_match
<lib_test/re_match.{native,byte}>: use_re
<lib_test/*.ml{,i}>: use_re
<lib_test/re_match.{native,byte}>: custom
+# Library re_perl
+# Library re_glob
+# Library re_posix
+"lib": include
+<lib/*.ml{,i}>: use_re
# OASIS_STOP
View
@@ -1,9 +1,53 @@
# OASIS_START
-# DO NOT EDIT (digest: 50f4e2b5330b2d9e94554eba6b37b43c)
+# DO NOT EDIT (digest: 74f55bd06cdf0cbca4ebdc3f647a082b)
version = "0.9-dev"
description = "Pure OCaml regular expression library"
archive(byte) = "re.cma"
archive(native) = "re.cmxa"
exists_if = "re.cma"
+package "posix" (
+ version = "0.9-dev"
+ description = "POSIX-compatible regexps"
+ requires = "re"
+ archive(byte) = "re_posix.cma"
+ archive(native) = "re_posix.cmxa"
+ exists_if = "re_posix.cma"
+)
+
+package "glob" (
+ version = "0.9-dev"
+ description = "Shell glob regexps"
+ requires = "re"
+ archive(byte) = "re_glob.cma"
+ archive(native) = "re_glob.cmxa"
+ exists_if = "re_glob.cma"
+)
+
+package "perl" (
+ version = "0.9-dev"
+ description = "Perl-compatible regexps"
+ requires = "re"
+ archive(byte) = "re_perl.cma"
+ archive(native) = "re_perl.cmxa"
+ exists_if = "re_perl.cma"
+)
+
+package "str" (
+ version = "0.9-dev"
+ description = "Str-compatible regexps"
+ requires = "re re.emacs"
+ archive(byte) = "re_str.cma"
+ archive(native) = "re_str.cmxa"
+ exists_if = "re_str.cma"
+)
+
+package "emacs" (
+ version = "0.9-dev"
+ description = "Emacs-compatible regexps"
+ requires = "re"
+ archive(byte) = "re_emacs.cma"
+ archive(native) = "re_emacs.cmxa"
+ exists_if = "re_emacs.cma"
+)
# OASIS_STOP
View
@@ -1,11 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: cf0653c0003392f5ff2d8315cdefdb3f)
+# DO NOT EDIT (digest: 0a7dd4de0a81b2a07f8b93c4915dfbc9)
Re
Cset
Automata
-Re_emacs
-Re_posix
-Re_perl
-Re_glob
-Re_str
# OASIS_STOP
View
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 05b5d967ad075a747ac1f5fa1aeaf527)
+Re_emacs
+# OASIS_STOP
View
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 1506cb2624d26dc70fd66045bbadec27)
+Re_glob
+# OASIS_STOP
View
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 0da0de88cc2ea375a725bb3124e688dc)
+Re_perl
+# OASIS_STOP
View
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 1f05cbe7ce6cb8123eb3d95f49091839)
+Re_posix
+# OASIS_STOP
View
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: bfe95f96a3ef4749a76fe1bb27311ad7)
+Re_str
+# OASIS_STOP
View
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 8b0cd51d14ff4b0c4c05215e219d0c3d) *)
+(* DO NOT EDIT (digest: 6e98ce2579212be9dc796aee9bbe7a56) *)
module OASISGettext = struct
# 21 "/Users/avsm/src/darcs/oasis/src/oasis/OASISGettext.ml"
@@ -452,14 +452,22 @@ end
open Ocamlbuild_plugin;;
let package_default =
{
- MyOCamlbuildBase.lib_ocaml = [("lib/re", ["lib"])];
+ MyOCamlbuildBase.lib_ocaml =
+ [
+ ("lib/re", ["lib"]);
+ ("lib/re_emacs", ["lib"]);
+ ("lib/re_str", ["lib"]);
+ ("lib/re_perl", ["lib"]);
+ ("lib/re_glob", ["lib"]);
+ ("lib/re_posix", ["lib"])
+ ];
lib_c = [];
flags = [];
}
;;
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
-# 464 "myocamlbuild.ml"
+# 472 "myocamlbuild.ml"
(* OASIS_STOP *)
Ocamlbuild_plugin.dispatch dispatch_default;;
Oops, something went wrong.

0 comments on commit 1912291

Please sign in to comment.