]> granicus.if.org Git - graphviz/log
graphviz
3 years agoremove Fedora 32 CI testing
Matthew Fernandez [Tue, 31 Aug 2021 00:01:23 +0000 (17:01 -0700)]
remove Fedora 32 CI testing

Fedora 32 was EOLed in May 2021.¹

¹ https://fedoraproject.org/wiki/End_of_life?rd=LifeCycle/EOL

3 years agoMerge branch 'smattr/C574183C-758B-4503-AFE2-3BEE5F2BBA87' into 'main'
Matthew Fernandez [Fri, 3 Sep 2021 15:27:07 +0000 (15:27 +0000)]
Merge branch 'smattr/C574183C-758B-4503-AFE2-3BEE5F2BBA87' into 'main'

some Pylint warning squashing

See merge request graphviz/graphviz!2118

3 years agofix some missing Python docstrings
Matthew Fernandez [Sat, 28 Aug 2021 15:24:28 +0000 (08:24 -0700)]
fix some missing Python docstrings

3 years agosquash Pylint warnings about shadowing 'root'
Matthew Fernandez [Sat, 28 Aug 2021 15:22:14 +0000 (08:22 -0700)]
squash Pylint warnings about shadowing 'root'

3 years agosquash Pylint warnings about shadowing 'p'
Matthew Fernandez [Sat, 28 Aug 2021 15:21:19 +0000 (08:21 -0700)]
squash Pylint warnings about shadowing 'p'

3 years agosquash Pylint wrong-import-position warnings
Matthew Fernandez [Sat, 28 Aug 2021 15:14:15 +0000 (08:14 -0700)]
squash Pylint wrong-import-position warnings

3 years agosquash a Pylint line-too-long warning
Matthew Fernandez [Sat, 28 Aug 2021 15:12:57 +0000 (08:12 -0700)]
squash a Pylint line-too-long warning

3 years agoMerge branch 'smattr/8D176743-758B-4021-8E02-E18155F7503A' into 'main'
Matthew Fernandez [Thu, 2 Sep 2021 03:40:04 +0000 (03:40 +0000)]
Merge branch 'smattr/8D176743-758B-4021-8E02-E18155F7503A' into 'main'

smyrna: remove expat installation when using MS Build

See merge request graphviz/graphviz!2115

3 years agosmyrna: remove expat installation when using MS Build
Matthew Fernandez [Fri, 27 Aug 2021 03:33:26 +0000 (20:33 -0700)]
smyrna: remove expat installation when using MS Build

AFAICT Smyrna does not directly depend on expat. It depends on it indirectly,
but should then pick up expat installation steps from dependent MS Build files.

3 years agoMerge branch 'add-mingw-cmake-builds-to-ci' into 'main'
Magnus Jacobsson [Wed, 1 Sep 2021 16:11:52 +0000 (16:11 +0000)]
Merge branch 'add-mingw-cmake-builds-to-ci' into 'main'

Add MinGW CMake build jobs to CI

See merge request graphviz/graphviz!2107

3 years agoCI: add windows-mingw64-cmake-build job
Magnus Jacobsson [Sun, 15 Aug 2021 10:04:09 +0000 (12:04 +0200)]
CI: add windows-mingw64-cmake-build job

3 years agoCI: add windows-mingw32-cmake-build job
Magnus Jacobsson [Sun, 15 Aug 2021 10:03:57 +0000 (12:03 +0200)]
CI: add windows-mingw32-cmake-build job

3 years agoadd ci/mingw-build.sh script
Magnus Jacobsson [Tue, 31 Aug 2021 05:19:31 +0000 (07:19 +0200)]
add ci/mingw-build.sh script

3 years agoci/build.sh: CMake: move the MinGW zip and exe build artifacts to the release directory
Magnus Jacobsson [Sun, 15 Aug 2021 09:33:42 +0000 (11:33 +0200)]
ci/build.sh: CMake: move the MinGW zip and exe build artifacts to the release directory

3 years agoremove import/export declaration of lt_preloaded_sybols in gvcext.h
Magnus Jacobsson [Wed, 21 Jul 2021 10:04:18 +0000 (12:04 +0200)]
remove import/export declaration of lt_preloaded_sybols in gvcext.h

lt_preloaded_symbols is always defined in the executable that links to
the gvc lib, so it should only have a standard extern declaration.

Fixes this error with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: cmd/dot/CMakeFiles/dot.dir/dot.c.obj:dot.c:(.text+0x1e9): undefined reference to `__imp_lt_preloaded_symbols'

Also removes this warning with MinGw:

C:/Users/magja/graphviz/cmd/dot/no_builtins.c:13:14: warning: 'lt_preloaded_symbols' redeclared without dllimport attribute: previous dllimport ignored [-Wattributes]
   13 | lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
      |              ^~~~~~~~~~~~~~~~~~~~

Also removes these three warnings in standard Windows MSVC builds:

C:\Users\magja\graphviz\cmd\dot\no_builtins.c(13,37): warning C4273: 'lt_preloaded_symbols': inconsistent dll linkage [C:\Users\magja\graphviz\build\cmd\dot\dot.vcxproj]
C:\Users\magja\graphviz\cmd\tools\gvpack.c(34,37): warning C4273: 'lt_preloaded_symbols': inconsistent dll linkage [C:\Users\magja\graphviz\build\cmd\tools\gvpack.vcxproj]
LINK : warning LNK4217: symbol 'lt_preloaded_symbols' defined in 'no_builtins.obj' is imported by 'dot.obj' in function 'main' [C:\Users\magja\graphviz\build\cmd\dot\dot.vcxproj]

3 years agolabel: CMake: ensure label symbols are exported from the gvc lib
Magnus Jacobsson [Thu, 29 Jul 2021 05:58:37 +0000 (07:58 +0200)]
label: CMake: ensure label symbols are exported from the gvc lib

The object modules from the static label lib are statically linked
into the gvc shared lib through the common object library which means
that their symbols should be exported from gvc instead of
imported. Defining GVC_EXPORTS achieves this.

This is what the autotools build already does.

Fixes this error with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../label/liblabel.a(xlabels.c.obj):xlabels.c:(.text+0x98): undefined reference to `__imp_zmalloc'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../label/liblabel.a(xlabels.c.obj):xlabels.c:(.text+0x1f40): undefined reference to `__imp_zmalloc'

3 years agoortho: CMake: ensure ortho symbols are exported from gvc
Magnus Jacobsson [Sat, 24 Jul 2021 06:04:53 +0000 (08:04 +0200)]
ortho: CMake: ensure ortho symbols are exported from gvc

The object modules from the static ortho lib are statically linked
into the gvc shared lib which means that its symbols should be
exported from gvc instead of imported. Defining GVC_EXPORTS achieves
this.

Fixes errors like this with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../ortho/CMakeFiles/ortho_obj.dir/fPQ.c.obj:fPQ.c:(.text+0x6d): undefined reference to `__imp_gcalloc'

3 years agocommon: ensure correct import/export declarations of expat with MinGW
Magnus Jacobsson [Thu, 29 Jul 2021 16:31:12 +0000 (18:31 +0200)]
common: ensure correct import/export declarations of expat with MinGW

The expat library does not seem to recognize MinGW and therefore does
not apply the Microsoft storage class attributes to its function
declarations when using MinGW. Defining XML_USE_MSC_EXTENSIONS forces
it to use those.

Fixes errors like this with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: ../common/CMakeFiles/common_obj.dir/htmllex.c.obj:htmllex.c:(.text+0x1cec): undefined reference to `XML_ParserCreate'

3 years agoCMake: fix expat runtime library not found by cpack on msys2
Magnus Jacobsson [Thu, 5 Aug 2021 07:36:20 +0000 (09:36 +0200)]
CMake: fix expat runtime library not found by cpack on msys2

Fixes these errors with MinGW:

CMake Error at C:/Users/magja/graphviz/build/lib/gvc/cmake_install.cmake:75 (file):
  file INSTALL cannot find
  "C:/Users/magja/graphviz/lib/gvc/EXPAT_RUNTIME_LIBRARIES-NOTFOUND": No
  error.
Call Stack (most recent call first):
  C:/Users/magja/graphviz/build/lib/cmake_install.cmake:70 (include)
  C:/Users/magja/graphviz/build/cmake_install.cmake:58 (include)

CMake Error at C:/Users/magja/graphviz/build/cmd/tools/cmake_install.cmake:269 (file):
  file INSTALL cannot find
  "C:/Users/magja/graphviz/cmd/tools/EXPAT_RUNTIME_LIBRARIES-NOTFOUND": No
  error.
Call Stack (most recent call first):
  C:/Users/magja/graphviz/build/cmd/cmake_install.cmake:44 (include)
  C:/Users/magja/graphviz/build/cmake_install.cmake:60 (include)

CPack Error: Error when generating package: Graphviz

3 years agogvc: WIN32: install expat runtime library only if we have it
Magnus Jacobsson [Tue, 31 Aug 2021 13:52:57 +0000 (15:52 +0200)]
gvc: WIN32: install expat runtime library only if we have it

3 years agogvc: CMake: link to ltdl even on Windows with MinGW
Magnus Jacobsson [Wed, 18 Aug 2021 11:00:27 +0000 (13:00 +0200)]
gvc: CMake: link to ltdl even on Windows with MinGW

Fixes these errors with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x4f7): undefined reference to `lt_dlinit'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x529): undefined reference to `lt_dlopen'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x578): undefined reference to `lt_dlerror'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x69e): undefined reference to `lt_dlsym'
collect2.exe: error: ld returned 1 exit status

3 years agoCMake: FindLTDL: ensure ltdl is found with MinGW
Magnus Jacobsson [Mon, 16 Aug 2021 18:28:23 +0000 (20:28 +0200)]
CMake: FindLTDL: ensure ltdl is found with MinGW

CMake defines both WIN32 and MINGW when the compiler is some version
of MinGW. With MinGW we do want to use the ltdl library athough on
native Windows we only use the ltdl compatibility header introduced in
d70cdba7937724c19393d97bd280320cdf8c3c8f, not the library itself.

Fixes the following errors with MinGW:

C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x4f7): undefined reference to `lt_dlinit'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x529): undefined reference to `lt_dlopen'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x578): undefined reference to `lt_dlerror'
C:/tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.3.0/../../../../x86_64-w64-mingw32/bin/ld.exe: CMakeFiles/gvc.dir/objects.a(gvplugin.c.obj):gvplugin.c:(.text+0x69e): undefined reference to `lt_dlsym'

Towards https://gitlab.com/graphviz/graphviz/-/issues/2102.

3 years agoCMake: add use_win_pre_inst_libs option
Magnus Jacobsson [Tue, 3 Aug 2021 15:39:31 +0000 (17:39 +0200)]
CMake: add use_win_pre_inst_libs option

This option will be used in an upcoming commit that adds MinGW jobs to
CI.

3 years agoMerge branch 'more-linking-clean-up' into 'main'
Magnus Jacobsson [Mon, 30 Aug 2021 16:41:19 +0000 (16:41 +0000)]
Merge branch 'more-linking-clean-up' into 'main'

More linking cleanup

See merge request graphviz/graphviz!2127

3 years agocommon: link to expat privately instead of publicly
Magnus Jacobsson [Mon, 30 Aug 2021 06:29:29 +0000 (08:29 +0200)]
common: link to expat privately instead of publicly

Downstream libraries that explicitly use expat now all link to expat
themselves and no longer rely on a transitive dependency to expat
through gvc via common.

3 years agoplugin/neato_layout: remove linking to cdt
Magnus Jacobsson [Mon, 30 Aug 2021 06:19:09 +0000 (08:19 +0200)]
plugin/neato_layout: remove linking to cdt

The neato_layout plugin source files do not refer to cdt.

3 years agoplugin/gd: remove linking to cdt
Magnus Jacobsson [Mon, 30 Aug 2021 06:19:09 +0000 (08:19 +0200)]
plugin/gd: remove linking to cdt

The gd plugin source files do not refer to cdt.

3 years agoplugin/dot_layout: remove linking to cdt
Magnus Jacobsson [Mon, 30 Aug 2021 06:19:09 +0000 (08:19 +0200)]
plugin/dot_layout: remove linking to cdt

The dot_layout plugin source files do not refer to cdt.

3 years agoplugin/core: remove linking to cdt
Magnus Jacobsson [Mon, 30 Aug 2021 06:19:09 +0000 (08:19 +0200)]
plugin/core: remove linking to cdt

The core plugin source files do not refer to cdt.

3 years agogvc: link to cdt privately instead of publicly
Magnus Jacobsson [Mon, 30 Aug 2021 06:09:36 +0000 (08:09 +0200)]
gvc: link to cdt privately instead of publicly

Downstream libraries that explicitly use cdt now all link to cdt
themselves and no longer rely on a transitive dependency to cdt
through gvc.

3 years agogxl2gv: remove linking to cdt
Magnus Jacobsson [Sun, 29 Aug 2021 17:02:44 +0000 (19:02 +0200)]
gxl2gv: remove linking to cdt

The gxl2gv source files do not refer to cdt.

3 years agogvpack: remove linking to cdt
Magnus Jacobsson [Sun, 29 Aug 2021 17:02:44 +0000 (19:02 +0200)]
gvpack: remove linking to cdt

The gvpack source files do not refer to cdt.

3 years agographml2gv: remove linking to cdt
Magnus Jacobsson [Sun, 29 Aug 2021 17:02:44 +0000 (19:02 +0200)]
graphml2gv: remove linking to cdt

The graphml2gv source files do not refer to cdt.

3 years agodijkstra: remove linking to cdt
Magnus Jacobsson [Sun, 29 Aug 2021 17:02:44 +0000 (19:02 +0200)]
dijkstra: remove linking to cdt

The dijkstra source files do not refer to cdt.

3 years agoneatogen: add linking to sparse
Magnus Jacobsson [Sun, 29 Aug 2021 16:13:39 +0000 (18:13 +0200)]
neatogen: add linking to sparse

E.g. lib/neatogen/adjust.c uses SparseMatrix_from_coordinate_arrays
from lib/sparse/SparseMatrix.c.

3 years agoneatogen: add linking to gvc
Magnus Jacobsson [Sun, 29 Aug 2021 16:06:31 +0000 (18:06 +0200)]
neatogen: add linking to gvc

E.g. lib/neatogen/stress.c uses gcalloc from lib/common/memory.c
through the N_NEW macro in lib/common/memory.h.

3 years agoneatogen: add linking to pathplan
Magnus Jacobsson [Sun, 29 Aug 2021 15:59:40 +0000 (17:59 +0200)]
neatogen: add linking to pathplan

E.g. lib/neatogen/multispline.c uses Proutespline from
lib/pathplan/route.c.

3 years agosfdpgen: add linking to neatogen
Magnus Jacobsson [Sun, 29 Aug 2021 15:51:33 +0000 (17:51 +0200)]
sfdpgen: add linking to neatogen

E.g. lib/sfdpgen/post_process.c uses call_tri from
lib/neatogen/call_tri.c.

3 years agosfdpgen: add linking to sparse
Magnus Jacobsson [Sun, 29 Aug 2021 15:47:13 +0000 (17:47 +0200)]
sfdpgen: add linking to sparse

E.g. lib/sfdpgen/Multilevel.c uses random_permutation from
lib/sparse/general.c.

3 years agosfdpgen: add linking to gvc
Magnus Jacobsson [Sun, 29 Aug 2021 15:43:14 +0000 (17:43 +0200)]
sfdpgen: add linking to gvc

E.g. lib/sfdpgen/spring_electrical.c uses gcalloc from
lib/common/memory.c and the common object files are available through
the gvc library.

3 years agographml2gv: remove useless linking to ingraphs
Magnus Jacobsson [Sun, 29 Aug 2021 15:18:12 +0000 (17:18 +0200)]
graphml2gv: remove useless linking to ingraphs

The graphml2gv source files do not refer to ingraphs.

3 years agogml2gv: remove useless linking to ingraphs
Magnus Jacobsson [Sun, 29 Aug 2021 15:18:12 +0000 (17:18 +0200)]
gml2gv: remove useless linking to ingraphs

The gml2gv source files do not refer to ingraphs.

3 years agoingraphs: add linking to cgraph
Magnus Jacobsson [Sun, 29 Aug 2021 13:39:16 +0000 (15:39 +0200)]
ingraphs: add linking to cgraph

E.g. ingraphs.c uses agsetfile from lib/cgraph/scan.l.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agolabel: add linking to cdt
Magnus Jacobsson [Sun, 29 Aug 2021 08:48:24 +0000 (10:48 +0200)]
label: add linking to cdt

E.g. lib/label/xlabels.c use Dtobag from lib/cdt/dttree.c.

This removes the need to link to cdt for downstream libraries that
do not explicitly use cdt.

3 years agogvc: CMake: link to pack privately instead of publicly
Magnus Jacobsson [Wed, 18 Aug 2021 18:29:43 +0000 (20:29 +0200)]
gvc: CMake: link to pack privately instead of publicly

The pack object modules are part of the gvc library and downstream
libraries should link to the gvc library, not to the pack
library. Hence no need for a transitive dependency to pack in gvc.

3 years agoMerge branch 'smattr/550FBFBC-60E7-4C91-85B7-795331C1A531' into 'main'
Matthew Fernandez [Mon, 30 Aug 2021 15:40:43 +0000 (15:40 +0000)]
Merge branch 'smattr/550FBFBC-60E7-4C91-85B7-795331C1A531' into 'main'

remove SWIG #include malloc.h work arounds

See merge request graphviz/graphviz!2119

3 years agoremove SWIG #include malloc.h work arounds
Matthew Fernandez [Sat, 28 Aug 2021 16:36:27 +0000 (09:36 -0700)]
remove SWIG #include malloc.h work arounds

These lines were working around an issue where SWIG-generated code includes the
non-standard header malloc.h This was fixed in SWIG commit
571a84c9e788a8e97517a5d730d0e01edf0085e2 which made it into SWIG v1.3.32
released in 2007. Thus this work around is no longer necessary.

Related to #2115.

3 years agoMerge branch 'clean-up-expat-xdot-and-label-linking' into 'main'
Magnus Jacobsson [Mon, 30 Aug 2021 06:32:43 +0000 (06:32 +0000)]
Merge branch 'clean-up-expat-xdot-and-label-linking' into 'main'

Clean up linking of expat, xdot and label

See merge request graphviz/graphviz!2123

3 years agogvc: CMake: remove now obsolete linking to label
Magnus Jacobsson [Sat, 28 Aug 2021 05:54:59 +0000 (07:54 +0200)]
gvc: CMake: remove now obsolete linking to label

The gvc source files do not refer to label explicitly and any implicit
references are now resolved through common.

3 years agocommon: add linking to label
Magnus Jacobsson [Wed, 25 Aug 2021 18:05:50 +0000 (20:05 +0200)]
common: add linking to label

E.g. lib/common/postproc.c uses placeLabels from lib/label/xlabels.c.

This removes the need to link to label for downstream libraries that
do not explicitly use label.

3 years agogvc: CMake: remove now obsolete linking to xdot
Magnus Jacobsson [Sat, 28 Aug 2021 05:32:33 +0000 (07:32 +0200)]
gvc: CMake: remove now obsolete linking to xdot

The core plugin that previously relied on this now explicitly links to
xdot itself.

The gvc source files do not refer to xdot explicitly and any implicit
references are now resolved by the transitive dependency through
common.

3 years agoplugin/core: add linking to xdot
Magnus Jacobsson [Sat, 28 Aug 2021 05:26:25 +0000 (07:26 +0200)]
plugin/core: add linking to xdot

E.g. plugin/core/gvrender_core_dot.c uses parseXDot from
lib/xdot/xdot.c.

This will allow removal of unecessary linking to xdot in gvc in an
upcoming commit.

3 years agocommon: add linking to xdot
Magnus Jacobsson [Wed, 25 Aug 2021 18:15:41 +0000 (20:15 +0200)]
common: add linking to xdot

E.g. lib/common/emit.c. uses parseXDotF from lib/xdot/xdot.c.

This removes the need to link to xdot for downstream libraries that do
not explicitly use xdot.

3 years agogvc: CMake: replace now obsolete linking to expat
Magnus Jacobsson [Wed, 25 Aug 2021 21:38:40 +0000 (23:38 +0200)]
gvc: CMake: replace now obsolete linking to expat

The gvc source files do not refer to expat explicitly and any implicit
references are now resolved through common.

3 years agocommon: add linking to expat if we have it
Magnus Jacobsson [Wed, 25 Aug 2021 03:59:12 +0000 (05:59 +0200)]
common: add linking to expat if we have it

E.g. lib/common/htmllex.c uses XML_ParserCreate from
/usr/include/expat.h when we have expat.

This removes the need to link to expat for downstream libraries that
do not explicitly use expat.

3 years agoMerge branch 'clean-up-cgraph-linking' into 'main'
Magnus Jacobsson [Sun, 29 Aug 2021 21:03:02 +0000 (21:03 +0000)]
Merge branch 'clean-up-cgraph-linking' into 'main'

Clean up cgraph linking

See merge request graphviz/graphviz!2124

3 years agogvc: change to link to cgraph privately
Magnus Jacobsson [Sat, 28 Aug 2021 06:42:59 +0000 (08:42 +0200)]
gvc: change to link to cgraph privately

Downstream libraries that explicitly use cgraph now link to cgraph
themselves and no longer rely on a transitive dependency to cgraph
through gvc.

3 years agoplugin/neato_layout: remove now obsolete linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 08:12:04 +0000 (10:12 +0200)]
plugin/neato_layout: remove now obsolete linking to cgraph

The neato_layout source files do not refer to cgraph explicitly and
dependencies that need cgraph now all link to cgraph themselves.

3 years agoosage: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 17:44:05 +0000 (19:44 +0200)]
osage: add linking to cgraph

E.g. osageinit.c uses agfstnode from lib/cgraph/node.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agopatchwork: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 17:39:29 +0000 (19:39 +0200)]
patchwork: add linking to cgraph

E.g. patchwork.c uses agfstnode from lib/cgraph/node.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agotwopigen: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 17:32:22 +0000 (19:32 +0200)]
twopigen: add linking to cgraph

E.g. twopiinit.c uses agnode from lib/cgraph/node.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agoneatogen: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 17:22:00 +0000 (19:22 +0200)]
neatogen: add linking to cgraph

E.g. constraint.c uses agopen from lib/cgraph/graph.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agofdpgen: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 09:31:12 +0000 (11:31 +0200)]
fdpgen: add linking to cgraph

E.g. layout.c uses agopen from lib/cgraph/graph.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agocircogen: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 07:47:21 +0000 (09:47 +0200)]
circogen: add linking to cgraph

E.g. circularinit.c uses agopen from lib/cgraph/graph.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agoplugin/dot_layout: CMake: remove now obsolete linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 07:37:33 +0000 (09:37 +0200)]
plugin/dot_layout: CMake: remove now obsolete linking to cgraph

The dot_layout source files do not refer to cgraph explicitly and
dependencies that need cgraph now all link to cgraph themselves.

3 years agodotgen: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 07:35:39 +0000 (09:35 +0200)]
dotgen: add linking to cgraph

E.g. cluster.c uses agfstnode from lib/cgraph/node.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agocmd/gvpr: explicitly include cgraph.h in gvprmain.c
Magnus Jacobsson [Sat, 28 Aug 2021 07:25:45 +0000 (09:25 +0200)]
cmd/gvpr: explicitly include cgraph.h in gvprmain.c

gvprmain.c uses e.g. agread from cgraph.h and should not rely on an
implicit include through other header files.

3 years agodot: explicitly include cgraph.h in dot.c
Magnus Jacobsson [Sat, 28 Aug 2021 07:18:02 +0000 (09:18 +0200)]
dot: explicitly include cgraph.h in dot.c

dot.c uses e.g. agopen from cgraph.h and should not rely on an
implicit include through other header files.

3 years agoplugin/pango: add linking to cgraph
Magnus Jacobsson [Sat, 28 Aug 2021 06:09:16 +0000 (08:09 +0200)]
plugin/pango: add linking to cgraph

E.g. plugin/pango/gvgetfontlist_pango.c uses agxbinit from
lib/cgraph/agxbuf.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agocommon: add linking to cgraph
Magnus Jacobsson [Wed, 25 Aug 2021 03:59:12 +0000 (05:59 +0200)]
common: add linking to cgraph

E.g. lib/common/args.c uses agerr from lib/cgraph/agerror.c.

This removes the need to link to cgraph for downstream libraries that
do not explicitly use cgraph.

3 years agoMerge branch 'smattr/54AF45E5-AEC5-41BC-A85B-896646F2E566' into 'main'
Matthew Fernandez [Sun, 29 Aug 2021 19:12:41 +0000 (19:12 +0000)]
Merge branch 'smattr/54AF45E5-AEC5-41BC-A85B-896646F2E566' into 'main'

clean up Python configuration in Autotools

See merge request graphviz/graphviz!2122

3 years agoinline config_python.py into configure.ac
Matthew Fernandez [Sat, 28 Aug 2021 18:53:34 +0000 (11:53 -0700)]
inline config_python.py into configure.ac

This allows removing parts of this script that were unused. configure.ac was
already calling snippets of Python inline, so this is slightly more consistent.
Supersedes !1801.

3 years agoremove $PYTHON_VERSION_SHORT in Autotools
Matthew Fernandez [Sat, 28 Aug 2021 18:45:18 +0000 (11:45 -0700)]
remove $PYTHON_VERSION_SHORT in Autotools

This string is already available in $PYTHON_VERSION.

3 years agoremove a commented out Autotools line
Matthew Fernandez [Sat, 28 Aug 2021 18:44:25 +0000 (11:44 -0700)]
remove a commented out Autotools line

3 years agoremove Autotools probing of Python ≤ 2
Matthew Fernandez [Sat, 28 Aug 2021 18:40:53 +0000 (11:40 -0700)]
remove Autotools probing of Python ≤ 2

Final Python 2 support was removed in 61ae0419198465b457df875881a2dae0aadc8bfd.
But this configure logic was still attempting to discriminate between minor
Python 2 and Python 1 versions. After this change, we just simply reject
anything < Python 3.

Related to #1992.

3 years agoMerge branch 'upgrade-windows-libraries-to-rx-spencer-removal' into 'main'
Magnus Jacobsson [Sun, 29 Aug 2021 10:40:04 +0000 (10:40 +0000)]
Merge branch 'upgrade-windows-libraries-to-rx-spencer-removal' into 'main'

Update windows libraries submodule to get removal of rxSpencer

See merge request graphviz/graphviz!2121

3 years agoMerge branch 'pathplan-cmake-linking-cleanup' into 'main'
Magnus Jacobsson [Sat, 28 Aug 2021 19:04:20 +0000 (19:04 +0000)]
Merge branch 'pathplan-cmake-linking-cleanup' into 'main'

Clean up pathplan linking in CMake

See merge request graphviz/graphviz!2116

3 years agoUpdate windows libraries submodule to get removal of rxSpencer
Magnus Jacobsson [Sat, 28 Aug 2021 18:17:57 +0000 (20:17 +0200)]
Update windows libraries submodule to get removal of rxSpencer

3 years agoplugin/neato_layout: CMake: remove now obsolete linking to pathplan
Magnus Jacobsson [Fri, 27 Aug 2021 11:04:39 +0000 (13:04 +0200)]
plugin/neato_layout: CMake: remove now obsolete linking to pathplan

The neato_layout source files do not refer to pathplan explicitly and
any implicit references are now resolved by its dependencies
themselves.

3 years agofdpgen: CMake: add linking to pathplan
Magnus Jacobsson [Fri, 27 Aug 2021 10:55:31 +0000 (12:55 +0200)]
fdpgen: CMake: add linking to pathplan

E.g. lib/fdpgen/clusteredges.c uses Pobsopen from
lib/pathplan/vispath.h.

This removes the need to link to pathplan for downstream libraries
that do not explicitly use pathplan.

3 years agoplugin/dot_layout: CMake: remove now obsolete linking to pathplan
Magnus Jacobsson [Fri, 27 Aug 2021 07:22:21 +0000 (09:22 +0200)]
plugin/dot_layout: CMake: remove now obsolete linking to pathplan

The dot_layout source files do not refer to pathplan explicitly and
any implicit references are now resolved by its dependcies themselves.

3 years agomm2gv: CMake: remove now obsolete linking to pathplan
Magnus Jacobsson [Fri, 27 Aug 2021 07:22:21 +0000 (09:22 +0200)]
mm2gv: CMake: remove now obsolete linking to pathplan

The mm2gv source files do not refer to pathplan explicitly and any
implicit references are now resolved by its dependencies themselves.

3 years agogvc: CMake: replace now obsolete linking to pathplan with linking to common
Magnus Jacobsson [Wed, 25 Aug 2021 21:38:40 +0000 (23:38 +0200)]
gvc: CMake: replace now obsolete linking to pathplan with linking to common

The gvc source files do not refer to pathplan explicitly and any
implicit references are now resolved through common.

3 years agocommon: CMake: add linking to pathplan
Magnus Jacobsson [Wed, 25 Aug 2021 03:59:12 +0000 (05:59 +0200)]
common: CMake: add linking to pathplan

E.g. lib/common/emit.c uses freePath from lib/pathplan/util.c.

This removes the need to link to pathplan for downstream libraries
that do not explicitly use pathplan.

3 years agoMerge branch 'smattr/7E3E9771-0DB2-434D-8F36-9A9A7FE35055' into 'main'
Matthew Fernandez [Sat, 28 Aug 2021 18:04:29 +0000 (18:04 +0000)]
Merge branch 'smattr/7E3E9771-0DB2-434D-8F36-9A9A7FE35055' into 'main'

Start 2.49 development series

See merge request graphviz/graphviz!2120

3 years agoStart 2.49 development series
Matthew Fernandez [Sat, 28 Aug 2021 17:05:55 +0000 (10:05 -0700)]
Start 2.49 development series

3 years agoMerge branch 'smattr/455AF9C3-D61B-4F88-8BB9-50A67C6EF77D' into 'main' 2.49.0
Matthew Fernandez [Sat, 28 Aug 2021 17:03:42 +0000 (17:03 +0000)]
Merge branch 'smattr/455AF9C3-D61B-4F88-8BB9-50A67C6EF77D' into 'main'

Stable Release 2.49.0

See merge request graphviz/graphviz!2109

3 years agoStable Release 2.49.0
Matthew Fernandez [Tue, 24 Aug 2021 02:55:31 +0000 (19:55 -0700)]
Stable Release 2.49.0

3 years agoMerge branch 'smattr/494AC848-5CEA-4C42-9C10-C1F7AC93BDDC' into 'main'
Matthew Fernandez [Sat, 28 Aug 2021 15:04:28 +0000 (15:04 +0000)]
Merge branch 'smattr/494AC848-5CEA-4C42-9C10-C1F7AC93BDDC' into 'main'

fix dangerous-default-value issues in gvtest.py test suite support

See merge request graphviz/graphviz!2117

3 years agofix dangerous-default-value issues in gvtest.py test suite support
Matthew Fernandez [Fri, 27 Aug 2021 15:00:16 +0000 (08:00 -0700)]
fix dangerous-default-value issues in gvtest.py test suite support

Pylint warns that using `[]` as a default is dangerous due to modifications to
the parameter unintentionally persisting across calls. I do not believe that
happens in this case, but it is better to rephrase this code to pacify Pylint
and make it clearer to readers that this is not happening.

3 years agoMerge branch 'cleanup-useless-expat-referencing' into 'main'
Magnus Jacobsson [Thu, 26 Aug 2021 16:09:27 +0000 (16:09 +0000)]
Merge branch 'cleanup-useless-expat-referencing' into 'main'

Cleanup useless expat referencing

See merge request graphviz/graphviz!2114

3 years agomm2gv: remove unused expat include dir
Magnus Jacobsson [Wed, 25 Aug 2021 20:52:17 +0000 (22:52 +0200)]
mm2gv: remove unused expat include dir

3 years agogvpack: remove unused expat include dir
Magnus Jacobsson [Wed, 25 Aug 2021 20:51:56 +0000 (22:51 +0200)]
gvpack: remove unused expat include dir

3 years agogvgen: remove unused expat include dir
Magnus Jacobsson [Wed, 25 Aug 2021 20:51:50 +0000 (22:51 +0200)]
gvgen: remove unused expat include dir

3 years agogvcolor: remove unused expat include dir
Magnus Jacobsson [Wed, 25 Aug 2021 20:51:07 +0000 (22:51 +0200)]
gvcolor: remove unused expat include dir

3 years agogml2gv: remove unused expat include dir
Magnus Jacobsson [Wed, 25 Aug 2021 20:50:57 +0000 (22:50 +0200)]
gml2gv: remove unused expat include dir

3 years agodijkstra: remove unused expat include dir
Magnus Jacobsson [Wed, 25 Aug 2021 20:50:30 +0000 (22:50 +0200)]
dijkstra: remove unused expat include dir

3 years agosimple tools: remove unused expat include dir
Magnus Jacobsson [Wed, 25 Aug 2021 20:50:16 +0000 (22:50 +0200)]
simple tools: remove unused expat include dir

3 years agosccmap: remove unused expat as a dependency
Magnus Jacobsson [Wed, 25 Aug 2021 20:49:42 +0000 (22:49 +0200)]
sccmap: remove unused expat as a dependency

3 years agoMerge branch 'smattr/47F92637-628D-4E62-846C-499A66503C2F' into 'main'
Matthew Fernandez [Thu, 26 Aug 2021 14:52:25 +0000 (14:52 +0000)]
Merge branch 'smattr/47F92637-628D-4E62-846C-499A66503C2F' into 'main'

a few trivial clean up pieces

See merge request graphviz/graphviz!2113