Update graphviz version to intermediate build (#84)

Rubjerg · Apr 15, 2024 · 6c1f01b · 6c1f01b
1 parent 9564b5a
commit 6c1f01b
Show file tree

Hide file tree

Showing 124 changed files with 817 additions and 352 deletions.
diff --git a/GraphvizWrapper/graphvizfiles/Debug/acyclic.exe b/GraphvizWrapper/graphvizfiles/Debug/acyclic.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/bcomps.exe b/GraphvizWrapper/graphvizfiles/Debug/bcomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/ccomps.exe b/GraphvizWrapper/graphvizfiles/Debug/ccomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cdt.dll b/GraphvizWrapper/graphvizfiles/Debug/cdt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cgraph++.dll b/GraphvizWrapper/graphvizfiles/Debug/cgraph++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cgraph.dll b/GraphvizWrapper/graphvizfiles/Debug/cgraph.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/circo.exe b/GraphvizWrapper/graphvizfiles/Debug/circo.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cluster.exe b/GraphvizWrapper/graphvizfiles/Debug/cluster.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dijkstra.exe b/GraphvizWrapper/graphvizfiles/Debug/dijkstra.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot.exe b/GraphvizWrapper/graphvizfiles/Debug/dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot2gxl.exe b/GraphvizWrapper/graphvizfiles/Debug/dot2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot_builtins.exe b/GraphvizWrapper/graphvizfiles/Debug/dot_builtins.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/edgepaint.exe b/GraphvizWrapper/graphvizfiles/Debug/edgepaint.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/fdp.exe b/GraphvizWrapper/graphvizfiles/Debug/fdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gc.exe b/GraphvizWrapper/graphvizfiles/Debug/gc.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gml2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/gml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/graphml2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/graphml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gv2gml.exe b/GraphvizWrapper/graphvizfiles/Debug/gv2gml.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gv2gxl.exe b/GraphvizWrapper/graphvizfiles/Debug/gv2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvc++.dll b/GraphvizWrapper/graphvizfiles/Debug/gvc++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvc.dll b/GraphvizWrapper/graphvizfiles/Debug/gvc.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvcolor.exe b/GraphvizWrapper/graphvizfiles/Debug/gvcolor.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvgen.exe b/GraphvizWrapper/graphvizfiles/Debug/gvgen.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvmap.exe b/GraphvizWrapper/graphvizfiles/Debug/gvmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvmap.sh b/GraphvizWrapper/graphvizfiles/Debug/gvmap.sh
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Script for gvmap pipeline
+# Use -A to add flags for gvmap; e.g., -Ae results in gvmap -e
+# -K can be used to change the original layout; by default, sfdp is used
+# -T is used to specify the final output format
+# -G, -N and -E flags can be used to tailor the rendering
+# -g, -n and -e flags can be used to tailor the initial layout
+# Be careful of spaces in the flags. If these are not wrapped in quotes, the
+# parts will be separated during option processing.
+
+LAYOUT=sfdp
+OPTSTR="vVA:G:E:N:g:e:n:K:T:o:"
+USAGE="Usage: gvmap [-vV] [-A gvmap flags] [-G attr=val] [-E attr=val] [-N attr=val] [-g attr=val] [-e attr=val] [-n attr=val] [-K layout] [-T output format] [-o outfile]"
+FLAGS1=
+FLAGS2=
+FLAGS3=
+
+while getopts ":$OPTSTR" c
+do
+  case $c in
+  v )
+    VERBOSE=1
+    FLAGS1="$FLAGS1 -v"
+    FLAGS2="$FLAGS2 -v"
+    FLAGS3="$FLAGS3 -v"
+    ;;
+  V )
+	dot -V
+    exit 0
+    ;;
+  K )
+    LAYOUT=$OPTARG
+    ;;
+  A )
+    FLAGS2="$FLAGS2 -$OPTARG"
+    ;;
+  T )
+    FLAGS3="$FLAGS3 -T$OPTARG"
+    ;;
+  e )
+      FLAGS1="$FLAGS1 -E$OPTARG"
+    ;;
+  n )
+      FLAGS1="$FLAGS1 -N$OPTARG"
+    ;;
+  g )
+      FLAGS1="$FLAGS1 -G$OPTARG"
+    ;;
+  E )
+      FLAGS3="$FLAGS3 -E$OPTARG"
+    ;;
+  N )
+      FLAGS3="$FLAGS3 -N$OPTARG"
+    ;;
+  G )
+      FLAGS3="$FLAGS3 -G$OPTARG"
+    ;;
+  o )
+      FLAGS3="$FLAGS3 -o$OPTARG"
+    ;;
+  :)
+    printf '%s requires a value\n' "$OPTARG" >&2
+    exit 2
+    ;;
+  \? )
+    if [ "$OPTARG" = "?" ]
+    then
+      printf '%s\n' "$USAGE"
+      exit 0
+    else
+      printf  'gvmap: unknown flag %s\n' "$OPTARG" >&2
+      printf '%s\n' "$USAGE"
+      exit 2
+    fi
+    ;;
+  esac
+done
+shift $((OPTIND-1))
+
+if [ $# -eq 0 ]
+then
+  if [ -n "$VERBOSE" ]
+  then
+    printf '%s -Goverlap=prism %s | gvmap %s | neato -n2 %s\n' "$LAYOUT" "$FLAGS1" "$FLAGS2" "$FLAGS3" >&2
+  fi
+  $LAYOUT -Goverlap=prism $FLAGS1 | gvmap $FLAGS2 | neato -n2 $FLAGS3
+else
+  while [ $# -gt 0 ]
+  do
+    if [ -f "$1" ]
+    then
+      if [ -n "$VERBOSE" ]
+      then
+        printf '%s -Goverlap=prism %s %s | gvmap %s | neato -n2 %s\n' "$LAYOUT" "$FLAGS1" "$1" "$FLAGS2" "$FLAGS3" >&2
+      fi
+      $LAYOUT -Goverlap=prism $FLAGS1 $1 | gvmap $FLAGS2 | neato -n2 $FLAGS3
+    else
+      printf 'gvmap: unknown input file %s - ignored\n' "$1" >&2
+    fi
+    shift
+  done
+fi
+
+
+
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvpack.exe b/GraphvizWrapper/graphvizfiles/Debug/gvpack.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_core.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_core.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_dot_layout.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_dot_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_gdiplus.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_gdiplus.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_kitty.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_kitty.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_neato_layout.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_neato_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_pango.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_pango.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_vt.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_vt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvpr.exe b/GraphvizWrapper/graphvizfiles/Debug/gvpr.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gxl2dot.exe b/GraphvizWrapper/graphvizfiles/Debug/gxl2dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gxl2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/gxl2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/mm2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/mm2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/neato.exe b/GraphvizWrapper/graphvizfiles/Debug/neato.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/nop.exe b/GraphvizWrapper/graphvizfiles/Debug/nop.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/osage.exe b/GraphvizWrapper/graphvizfiles/Debug/osage.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/patchwork.exe b/GraphvizWrapper/graphvizfiles/Debug/patchwork.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/pathplan.dll b/GraphvizWrapper/graphvizfiles/Debug/pathplan.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/prune.exe b/GraphvizWrapper/graphvizfiles/Debug/prune.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/sccmap.exe b/GraphvizWrapper/graphvizfiles/Debug/sccmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/sfdp.exe b/GraphvizWrapper/graphvizfiles/Debug/sfdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/tred.exe b/GraphvizWrapper/graphvizfiles/Debug/tred.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/twopi.exe b/GraphvizWrapper/graphvizfiles/Debug/twopi.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/unflatten.exe b/GraphvizWrapper/graphvizfiles/Debug/unflatten.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/xdot.dll b/GraphvizWrapper/graphvizfiles/Debug/xdot.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/Pathplan.dll b/GraphvizWrapper/graphvizfiles/Release/Pathplan.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/acyclic.exe b/GraphvizWrapper/graphvizfiles/Release/acyclic.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/bcomps.exe b/GraphvizWrapper/graphvizfiles/Release/bcomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/ccomps.exe b/GraphvizWrapper/graphvizfiles/Release/ccomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/cdt.dll b/GraphvizWrapper/graphvizfiles/Release/cdt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/cgraph++.dll b/GraphvizWrapper/graphvizfiles/Release/cgraph++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/cgraph.dll b/GraphvizWrapper/graphvizfiles/Release/cgraph.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/circo.exe b/GraphvizWrapper/graphvizfiles/Release/circo.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/cluster.exe b/GraphvizWrapper/graphvizfiles/Release/cluster.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dijkstra.exe b/GraphvizWrapper/graphvizfiles/Release/dijkstra.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot.exe b/GraphvizWrapper/graphvizfiles/Release/dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot2gxl.exe b/GraphvizWrapper/graphvizfiles/Release/dot2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot_builtins.exe b/GraphvizWrapper/graphvizfiles/Release/dot_builtins.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/edgepaint.exe b/GraphvizWrapper/graphvizfiles/Release/edgepaint.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/fdp.exe b/GraphvizWrapper/graphvizfiles/Release/fdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gc.exe b/GraphvizWrapper/graphvizfiles/Release/gc.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gml2gv.exe b/GraphvizWrapper/graphvizfiles/Release/gml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/graphml2gv.exe b/GraphvizWrapper/graphvizfiles/Release/graphml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gv2gml.exe b/GraphvizWrapper/graphvizfiles/Release/gv2gml.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gv2gxl.exe b/GraphvizWrapper/graphvizfiles/Release/gv2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvc++.dll b/GraphvizWrapper/graphvizfiles/Release/gvc++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvc.dll b/GraphvizWrapper/graphvizfiles/Release/gvc.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvcolor.exe b/GraphvizWrapper/graphvizfiles/Release/gvcolor.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvgen.exe b/GraphvizWrapper/graphvizfiles/Release/gvgen.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvmap.exe b/GraphvizWrapper/graphvizfiles/Release/gvmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvmap.sh b/GraphvizWrapper/graphvizfiles/Release/gvmap.sh
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Script for gvmap pipeline
+# Use -A to add flags for gvmap; e.g., -Ae results in gvmap -e
+# -K can be used to change the original layout; by default, sfdp is used
+# -T is used to specify the final output format
+# -G, -N and -E flags can be used to tailor the rendering
+# -g, -n and -e flags can be used to tailor the initial layout
+# Be careful of spaces in the flags. If these are not wrapped in quotes, the
+# parts will be separated during option processing.
+
+LAYOUT=sfdp
+OPTSTR="vVA:G:E:N:g:e:n:K:T:o:"
+USAGE="Usage: gvmap [-vV] [-A gvmap flags] [-G attr=val] [-E attr=val] [-N attr=val] [-g attr=val] [-e attr=val] [-n attr=val] [-K layout] [-T output format] [-o outfile]"
+FLAGS1=
+FLAGS2=
+FLAGS3=
+
+while getopts ":$OPTSTR" c
+do
+  case $c in
+  v )
+    VERBOSE=1
+    FLAGS1="$FLAGS1 -v"
+    FLAGS2="$FLAGS2 -v"
+    FLAGS3="$FLAGS3 -v"
+    ;;
+  V )
+	dot -V
+    exit 0
+    ;;
+  K )
+    LAYOUT=$OPTARG
+    ;;
+  A )
+    FLAGS2="$FLAGS2 -$OPTARG"
+    ;;
+  T )
+    FLAGS3="$FLAGS3 -T$OPTARG"
+    ;;
+  e )
+      FLAGS1="$FLAGS1 -E$OPTARG"
+    ;;
+  n )
+      FLAGS1="$FLAGS1 -N$OPTARG"
+    ;;
+  g )
+      FLAGS1="$FLAGS1 -G$OPTARG"
+    ;;
+  E )
+      FLAGS3="$FLAGS3 -E$OPTARG"
+    ;;
+  N )
+      FLAGS3="$FLAGS3 -N$OPTARG"
+    ;;
+  G )
+      FLAGS3="$FLAGS3 -G$OPTARG"
+    ;;
+  o )
+      FLAGS3="$FLAGS3 -o$OPTARG"
+    ;;
+  :)
+    printf '%s requires a value\n' "$OPTARG" >&2
+    exit 2
+    ;;
+  \? )
+    if [ "$OPTARG" = "?" ]
+    then
+      printf '%s\n' "$USAGE"
+      exit 0
+    else
+      printf  'gvmap: unknown flag %s\n' "$OPTARG" >&2
+      printf '%s\n' "$USAGE"
+      exit 2
+    fi
+    ;;
+  esac
+done
+shift $((OPTIND-1))
+
+if [ $# -eq 0 ]
+then
+  if [ -n "$VERBOSE" ]
+  then
+    printf '%s -Goverlap=prism %s | gvmap %s | neato -n2 %s\n' "$LAYOUT" "$FLAGS1" "$FLAGS2" "$FLAGS3" >&2
+  fi
+  $LAYOUT -Goverlap=prism $FLAGS1 | gvmap $FLAGS2 | neato -n2 $FLAGS3
+else
+  while [ $# -gt 0 ]
+  do
+    if [ -f "$1" ]
+    then
+      if [ -n "$VERBOSE" ]
+      then
+        printf '%s -Goverlap=prism %s %s | gvmap %s | neato -n2 %s\n' "$LAYOUT" "$FLAGS1" "$1" "$FLAGS2" "$FLAGS3" >&2
+      fi
+      $LAYOUT -Goverlap=prism $FLAGS1 $1 | gvmap $FLAGS2 | neato -n2 $FLAGS3
+    else
+      printf 'gvmap: unknown input file %s - ignored\n' "$1" >&2
+    fi
+    shift
+  done
+fi
+
+
+
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvpack.exe b/GraphvizWrapper/graphvizfiles/Release/gvpack.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_core.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_core.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_dot_layout.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_dot_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_gdiplus.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_gdiplus.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_kitty.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_kitty.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_neato_layout.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_neato_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_pango.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_pango.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_vt.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_vt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvpr.exe b/GraphvizWrapper/graphvizfiles/Release/gvpr.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gxl2dot.exe b/GraphvizWrapper/graphvizfiles/Release/gxl2dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gxl2gv.exe b/GraphvizWrapper/graphvizfiles/Release/gxl2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/mm2gv.exe b/GraphvizWrapper/graphvizfiles/Release/mm2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/neato.exe b/GraphvizWrapper/graphvizfiles/Release/neato.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/nop.exe b/GraphvizWrapper/graphvizfiles/Release/nop.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/osage.exe b/GraphvizWrapper/graphvizfiles/Release/osage.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/patchwork.exe b/GraphvizWrapper/graphvizfiles/Release/patchwork.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/prune.exe b/GraphvizWrapper/graphvizfiles/Release/prune.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/sccmap.exe b/GraphvizWrapper/graphvizfiles/Release/sccmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/sfdp.exe b/GraphvizWrapper/graphvizfiles/Release/sfdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/tred.exe b/GraphvizWrapper/graphvizfiles/Release/tred.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/twopi.exe b/GraphvizWrapper/graphvizfiles/Release/twopi.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/unflatten.exe b/GraphvizWrapper/graphvizfiles/Release/unflatten.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/xdot.dll b/GraphvizWrapper/graphvizfiles/Release/xdot.dll
diff --git a/GraphvizWrapper/include/arith.h b/GraphvizWrapper/include/arith.h
@@ -5,7 +5,7 @@
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors: Details at https://graphviz.org
  *************************************************************************/
@@ -37,10 +37,6 @@ extern "C" {
 #endif
 #define MAX(a,b)	((a)>(b)?(a):(b))
 
-#define AVG(a,b)	((a + b) / 2)
-#define SGN(a)		(((a)<0)? -1 : 1)
-#define CMP(a,b)	(((a)<(b)) ? -1 : (((a)>(b)) ? 1 : 0))
-
 #ifndef MAXDOUBLE
 #define MAXDOUBLE	1.7976931348623157e+308
 #endif