X-Git-Url: http://git.hcoop.net/bpt/coccinelle.git/blobdiff_plain/755320b0f64ab4fe487507104d2929cfb19dcee1..HEAD:/release.nix

diff --git a/release.nix b/release.nix
index d5ba698..1e39b52 100644
--- a/release.nix
+++ b/release.nix
@@ -248,6 +248,7 @@ let
     { name = "pycaml"; ocamls = ps: [ ps.pycaml ]; flags = [ "--enable-pycaml" ]; }
   ];
 
+  # Tests using several different types of shells.
   shellCfgs = map mkCfgShell [
     { name = "bash"; selShell = pkgs: "${pkgs.bash}/bin/bash"; }
     { name = "dash"; selShell = pkgs: "${pkgs.dash}/bin/dash"; }
@@ -257,11 +258,39 @@ let
     # { name = "tcsh"; selShell = pkgs: "${pkgs.tcsh}/bin/tcsh"; }
   ];
 
+  #
+  # Configurations for the compilation of coccinelle using ocamlbuild.
+  #
+
+  ocamlbuildZeroCfg = mkCfgMinimal {
+    name  = "ocamlbuild-zero";
+    flags = [ "--enable-ocamlbuild" "--enable-release" ];
+  };
+
+  ocamlbuildFullCfg = mkCfgDefault {
+    name  = "ocamlbuild-full";
+    flags = [ "--enable-ocamlbuild" "--enable-release" ];
+  };
+
+  ocamlbuildCfgs = map mkCfgOcaml [
+    { name = "ocamlbuild-400nat"; selOcaml = selOcaml400;
+      flags = [ "--enable-ocamlbuild" "--enable-release=yes" ]; }
+    { name = "ocamlbuild-400byte"; selOcaml = selOcaml400;
+      flags = [ "--enable-ocamlbuild" ]; }
+    { name = "ocamlbuild-312"; selOcaml = selOcaml312;
+      flags = [ "--enable-ocamlbuild" "--enable-release" ]; }
+    { name = "ocamlbuild-311"; selOcaml = selOcaml311;
+      flags = [ "--enable-ocamlbuild" ]; }
+    { name = "ocamlbuild-310"; selOcaml = selOcaml310;
+      flags = [ "--enable-ocamlbuild" "--enable-release" ]; }
+  ] ++ [ ocamlbuildZeroCfg ocamlbuildFullCfg ];
+
   altCfgs =
     [ debugCfg manyOcamlCfg ]
     ++ minimalCfgs
     ++ ocamlCfgs ++ pythonCfgs
-    ++ pkgCfgs ++ shellCfgs;
+    ++ pkgCfgs ++ shellCfgs
+    ++ ocamlbuildCfgs;
 
 
   #
@@ -533,7 +562,7 @@ let
         ocaml findlib menhir
         python pcre patchelf
       ];
-      configureFlagsArray = [ "--enable-release" ];
+      configureFlags = "--enable-release";
 
       buildPhase = ''
         export TARGETDIR="$TMPDIR/dists"