Commits

camlspotter committed eca1fb9 Merge

merge

Comments (0)

Files changed (4)

 PY_PREFIX=/usr
 PY_VERSION=2.7
 CFLAGS+= -fPIC -I $(OCAML_WHERE) $(OPAM_CAMLIDL_INCLUDE) -I $(PY_PREFIX)/include/python$(PY_VERSION)
-OCAMLWARNING_IGNORE += 7 33
-OCAMLWARNING_NON_ERROR += 7 33
+OCAMLWARNING_IGNORE[] += 7 33
+OCAMLWARNING_NON_ERROR[] += 7 33
 
 # I (jfuruse) install camlidl using findlib, but not for the others.
 CAMLIDL_FINDLIB=$(OCAMLFIND_DESTDIR)/camlidl
 BYTE_ENABLED = true
 
 #|The default warning and errors. If you want to use different warning and error switches, use redefine the variable.
-OCAMLFLAGS = -g -w A-4-9 -warn-error A-4-9
+OCAMLFLAGS = -g 
+
+#|Warnings not to be printed separted with space
+OCAMLWARNING_IGNORE[] = 4 9
+
+#|Warnings treated as non errors
+OCAMLWARNING_NON_ERROR[] = 4 9
+
+#|The maximum warning value.
+# This is the maximum warning ID NOT of the current OCaml compiler,
+#                                BUT of the OCaml compiler used by the author.
+OCAMLWARNING_MAX= 39
+
+#|Function to build warning switches
+OCAMLWARNING_MAKE()=
+    return -w A-$(concat -,$(OCAMLWARNING_IGNORE)) -warn-error +1..$(OCAMLWARNING_MAX)-$(concat -, $(OCAMLWARNING_NON_ERROR))
 
 #|OMyMakefile assumes installation with .cmt files
-OCAMLANNOTFLAGS = -bin-annot
+OCAMLANNOTFLAGS = -annot -bin-annot
 
 #|Global variable to be defined as empty
 OCAMLPACKAGEFLAGS=
 
 #|Redefinition of compiler commands
 public.OCamlC() =
-    value $(OCAMLFIND) $(OCAMLC) $(OCAMLANNOTFLAGS) $(OCAMLPACKAGEFLAGS) $(LAZY_OCAMLFINDFLAGS) $(PREFIXED_OCAMLPACKS) $(OCAMLFLAGS)\
-              $(OCAMLCFLAGS) $(OCAMLPPFLAGS) $(PREFIXED_OCAMLINCLUDES)
+    value $(OCAMLFIND) $(OCAMLC) \
+        $(OCAMLANNOTFLAGS) \
+        $(OCAMLPACKAGEFLAGS) \
+        $(LAZY_OCAMLFINDFLAGS) \
+        $(PREFIXED_OCAMLPACKS) \
+        $(OCAMLFLAGS) \
+        $(OCAMLWARNING_MAKE) \
+        $(OCAMLCFLAGS) \
+        $(OCAMLPPFLAGS) \
+        $(PREFIXED_OCAMLINCLUDES)
 # Why we need "public." ?
 
 public.OCamlOpt() =
 OCAMLPACKS[] =
 	camlp4
 
-OCAMLINCLUDES +=
-
 NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
 BYTE_ENABLED = true
 
-OCAMLCFLAGS   += -annot -w Ae-26
-OCAMLOPTFLAGS   += -annot -w Ae-26
-
-OCAMLPACKAGEFLAGS= 
-
 FILES[] =
 	oowrap
 
         | _ -> ty0, fun ty -> ty
       in
 
+(*
       let extract_arg_type = function
         | <:ctyp< [ > $id:clsname$ ] $id:t$ >> -> Some (clsname, t, None)
         | <:ctyp< [ > $id:clsname$ ] $id:t$ $id:container$ >> -> Some (clsname, t, Some container)
         | _ -> None
       in
+*)
 
       let normalize_arg_type ctyp = 
         match extract_class_from_type ctyp with
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.