[OCaml build system] Inverse the hygiene policy

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7896 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

4 files changed, 13 insertions, 6 deletions

diff --git a/_tags b/_tags
index f4c6d0c40..73e7488a6 100644
--- a/_tags
+++ b/_tags
@@ -1,7 +1,11 @@
 # Ocamlbuild tags file
-true: traverse
 
-"asmrun" or "byterun" or "yacc" or "boot" or "win32caml": not_hygienic
+true: -traverse
+
+# Traverse only these directories
+<{bytecomp,driver,stdlib,tools,asmcomp,camlp4,ocamlbuild,toplevel,ocamldoc,typing,otherlibs,utils,debugger,lex,parsing,byterun}/**>: traverse
+
+"boot" or "byterun": not_hygienic
 
 <**/*.ml*>: warn_Alez
 
diff --git a/boot/myocamlbuild.boot b/boot/myocamlbuild.boot
index d59c189a8..c0e525f0c 100755
--- a/boot/myocamlbuild.boot
+++ b/boot/myocamlbuild.boot
diff --git a/build/distclean.sh b/build/distclean.sh
index 9d1f2b1ee..606ebb5e7 100755
--- a/build/distclean.sh
+++ b/build/distclean.sh
@@ -17,7 +17,8 @@ rm -f driver/main.byte driver/optmain.byte lex/main.byte \
       camlp4/build/terminfo.ml{i,}
 
 # from ocamlbuild bootstrap
-rm -f ocamlbuild/{_build,_log,_start,ocamlbuild.byte.start,boot/ocamlbuild}
+rm -f  ocamlbuild/{_log,ocamlbuild.byte.start,boot/ocamlbuild}
+rm -rf ocamlbuild/{_build,_start}
 
 # from the old build system
 rm -f camlp4/build/camlp4_config.ml camlp4/**/*.cm*
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 32845ecc2..fc892ad4b 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -140,10 +140,12 @@ let ar = A"ar";;
 dispatch begin function
 | Before_hygiene ->
     if partial then
-      List.iter (fun x -> tag_file x ["not_hygienic"])
-        ["asmcomp"; "asmrun"; "boot"; "bytecomp"; "debugger"; "driver";
+      let patt = String.concat ","
+        ["asmcomp"; "bytecomp"; "debugger"; "driver";
          "lex"; "ocamldoc"; "otherlibs"; "parsing"; "stdlib"; "tools";
-         "toplevel"; "typing"; "utils"; "win32caml"]
+         "toplevel"; "typing"; "utils"]
+      in Ocamlbuild_pack.Configuration.parse_string
+           (sprintf "<{%s}/**>: not_hygienic, -traverse" patt)
   
 | After_options ->
     begin