From d534d4c50ef855a0763f45fa13ff506fe01589f0 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Mon, 22 Dec 2014 17:32:04 +0100 Subject: [PATCH] only build doc if all the required flags are enabled --- _oasis | 1 + setup.ml | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/_oasis b/_oasis index a48c84d3..05179fee 100644 --- a/_oasis +++ b/_oasis @@ -147,6 +147,7 @@ Document containers Title: Containers docs Type: ocamlbuild (0.3) BuildTools+: ocamldoc + Build$: flag(docs) && flag(advanced) && flag(bigarray) && flag(lwt) && flag(misc) Install: true XOCamlbuildPath: . XOCamlbuildExtraArgs: diff --git a/setup.ml b/setup.ml index 9326135d..5e6daa48 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.4 *) (* OASIS_START *) -(* DO NOT EDIT (digest: e891037c225152a20947db1a246bbac5) *) +(* DO NOT EDIT (digest: 1120337572e20c54a97b25f4177fdbd2) *) (* Regenerated by OASIS v0.4.5 Visit http://oasis.forge.ocamlcore.org for more information and @@ -7492,7 +7492,19 @@ let setup_t = doc_build = [ (OASISExpr.ENot (OASISExpr.EFlag "docs"), false); - (OASISExpr.EFlag "docs", true) + (OASISExpr.EFlag "docs", false); + (OASISExpr.EAnd + (OASISExpr.EFlag "docs", + OASISExpr.EAnd + (OASISExpr.EFlag "docs", + OASISExpr.EAnd + (OASISExpr.EFlag "advanced", + OASISExpr.EAnd + (OASISExpr.EFlag "bigarray", + OASISExpr.EAnd + (OASISExpr.EFlag "lwt", + OASISExpr.EFlag "misc"))))), + true) ]; doc_install = [(OASISExpr.EBool true, true)]; doc_install_dir = "$docdir"; @@ -7906,7 +7918,8 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.5"; - oasis_digest = Some "\1605\244ig\016\132\177^\002\249\198\135@\146\016"; + oasis_digest = + Some "\156\209d\248\134\018\131\144\025\179GO|\004\208\024"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7914,6 +7927,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7918 "setup.ml" +# 7931 "setup.ml" (* OASIS_STOP *) let () = setup ();;