diff --git a/bin/visualizations/builder_viz.ml b/bin/visualizations/builder_viz.ml index fcb11e3..5219bd3 100644 --- a/bin/visualizations/builder_viz.ml +++ b/bin/visualizations/builder_viz.ml @@ -72,19 +72,22 @@ let print_treemap_html elf_path elf_size = * |> Fmt.to_to_string (Tyxml.Svg.pp ()) *) let print_dependencies_html file = - let open Opam_graph in + let module G = Opam_graph in let switch = read_file file in let data = OpamFile.SwitchExport.read_from_string switch in - let transitive = false in - let graph = Ui.dependencies ~transitive data in + let graph = G.Ui.dependencies ~transitive:false data in + let sharing_stats = + data + |> G.dependencies ~transitive:false + |> G.calc_sharing_stats in let override_css = {| .deps-svg-wrap { background: rgb(60, 60, 87); } |} in - let html = Render.Html.of_assoc ~override_css graph in - Format.printf "%a" Render.Html.pp html + let html = G.Render.Html.of_assoc ~override_css ~sharing_stats graph in + Format.printf "%a" G.Render.Html.pp html module Cmd_aux = struct diff --git a/lib/views.ml b/lib/views.ml index 28f42ed..7acc1c3 100644 --- a/lib/views.ml +++ b/lib/views.ml @@ -618,6 +618,7 @@ module Job_build = struct ~next let viz_style_deps = " + border: 0; width: 45em; height: 45.4em; max-width: 100%; @@ -627,8 +628,9 @@ module Job_build = struct " let viz_style_treemap = " + border: 0; width: 46em; - height: 48.4em; + height: 49.4em; max-width: 100%; max-height: 52vw; min-width: 38em; diff --git a/packaging/visualizations.sh b/packaging/visualizations.sh index 8f7c057..5e5d9a5 100755 --- a/packaging/visualizations.sh +++ b/packaging/visualizations.sh @@ -78,8 +78,17 @@ FILENAME="${1}" CACHE_DIR="${CACHE}/${UUID}" BUILDER_VIZ="builder-viz" -TMPTREE=$(mktemp -t treevis) -TMPOPAM=$(mktemp -t opamvis) +mktemp_aux () { + if [ "$(uname)" = "Linux" ]; then + mktemp -t "$1.XXX" + elif [ "$(uname)" = "FreeBSD" ]; then + mktemp -t "$1" + else + echo 'Unsupported platform'; exit 1 + fi +} +TMPTREE=$(mktemp_aux treeviz) +TMPOPAM=$(mktemp_aux opamviz) cleanup () { rm -rf "${TMPTREE}" "${TMPOPAM}" } @@ -94,7 +103,17 @@ else fi fi -SIZE="$(stat -f "%z" ${FILENAME})" +stat_aux () { + if [ "$(uname)" = "Linux" ]; then + stat -c "%s" "$1" + elif [ "$(uname)" = "FreeBSD" ]; then + stat -f "%z" "$1" + else + echo 'Unsupported platform'; exit 1 + fi +} + +SIZE="$(stat_aux ${FILENAME})" if [ ! -z "${DEBUG}" ]; then if [ -e "${CACHE_DIR}.treemap.html" ]; then