Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified GraphvizWrapper/graphvizfiles/Debug/acyclic.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/bcomps.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/ccomps.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/cdt.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/cgraph++.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/cgraph.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/circo.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/cluster.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/dijkstra.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/dot.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/dot2gxl.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/dot_builtins.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/edgepaint.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/fdp.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gc.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gml2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/graphml2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gv2gml.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gv2gxl.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvc++.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvc.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvcolor.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvgen.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvmap.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvpack.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvplugin_core.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvplugin_dot_layout.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvplugin_gdiplus.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvplugin_kitty.dll
Binary file not shown.
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvplugin_pango.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvplugin_vt.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gvpr.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gxl2dot.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/gxl2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/mm2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/neato.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/nop.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/osage.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/patchwork.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/pathplan.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/prune.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/sccmap.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/sfdp.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/tred.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/twopi.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/unflatten.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Debug/xdot.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/Pathplan.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/acyclic.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/bcomps.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/ccomps.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/cdt.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/cgraph++.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/cgraph.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/circo.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/cluster.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/dijkstra.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/dot.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/dot2gxl.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/dot_builtins.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/edgepaint.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/fdp.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gc.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gml2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/graphml2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gv2gml.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gv2gxl.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvc++.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvc.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvcolor.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvgen.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvmap.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvpack.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvplugin_core.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvplugin_dot_layout.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvplugin_gdiplus.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvplugin_kitty.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvplugin_neato_layout.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvplugin_pango.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvplugin_vt.dll
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gvpr.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gxl2dot.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/gxl2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/mm2gv.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/neato.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/nop.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/osage.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/patchwork.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/prune.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/sccmap.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/sfdp.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/tred.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/twopi.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/unflatten.exe
Binary file not shown.
Binary file modified GraphvizWrapper/graphvizfiles/Release/xdot.dll
Binary file not shown.
5 changes: 5 additions & 0 deletions GraphvizWrapper/include/geom.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ typedef struct { int x, y; } point;

typedef struct pointf_s { double x, y; } pointf;

typedef struct {
pointf p; // arbitrary point on the line
double m; // slope of the line
} linef;

/* tell pathplan/pathgeom.h */
#define HAVE_POINTF_S

Expand Down
4 changes: 2 additions & 2 deletions GraphvizWrapper/include/graphviz_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define GVPLUGIN_VERSION 6
#define PACKAGE_BUGREPORT "https://gitlab.com/graphviz/graphviz/-/issues"
#define PACKAGE_NAME "graphviz"
#define PACKAGE_STRING "graphviz 11.0.0~dev.20240413.1811"
#define PACKAGE_STRING "graphviz 11.0.0"
#define PACKAGE_TARNAME "graphviz"
#define PACKAGE_URL ""
#define PACKAGE_VERSION "11.0.0~dev.20240413.1811"
#define PACKAGE_VERSION "11.0.0"
13 changes: 1 addition & 12 deletions GraphvizWrapper/include/gvcjob.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ extern "C" {

#define PENWIDTH_NORMAL 1.
#define PENWIDTH_BOLD 2.
typedef enum { GVATTR_STRING, GVATTR_BOOL, GVATTR_COLOR } gvattr_t;

/* The -T output formats listed below are examples only, they are not definitive or inclusive,
other outputs may use the flags now, or in the future
Expand Down Expand Up @@ -144,12 +143,6 @@ extern "C" {
int id;
const char *type;
} gvplugin_active_loadimage_t;

typedef struct gv_argvlist_s {
char **argv;
size_t argc;
size_t alloc;
} gv_argvlist_t;

typedef struct gvdevice_callbacks_s {
void (*refresh) (GVJ_t * job);
Expand Down Expand Up @@ -356,16 +349,12 @@ extern "C" {
/* (e.g. button 1 clicked on current obj) */
char *active_tooltip; /* tooltip of active object - or NULL */
char *selected_href; /* href of selected object - or NULL */
gv_argvlist_t selected_obj_type_name; /* (e.g. "edge" "node3" "e" "->" "node5" "") */
gv_argvlist_t selected_obj_attributes; /* attribute triplets: name, value, type */
/* e.g. "color", "red", GVATTR_COLOR,
"style", "filled", GVATTR_BOOL, */

void *window; /* display-specific data for gvrender plugin */

/* keybindings for keyboard events */
gvevent_key_binding_t *keybindings;
int numkeys;
size_t numkeys;
void *keycodes;
};

Expand Down
Binary file modified GraphvizWrapper/lib/gvc.lib
Binary file not shown.
17 changes: 11 additions & 6 deletions How-to-upgrade-graphviz.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
- Navigate to https://gitlab.com/groups/graphviz/-/packages/ and click the version you want to upgrade to
- Download and install `windows_10_cmake_Debug_graphviz-install-<version>-win64.exe` on your system
- Navigate to `C:\Program Files\Graphviz\bin` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Debug\`.

- Download and extract `windows_10_cmake_Debug_Graphviz-<version>-win64.zip`.
- Navigate to `bin/` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Debug\`.
Check that every existing file was overwritten.
- Navigate to `C:\Program Files\Graphviz\lib` and copy all the .lib files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\lib\`.
- Navigate to `lib/` and copy all the .lib files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\lib\`.
Check that every existing file was overwritten.
- Navigate to `C:\Program Files\Graphviz\include\graphviz` and copy all the lib files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\include\`.
- Navigate to `include/graphviz/` and copy all the .h files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\include\`.
Check that every existing file was overwritten.
- Download and install `windows_10_cmake_Release_graphviz-install-<version>-win64.exe` on your system
- Navigate to `C:\Program Files\Graphviz\bin` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Release\`.

- Download and extract `windows_10_cmake_Release_Graphviz-<version>-win64.zip`.
- Navigate to `bin/` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Release\`.
Check that every existing file was overwritten.

- Make sure that the toolset selected for GraphvizWrapper.dll is compatible with the vcruntime version shipped with graphviz.
- Remove all DLLs starting with `concrt`, `msvcp` or `vcruntime`. These are part of the Visual C++ redistributable package, and we're not shipping those.
- Remove all files ending in `.sh`, these are not crossplatform and we don't need them.
- Check if any other files are new, and investigate if that is expected.

- Compile and run the tests
8 changes: 4 additions & 4 deletions Rubjerg.Graphviz.NugetTest/Rubjerg.Graphviz.NugetTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
<Version>2.0.2</Version>
</PackageReference>
<PackageReference Include="NUnit.ConsoleRunner">
<Version>3.17.0</Version>
<Version>3.18.3</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.14.0</Version>
</PackageReference>
<PackageReference Include="NUnit.Extension.TeamCityEventListener">
<Version>1.0.7</Version>
<Version>1.0.9</Version>
</PackageReference>
<PackageReference Include="OpenCover">
<Version>4.7.1221</Version>
</PackageReference>
<!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<ItemGroup>
<PackageReference Include="NUnit.ConsoleRunner">
<Version>3.18.1</Version>
<Version>3.18.3</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.14.0</Version>
Expand All @@ -34,7 +34,7 @@
<Version>4.7.1221</Version>
</PackageReference>
<!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@

<ItemGroup>
<PackageReference Include="NUnit.ConsoleRunner">
<Version>3.17.0</Version>
<Version>3.18.3</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.14.0</Version>
</PackageReference>
<PackageReference Include="NUnit.Extension.TeamCityEventListener">
<Version>1.0.7</Version>
<Version>1.0.9</Version>
</PackageReference>
<PackageReference Include="OpenCover">
<Version>4.7.1221</Version>
</PackageReference>
<!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="NUnit.ConsoleRunner">
<Version>3.18.1</Version>
<Version>3.18.3</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.14.0</Version>
Expand All @@ -30,7 +30,7 @@
<Version>4.7.1221</Version>
</PackageReference>
<!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Rubjerg.Graphviz/Rubjerg.Graphviz.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<ItemGroup>
<None Update="*.dll;*.lib;*.pdb;*.exp;*.exe;config6">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Pack>true</Pack>
<PackageCopyToOutput>true</PackageCopyToOutput>
</None>
Expand Down
2 changes: 1 addition & 1 deletion nunit-console.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
packages\\nunit.consolerunner\\3.18.1\\tools\\nunit3-console.exe "$@" --trace=Off --where "cat!=Slow and cat!=Flaky"
packages\\nunit.consolerunner\\3.18.3\\tools\\nunit3-console.exe "$@" --trace=Off --where "cat!=Slow and cat!=Flaky"
Loading