summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>2010-04-20 15:38:58 +0000
committerDamien Doligez <damien.doligez-inria.fr>2010-04-20 15:38:58 +0000
commita274b01b551be65556263ca47670b39cc97f7dc6 (patch)
treeed6bc62d573adad52899565abeb4bb8cf954de4c
parentb6f408ecc693097d15a1c9433c3d329da80d4b6f (diff)
removed -w A everywhere
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10286 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--_tags12
-rw-r--r--myocamlbuild.ml3
-rw-r--r--ocamlbuild/Makefile14
-rw-r--r--ocamlbuild/_tags2
4 files changed, 21 insertions, 10 deletions
diff --git a/_tags b/_tags
index 8e702f5cb..2407f12aa 100644
--- a/_tags
+++ b/_tags
@@ -19,7 +19,7 @@ true: use_stdlib
# The stdlib neither requires the stdlib nor debug information
<stdlib/**>: -use_stdlib, -debug
-<**/*.ml*>: warn_Alerz
+<**/*.ml*>: warn_error_A
"toplevel/topstart.byte": linkall
@@ -28,18 +28,18 @@ true: use_stdlib
<ocamldoc/*.ml*>: include_unix, include_str, include_dynlink
<ocamldoc/odoc.{byte,native}>: use_unix, use_str, use_dynlink
-<camlp4/**/*.ml*>: camlp4boot, -warn_Alerz, warn_Aler
+<camlp4/**/*.ml*>: camlp4boot, warn_Z, warn_error_m
<camlp4/Camlp4_{config,import}.ml*>: -camlp4boot
-"camlp4/Camlp4_import.ml": -warn_Aler
-<camlp4/build/*> or <camlp4/boot/*> or "camlp4/Camlp4/Struct/Lexer.ml": -camlp4boot, -warn_Aler, warn_a
+"camlp4/Camlp4_import.ml": -warn_Z
+<camlp4/build/*> or <camlp4/boot/*> or "camlp4/Camlp4/Struct/Lexer.ml": -camlp4boot, -warn_Z, warn_a
<camlp4/Camlp4Bin.{byte,native}> or <camlp4/{mkcamlp4,boot/camlp4boot}.byte>: use_dynlink
-"camlp4/Camlp4/Printers/OCaml.ml" or "camlp4/Camlp4/Printers/OCamlr.ml": warn_Alerzv
+"camlp4/Camlp4/Printers/OCaml.ml" or "camlp4/Camlp4/Printers/OCamlr.ml": -warn_Z, warn_v
<camlp4/Camlp4Printers/**.ml>: include_unix
"camlp4/Camlp4/Struct/DynLoader.ml" or "camlp4/boot/Camlp4.ml": include_dynlink
<camlp4/Camlp4Top/**>: include_toplevel
<camlp4/camlp4{,boot,o,r,of,rf,oof,orf}.byte>: -debug
-<ocamlbuild/*>: -warn_Alerz, include_unix
+<ocamlbuild/*>: include_unix
<**/pervasives.ml> or <**/pervasives.mli> or <**/camlinternalOO.mli>: nopervasives
<**/camlinternalOO*.cmx>: inline(0)
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 92067c4d6..4a7e74cd4 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -199,9 +199,6 @@ let cold_camlp4boot = "camlp4boot" (* The installed version *);;
flag ["ocaml"; "ocamlyacc"] (A"-v");;
-flag ["ocaml"; "compile"; "warn_Aler"] (S[A"-w";A"Aler"; A"-warn-error";A"Almer"]);;
-flag ["ocaml"; "compile"; "warn_Alerzv"] (S[A"-w";A"Alerzv"; A"-warn-error";A"Almerzv"]);;
-
non_dependency "otherlibs/threads/pervasives.ml" "Unix";;
non_dependency "otherlibs/threads/pervasives.ml" "String";;
diff --git a/ocamlbuild/Makefile b/ocamlbuild/Makefile
index 36bf9ee9f..0f1903369 100644
--- a/ocamlbuild/Makefile
+++ b/ocamlbuild/Makefile
@@ -1,3 +1,17 @@
+#########################################################################
+# #
+# Objective Caml #
+# #
+# Nicolas Pouillard, Berke Durak, projet Gallium, INRIA Rocquencourt #
+# #
+# Copyright 2007 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the Q Public License version 1.0. #
+# #
+#########################################################################
+
+# $Id$
+
.PHONY: all byte native profile debug ppcache doc
ifndef INSTALL_PREFIX
diff --git a/ocamlbuild/_tags b/ocamlbuild/_tags
index 48081d073..617d6a72f 100644
--- a/ocamlbuild/_tags
+++ b/ocamlbuild/_tags
@@ -1,6 +1,6 @@
# OCamlbuild tags file
true: debug
-<*.ml> or <*.mli>: warn_A, warn_error_A, warn_e, annot
+<*.ml> or <*.mli>: warn_L, warn_R, warn_Z, annot
"discard_printf.ml": rectypes
"ocamlbuildlib.cma" or "ocamlbuildlightlib.cma": linkall
<*.byte> or <*.native> or <*.top>: use_unix