From 51b1252bf4f84c8e57ed4bfe6ca69e2b707a50e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Wed, 24 Jun 2020 16:03:49 +0200
Subject: [PATCH] Fix make odoc for > 4.08
Misc is in compiler-libs
---
Makefile | 4 ++--
doc/code/docgen.ml | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 8bd4ad0cf63..e9664546176 100644
--- a/Makefile
+++ b/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::
diff --git a/doc/code/docgen.ml b/doc/code/docgen.ml
index 914a292268b..6b2ea3937c0 100644
--- a/doc/code/docgen.ml
+++ b/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 ;
--
GitLab