Version 1.0.0-rc17 has been released. Some changes are:

[bpt/coccinelle.git] / globals / flag.ml

diff --git a/globals/flag.ml b/globals/flag.ml
index e290828..8d71255 100644 (file)
--- a/globals/flag.ml
+++ b/globals/flag.ml
@@ -1,29 +1,7 @@
 (*
- * Copyright 2010, INRIA, University of Copenhagen
- * Julia Lawall, Rene Rydhof Hansen, Gilles Muller, Nicolas Palix
- * Copyright 2005-2009, Ecole des Mines de Nantes, University of Copenhagen
- * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix
- * This file is part of Coccinelle.
- *
- * Coccinelle is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, according to version 2 of the License.
- *
- * Coccinelle is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Coccinelle.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The authors reserve the right to distribute this or future versions of
- * Coccinelle under other licenses.
- *)
-
-
-(*
- * Copyright 2010, INRIA, University of Copenhagen
+ * Copyright 2012, INRIA
+ * Julia Lawall, Gilles Muller
+ * Copyright 2010-2011, INRIA, University of Copenhagen
  * Julia Lawall, Rene Rydhof Hansen, Gilles Muller, Nicolas Palix
  * Copyright 2005-2009, Ecole des Mines de Nantes, University of Copenhagen
  * Yoann Padioleau, Julia Lawall, Rene Rydhof Hansen, Henrik Stuart, Gilles Muller, Nicolas Palix
@@ -46,6 +24,7 @@
  *)
 
 
+# 0 "./flag.ml"
 let sgrep_mode2 = ref false
 
 let show_misc = ref true
@@ -61,10 +40,10 @@ let scanner = ref Grep
 
 let pyoutput = ref "coccilib.output.Console"
 
-let ocamlc = ref "ocamlc"
-let ocamlopt = ref "ocamlopt"
-let ocamldep = ref "ocamldep"
-let ocamlfind = ref "ocamlfind"
+let ocamlc = ref Commands.ocamlc_cmd
+let ocamlopt = ref Commands.ocamlopt_cmd
+let ocamldep = ref Commands.ocamldep_cmd
+let ocamlfind = ref Commands.ocamlfind_cmd
 
 (*"Some" value is the path with respect to which the patch should be created*)
 let patch = ref (None : string option)
@@ -84,3 +63,8 @@ let set_defined_virtual_rules s =
   match Str.split (Str.regexp "=") s with
     [name;vl] -> defined_virtual_env := (name,vl) :: !defined_virtual_env
   | _ -> defined_virtual_rules := s :: !defined_virtual_rules
+
+let c_plus_plus = ref false
+
+(* was in main *)
+let include_headers = ref false