diff options
| author | Nicolas Pouillard <np@nicolaspouillard.fr> | 2007-11-28 16:03:48 +0000 |
|---|---|---|
| committer | Nicolas Pouillard <np@nicolaspouillard.fr> | 2007-11-28 16:03:48 +0000 |
| commit | f835cca505040b1428d043b8df89c28875649e9f (patch) | |
| tree | 61e86b93063607d2ae254c78427dac5f7c515e74 | |
| parent | ae46dfee1cea41c53adbc59d433fc5f047c51c32 (diff) | |
[ocamlbuild] Move tag_any and tag_file to Configuration but still export them in Ocamlbuild_plugin.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8665 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | ocamlbuild/configuration.ml | 6 | ||||
| -rw-r--r-- | ocamlbuild/configuration.mli | 6 | ||||
| -rw-r--r-- | ocamlbuild/ocamlbuild_plugin.ml | 6 | ||||
| -rw-r--r-- | ocamlbuild/signatures.mli | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/ocamlbuild/configuration.ml b/ocamlbuild/configuration.ml index 6f1a7f3a5..33236860e 100644 --- a/ocamlbuild/configuration.ml +++ b/ocamlbuild/configuration.ml @@ -61,3 +61,9 @@ let tags_of_filename x = fst (tags_and_flags_of_filename x) let flags_of_filename x = snd (tags_and_flags_of_filename x) let has_tag tag = Tags.mem tag (tags_of_filename "") + +let tag_file file tags = + if tags <> [] then parse_string (Printf.sprintf "%S: %s" file (String.concat ", " tags));; + +let tag_any tags = + if tags <> [] then parse_string (Printf.sprintf "true: %s" (String.concat ", " tags));; diff --git a/ocamlbuild/configuration.mli b/ocamlbuild/configuration.mli index a8578bf76..cb1b7c985 100644 --- a/ocamlbuild/configuration.mli +++ b/ocamlbuild/configuration.mli @@ -32,3 +32,9 @@ val tags_of_filename : string -> Tags.t val flags_of_filename : string -> Command.spec val has_tag : string -> bool + +(** [tag_file filename tag_list] Tag the given filename with all given tags. *) +val tag_file : Pathname.t -> Tags.elt list -> unit + +(** [tag_any tag_list] Tag anything with all given tags. *) +val tag_any : Tags.elt list -> unit diff --git a/ocamlbuild/ocamlbuild_plugin.ml b/ocamlbuild/ocamlbuild_plugin.ml index 66d5a686c..a3aa3d8ee 100644 --- a/ocamlbuild/ocamlbuild_plugin.ml +++ b/ocamlbuild/ocamlbuild_plugin.ml @@ -43,10 +43,8 @@ let string_list_of_file = Ocamlbuild_pack.Ocaml_utils.string_list_of_file let expand_module = Ocamlbuild_pack.Ocaml_utils.expand_module let tags_of_pathname = Ocamlbuild_pack.Tools.tags_of_pathname let hide_package_contents = Ocamlbuild_pack.Ocaml_compiler.hide_package_contents -let tag_file file tags = - Ocamlbuild_pack.Configuration.parse_string (Printf.sprintf "%S: %s" file (String.concat ", " tags));; -let tag_any tags = - Ocamlbuild_pack.Configuration.parse_string (Printf.sprintf "true: %s" (String.concat ", " tags));; +let tag_file = Ocamlbuild_pack.Configuration.tag_file +let tag_any = Ocamlbuild_pack.Configuration.tag_any type hook = Ocamlbuild_pack.Hooks.message = | Before_hygiene | After_hygiene diff --git a/ocamlbuild/signatures.mli b/ocamlbuild/signatures.mli index a639e8a50..47df94f24 100644 --- a/ocamlbuild/signatures.mli +++ b/ocamlbuild/signatures.mli @@ -538,8 +538,10 @@ module type PLUGIN = sig this package even if it contains that module. *) val hide_package_contents : string -> unit + (** [tag_file filename tag_list] Tag the given filename with all given tags. *) val tag_file : Pathname.t -> Tags.elt list -> unit + (** [tag_any tag_list] Tag anything with all given tags. *) val tag_any : Tags.elt list -> unit val tags_of_pathname : Pathname.t -> Tags.t |