Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
51b1252b
Commit
51b1252b
authored
4 years ago
by
François Bobot
Committed by
Andre Maroneze
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix make odoc for > 4.08
Misc is in compiler-libs
parent
6f0c0f10
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+2
-2
2 additions, 2 deletions
Makefile
doc/code/docgen.ml
+8
-8
8 additions, 8 deletions
doc/code/docgen.ml
with
10 additions
and
10 deletions
Makefile
+
2
−
2
View file @
51b1252b
...
...
@@ -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
::
...
...
This diff is collapsed.
Click to expand it.
doc/code/docgen.ml
+
8
−
8
View file @
51b1252b
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment