Merge branch 'feature/fix_make_doc' into 'master'

Fix make odoc for > 4.08 and switch to 4.08.1 by default in CI

Closes #804

See merge request frama-c/frama-c!2728

.gitlab-ci.yml

@@ -140,21 +140,16 @@ internal_nightly:
   tags:
    - nix
 
-frama-c-ocaml-4.06:
+frama-c-ocaml-4.09:
   variables:
-    OCAML: "4_06"
+    OCAML: "4_09"
   <<: *frama-c-ocaml
   only:
   - schedules
 
-frama-c-ocaml-4.07:
+frama-c-ocaml-4.10:
   variables:
-    OCAML: "4_07"
-  <<: *frama-c-ocaml
-
-frama-c-ocaml-4.05:
-  variables:
-    OCAML: "4_05"
+    OCAML: "4_10"
   <<: *frama-c-ocaml
 
 

Makefile

@@ -1503,11 +1503,11 @@ endif
 
 $(DOC_DIR)/docgen.cmo: $(DOC_DIR)/docgen.ml
 	$(PRINT_OCAMLC) $@
-	$(OCAMLC) -c -I +ocamldoc -I $(CONFIG_DIR) $(DOC_DIR)/docgen.ml
+	$(OCAMLC) -c -I +ocamldoc -I +compiler-libs -I $(CONFIG_DIR) $(DOC_DIR)/docgen.ml
 
 $(DOC_DIR)/docgen.cmxs: $(DOC_DIR)/docgen.ml
 	$(PRINT_PACKING) $@
-	$(OCAMLOPT) -o $@ -shared -I +ocamldoc -I $(CONFIG_DIR) \
+	$(OCAMLOPT) -o $@ -shared -I +ocamldoc -I +compiler-libs -I $(CONFIG_DIR) \
 	  $(DOC_DIR)/docgen.ml
 
 clean-doc::

doc/code/docgen.ml

@@ -130,11 +130,11 @@ struct
 	  match_s
 	  rel
         in
-        if StringSet.mem match_s known_types_names then
+        if String.Set.mem match_s known_types_names then
 	  "<a href=\"" ^ self#path match_s ^ Naming.complete_target Naming.mark_type
 	    match_s ^"\">" ^ s_final ^ "</a>"
         else
-	  if StringSet.mem match_s known_classes_names then
+	  if String.Set.mem match_s known_classes_names then
             let (html_file, _) = Naming.html_files match_s in
             "<a href=\""^ self#path html_file ^ html_file^"\">"^s_final^"</a>"
 	  else
@@ -158,7 +158,7 @@ struct
 	  match_s
 	  rel
         in
-        if StringSet.mem match_s known_modules_names then
+        if String.Set.mem match_s known_modules_names then
 	  let (html_file, _) = Naming.html_files match_s in
 	  "<a href=\"" ^ self#path match_s ^ html_file^"\">"^s_final^"</a>"
         else
@@ -287,7 +287,7 @@ struct
       let types = Odoc_info.Search.types module_list in
       known_types_names <-
         List.fold_left
-        (fun acc t -> StringSet.add t.Odoc_type.ty_name acc)
+        (fun acc t -> String.Set.add t.Odoc_type.ty_name acc)
         known_types_names
         types ;
 
@@ -296,12 +296,12 @@ struct
       let class_types = Odoc_info.Search.class_types module_list in
       known_classes_names <-
         List.fold_left
-        (fun acc c -> StringSet.add c.Odoc_class.cl_name acc)
+        (fun acc c -> String.Set.add c.Odoc_class.cl_name acc)
         known_classes_names
         classes ;
       known_classes_names <-
         List.fold_left
-        (fun acc ct -> StringSet.add ct.Odoc_class.clt_name acc)
+        (fun acc ct -> String.Set.add ct.Odoc_class.clt_name acc)
         known_classes_names
         class_types ;
 
@@ -310,12 +310,12 @@ struct
       let modules = Odoc_info.Search.modules module_list in
       known_modules_names <-
         List.fold_left
-        (fun acc m -> StringSet.add m.m_name acc)
+        (fun acc m -> String.Set.add m.m_name acc)
         known_modules_names
         modules ;
       known_modules_names <-
         List.fold_left
-        (fun acc mt -> StringSet.add mt.mt_name acc)
+        (fun acc mt -> String.Set.add mt.mt_name acc)
         known_modules_names
         module_types ;
 

nix/default.nix

 # paramaterised derivation with dependencies injected (callPackage style)
-{ pkgs, stdenv, src ? ../., opam2nix, ocaml_version ? "ocaml-ng.ocamlPackages_4_05.ocaml", plugins ? { } }:
+{ pkgs, stdenv, src ? ../., opam2nix, ocaml_version ? "ocaml-ng.ocamlPackages_4_08.ocaml", plugins ? { } }:
 
 let mk_buildInputs = { opamPackages ? [], nixPackages ? [] } :
     [ pkgs.gnugrep pkgs.gnused  pkgs.autoconf pkgs.gnumake pkgs.gcc pkgs.ncurses pkgs.time pkgs.python3 pkgs.perl pkgs.file pkgs.which pkgs.dos2unix] ++ nixPackages ++ opam2nix.build {