add script to generate jbuilder flags dynamically

src/core/jbuild

@@ -3,8 +3,7 @@
   ((name containers)
    (public_name containers)
    (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always -nolabels -open CCMonomorphic))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -nolabels -open CCMonomorphic))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries (bytes result containers.monomorphic))
   ))

src/data/jbuild

@@ -3,8 +3,7 @@
   ((name containers_data)
    (public_name containers.data)
    (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries (bytes result))
   ))

src/iter/jbuild

@@ -3,8 +3,7 @@
   ((name containers_iter)
    (public_name containers.iter)
    (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries (bytes result))
   ))

src/jbuild

@@ -0,0 +1,10 @@
+
+
+(rule
+  ((targets (flambda.flags))
+   (deps ((file mkflags.ml)))
+   (fallback)
+   (action
+     (run ocaml ./mkflags.ml))
+  ))
+

src/mkflags.ml

@@ -0,0 +1,13 @@
+ let () =
+   let major, minor =
+     Scanf.sscanf Sys.ocaml_version "%u.%u"
+       (fun major minor -> major, minor)
+   in
+   let after_4_3 = (major, minor) >= (4, 3) in
+   let flags_file = open_out "flambda.flags" in
+   if after_4_3 then (
+     output_string flags_file "(-O3 -unbox-closures -unbox-closures-factor 20 -color always)\n";
+   ) else (
+     output_string flags_file "()\n";
+   );
+   close_out flags_file

src/monomorphic/jbuild

@@ -3,8 +3,7 @@
   ((name containers_monomorphic)
    (public_name containers.monomorphic)
    (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries ())
   ))

src/sexp/jbuild

@@ -3,9 +3,8 @@
   ((name containers_sexp)
    (public_name containers.sexp)
    (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries (bytes result))
   ))
 

src/threads/jbuild

@@ -4,9 +4,8 @@
    (public_name containers.thread)
    (wrapped false)
    (optional)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries (containers threads))
   ))
 

src/top/jbuild

@@ -4,9 +4,8 @@
   ((name containers_top)
    (public_name containers.top)
    (wrapped false)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries (compiler-libs.common containers containers.data
                containers.unix containers.sexp containers.iter))
   ))

src/unix/.merlin

@@ -1,5 +1,5 @@
 B ../../_build/default/src/unix
-FLG -w -40 -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always
+FLG -w -40 -w +a-4-42-44-48-50-58-32-60@8 -safe-string
 PKG bytes
 PKG result
 PKG unix

src/unix/jbuild

@@ -4,8 +4,7 @@
    (public_name containers.unix)
    (wrapped false)
    (optional)
-   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string -color always))
+   (flags (:standard -w +a-4-42-44-48-50-58-32-60@8 -safe-string))
-   (ocamlopt_flags (:standard -O3 -color always
+   (ocamlopt_flags (:standard (:include ../flambda.flags)))
-                    -unbox-closures -unbox-closures-factor 20))
    (libraries (bytes result unix))
   ))