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
e03fc173
Commit
e03fc173
authored
6 years ago
by
Virgile Prevosto
Browse files
Options
Downloads
Patches
Plain Diff
[GUI] Dgraph compatibility: use fake Dgraph module in gtk3 mode
parent
05c9434b
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+3
-0
3 additions, 0 deletions
.gitignore
Makefile
+22
-1
22 additions, 1 deletion
Makefile
src/plugins/gui/dgraph.ml.in
+14
-0
14 additions, 0 deletions
src/plugins/gui/dgraph.ml.in
src/plugins/gui/dgraph.mli.in
+14
-0
14 additions, 0 deletions
src/plugins/gui/dgraph.mli.in
with
53 additions
and
1 deletion
.gitignore
+
3
−
0
View file @
e03fc173
...
...
@@ -198,3 +198,6 @@ hello-*.tar.gz
# should remain empty #
#######################
/src/plugins/gui/GSourceView2.mli
/src/plugins/gui/GSourceView2.ml
/src/plugins/gui/dgraph.ml
/src/plugins/gui/dgraph.mli
This diff is collapsed.
Click to expand it.
Makefile
+
22
−
1
View file @
e03fc173
...
...
@@ -684,15 +684,31 @@ SOURCEVIEWCOMPAT:=
ifeq
($(strip $(GTKSOURCEVIEW)),lablgtk2.sourceview3)
SOURCEVIEWCOMPAT
:=
GSourceView2
src/plugins/gui/GSourceView2.ml
%
:
src/plugins/gui/GSourceView2.ml
%
.in
src/plugins/gui/GSourceView2.ml
:
src/plugins/gui/GSourceView2.ml.in
$(
CP
)
$<
$@
$(
CHMOD_RO
)
$@
src/plugins/gui/GSourceView2.mli
:
src/plugins/gui/GSourceView2.mli.in
$(
CP
)
$<
$@
$(
CHMOD_RO
)
$@
endif
DGRAPHCOMPAT
:=
ifeq
($(HAS_GNOMECANVAS),no)
DGRAPHCOMPAT
:=
dgraph
src/plugins/gui/dgraph.ml
:
src/plugins/gui/dgraph.ml.in
$(
CP
)
$<
$@
$(
CHMOD_RO
)
$@
src/plugins/gui/dgraph.mli
:
src/plugins/gui/dgraph.mli.in
$(
CP
)
$<
$@
$(
CHMOD_RO
)
$@
endif
SINGLE_GUI_CMO
:=
\
$(
WTOOLKIT
)
\
$(
SOURCEVIEWCOMPAT
)
\
$(
DGRAPHCOMPAT
)
\
gui_parameters
\
gtk_helper gtk_form
\
source_viewer pretty_source source_manager book_manager
\
...
...
@@ -745,7 +761,12 @@ PLUGIN_NAME:=Callgraph
PLUGIN_DISTRIBUTED
:=
yes
PLUGIN_DIR
:=
src/plugins/callgraph
PLUGIN_CMO
:=
options journalize subgraph cg services uses register
#GTK3: no DGraph available.
ifeq
($(HAS_GNOMECANVAS),yes)
PLUGIN_GUI_CMO
:=
cg_viewer
else
PLUGIN_GUI_CMO
:=
endif
PLUGIN_CMI
:=
callgraph_api
PLUGIN_INTERNAL_TEST
:=
yes
PLUGIN_TESTS_DIRS
:=
callgraph
...
...
This diff is collapsed.
Click to expand it.
src/plugins/gui/dgraph.ml.in
0 → 100644
+
14
−
0
View file @
e03fc173
(* dgraph module that always generates an error: Dgraph is not available
with gtk3
*)
module DGraphModel = struct
exception DotError of string
end
module DGraphContainer = struct
module Dot = struct
let from_dot_with_commands ?packing:_ _ =
raise (DGraphModel.DotError "DGraph is unsupported in GTK3")
end
end
This diff is collapsed.
Click to expand it.
src/plugins/gui/dgraph.mli.in
0 → 100644
+
14
−
0
View file @
e03fc173
(* dgraph module that always generates an error: Dgraph is not available
with gtk3
*)
module DGraphModel: sig
exception DotError of string
end
module DGraphContainer: sig
module Dot: sig
val from_dot_with_commands: ?packing:(GObj.widget ->unit) -> string ->
GPack.table * <adapt_zoom: unit -> unit>
end
end
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