]> granicus.if.org Git - graphviz/log
graphviz
2 years agoremove 'SMYRNA' #define
Matthew Fernandez [Tue, 29 Mar 2022 15:27:02 +0000 (08:27 -0700)]
remove 'SMYRNA' #define

This seems unused.

2 years agoCMake: consolidate Python checks
Matthew Fernandez [Tue, 29 Mar 2022 15:23:13 +0000 (08:23 -0700)]
CMake: consolidate Python checks

This essentially removes the conditional check, when an unconditional check was
already being performed later.

2 years agostandardize some CMake spacing
Matthew Fernandez [Tue, 29 Mar 2022 15:22:00 +0000 (08:22 -0700)]
standardize some CMake spacing

2 years agoGDI+ plugin: fix: swap duplicated 'gvwrite' prototypes for a header include
Matthew Fernandez [Tue, 29 Mar 2022 15:20:33 +0000 (08:20 -0700)]
GDI+ plugin: fix: swap duplicated 'gvwrite' prototypes for a header include

Note that these prototypes were wrong. `gvwrite` takes a `char` pointer not
`unsigned char` pointer, and a `size_t` not `unsigned int` length.

2 years agoabbreviate some trivial file reads and writes in Python
Matthew Fernandez [Tue, 29 Mar 2022 00:07:57 +0000 (17:07 -0700)]
abbreviate some trivial file reads and writes in Python

2 years agoMerge branch 'smattr/FE2C3BFC-BD30-47F6-A514-1367DC81F480' into 'main'
Matthew Fernandez [Sun, 3 Apr 2022 02:32:29 +0000 (02:32 +0000)]
Merge branch 'smattr/FE2C3BFC-BD30-47F6-A514-1367DC81F480' into 'main'

tests: suppress Boost deprecation compiler warnings

See merge request graphviz/graphviz!2550

2 years agotests: suppress Boost deprecation compiler warnings
Matthew Fernandez [Sat, 2 Apr 2022 00:25:28 +0000 (17:25 -0700)]
tests: suppress Boost deprecation compiler warnings

The third-party library Svgpp calls Boost in a way that is deprecated, resulting
in compiler warnings during the CMake build. This change teaches CMake that none
of this is our code and we do not want to be warned about it.

2 years agoMerge branch 'smattr/70525209-2ACA-491A-8B14-E34C24BB7949' into 'main'
Matthew Fernandez [Sun, 3 Apr 2022 00:11:21 +0000 (00:11 +0000)]
Merge branch 'smattr/70525209-2ACA-491A-8B14-E34C24BB7949' into 'main'

convert fc-fix.cpp from UTF-16 to UTF-8

See merge request graphviz/graphviz!2548

2 years agoclang-format fc-fix.cpp
Matthew Fernandez [Fri, 1 Apr 2022 00:41:55 +0000 (17:41 -0700)]
clang-format fc-fix.cpp

Given the prior commit rewrote every byte in this file, we may as well also fix
the odd white space decisions here while we are at it. Though it is unclear who
if anyone uses this tool any more.

2 years agoconvert fc-fix.cpp from UTF-16 to UTF-8
Matthew Fernandez [Fri, 1 Apr 2022 00:35:15 +0000 (17:35 -0700)]
convert fc-fix.cpp from UTF-16 to UTF-8

Of all the source files in the Graphviz tree, this file alone was encoded in
UTF-16 with a BOM.¹ BOMs have mostly fallen out of favor these days, with people
preferring to let the host operating system or locale determine encoding. Git
will happily translate text files to your local encoding on checkout. With that
in mind, we can convert this file to UTF-8 and stop forcing developers on other
operating systems to pay the price for Windows’ poor past decisions.

¹ https://en.wikipedia.org/wiki/Byte_order_mark

2 years agoMerge branch 'smattr/7C359EA7-F1EE-4BAD-A23C-32490FAF859B' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 22:46:32 +0000 (22:46 +0000)]
Merge branch 'smattr/7C359EA7-F1EE-4BAD-A23C-32490FAF859B' into 'main'

Xlib plugin, vimdot: Squash all warnings and enable in the CMake build system

See merge request graphviz/graphviz!2547

2 years agoCMake: enable xlib plugin and 'vimdot'
Matthew Fernandez [Wed, 30 Mar 2022 02:38:58 +0000 (19:38 -0700)]
CMake: enable xlib plugin and 'vimdot'

Gitlab: #1836

2 years agoxlib plugin xlib_initialize: squash a -Wsign-conversion warning
Matthew Fernandez [Thu, 31 Mar 2022 00:54:39 +0000 (17:54 -0700)]
xlib plugin xlib_initialize: squash a -Wsign-conversion warning

2 years agoxlib plugin init_window: squash a -Wsign-conversion warning
Matthew Fernandez [Thu, 31 Mar 2022 00:52:54 +0000 (17:52 -0700)]
xlib plugin init_window: squash a -Wsign-conversion warning

2 years agoxlib plugin handle_file_events: squash a -Wsign-conversion warning
Matthew Fernandez [Thu, 31 Mar 2022 00:24:16 +0000 (17:24 -0700)]
xlib plugin handle_file_events: squash a -Wsign-conversion warning

2 years agoxlib plugin handle_file_events: rephrase a switch into an if
Matthew Fernandez [Thu, 31 Mar 2022 00:21:22 +0000 (17:21 -0700)]
xlib plugin handle_file_events: rephrase a switch into an if

Avoids a -Wswitch-default warnings and simplifies the code that was clearly
indicating an intent to ignore everything except `IN_MODIFY`.

2 years agoxlib plugin handle_file_events: fix some misuse of types
Matthew Fernandez [Thu, 31 Mar 2022 00:18:19 +0000 (17:18 -0700)]
xlib plugin handle_file_events: fix some misuse of types

2 years agoxlib plugin handle_file_events: more tightly scope a long-lived dynamic buffer
Matthew Fernandez [Thu, 31 Mar 2022 00:16:20 +0000 (17:16 -0700)]
xlib plugin handle_file_events: more tightly scope a long-lived dynamic buffer

This buffer was being retained in a long-lived `static` pointer, increasing peak
memory usage and making it harder to use tools like Valgrind and ASan with
Graphviz. This change makes it more obvious to both users and tools what this
buffer is used for.

Note this also tweaks an error message to be more informative.

2 years agoxlib plugin handle_file_events: remove unnecessary cast and '&'
Matthew Fernandez [Thu, 31 Mar 2022 00:09:41 +0000 (17:09 -0700)]
xlib plugin handle_file_events: remove unnecessary cast and '&'

The `name` member of the `inotify_event` struct is a character array.

2 years agoxlib plugin handle_stdin_events: remove unused 'stdin_fd' parameter
Matthew Fernandez [Wed, 30 Mar 2022 15:31:11 +0000 (08:31 -0700)]
xlib plugin handle_stdin_events: remove unused 'stdin_fd' parameter

2 years agoxlib plugin init_window: squash -Wsign-conversion warning for window depth
Matthew Fernandez [Wed, 30 Mar 2022 15:30:24 +0000 (08:30 -0700)]
xlib plugin init_window: squash -Wsign-conversion warning for window depth

2 years agoxlib plugin init_window: squash -Wsign-conversion warnings for job
Matthew Fernandez [Wed, 30 Mar 2022 15:28:37 +0000 (08:28 -0700)]
xlib plugin init_window: squash -Wsign-conversion warnings for job

2 years agoxlib plugin update_display: squash -Wsign-conversion warning for window depth
Matthew Fernandez [Wed, 30 Mar 2022 15:26:36 +0000 (08:26 -0700)]
xlib plugin update_display: squash -Wsign-conversion warning for window depth

2 years agoxlib plugin update_display: squash -Wsign-conversion warnings for job
Matthew Fernandez [Wed, 30 Mar 2022 15:25:28 +0000 (08:25 -0700)]
xlib plugin update_display: squash -Wsign-conversion warnings for job

2 years agoxlib plugin handle_xlib_events: squash -Wswitch-default warning
Matthew Fernandez [Wed, 30 Mar 2022 15:20:48 +0000 (08:20 -0700)]
xlib plugin handle_xlib_events: squash -Wswitch-default warning

This switch is deliberately only handling the events of relevance to it.

2 years agoxlib plugin handle_xlib_events: squash -Wsign-conversion warnings
Matthew Fernandez [Wed, 30 Mar 2022 15:17:43 +0000 (08:17 -0700)]
xlib plugin handle_xlib_events: squash -Wsign-conversion warnings

The Xlib API¹ claims to only return buttons 1-5.

¹ See the table in
  https://www.x.org/releases/X11R7.7/doc/libX11/libX11/libX11.html#Keyboard_and_Pointer_Events_b

2 years agoxlib plugin handle_expose: squash -Wsign-conversion warnings
Matthew Fernandez [Wed, 30 Mar 2022 15:10:47 +0000 (08:10 -0700)]
xlib plugin handle_expose: squash -Wsign-conversion warnings

2 years agoCMake: fix fcntl.h detection
Matthew Fernandez [Wed, 30 Mar 2022 05:00:51 +0000 (22:00 -0700)]
CMake: fix fcntl.h detection

This seems to have gone unnoticed because none of the Graphviz components
currently integrated into the CMake build system rely critically on fcntl.h.
This issue was discovered when integrating the xlib plugin.

2 years agoCMake: drop some conditional pkgconf logic in glcomp
Matthew Fernandez [Wed, 30 Mar 2022 02:39:54 +0000 (19:39 -0700)]
CMake: drop some conditional pkgconf logic in glcomp

pkgconf has already been unconditionally required prior to these lines.

2 years agoCMake: standardize on lowercase for functions
Matthew Fernandez [Wed, 30 Mar 2022 14:58:01 +0000 (07:58 -0700)]
CMake: standardize on lowercase for functions

2 years agoadd Gentoo and David Seifert to downstream packaging list
Matthew Fernandez [Wed, 30 Mar 2022 14:56:38 +0000 (07:56 -0700)]
add Gentoo and David Seifert to downstream packaging list

2 years agoMerge branch 'fix-uninitialized-variables' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 19:51:49 +0000 (19:51 +0000)]
Merge branch 'fix-uninitialized-variables' into 'main'

fix some uninitialized variables

See merge request graphviz/graphviz!2536

2 years agopango: initialize a variable
Costa Shulyupin [Sun, 27 Mar 2022 04:10:40 +0000 (07:10 +0300)]
pango: initialize a variable

Squash
warning: ‘availfaces’ may be used uninitialized in this function

Actually uninitialized value is not used because it is used
in pair with family_name, but compiler still complains.
So just add initializtion.

2 years agogvpr: initialize a variable
Costa Shulyupin [Sun, 27 Mar 2022 04:09:51 +0000 (07:09 +0300)]
gvpr: initialize a variable

Squash
warning: ‘alpha’ may be used uninitialized in this function

One branch of conditional statement leaves variable alpha
uninitialized. Actually uninitialized value is not used,
but compiler still complains. So just add one assignment to
assumed 0.

BTW, the code can be refactored and shortened.
But it is preferable to just minimize the changes.

2 years agodotgen: initialize a variable
Costa Shulyupin [Sun, 27 Mar 2022 04:08:50 +0000 (07:08 +0300)]
dotgen: initialize a variable

warning: ‘maxthispass’ may be used uninitialized in this function

2 years agotools: initialize a variable
Costa Shulyupin [Sun, 27 Mar 2022 04:07:38 +0000 (07:07 +0300)]
tools: initialize a variable

Squashing
warning: ‘sym’ may be used uninitialized in this function

Here was no real usage of uninitialized variable, but
compiler still complains.

Pointer sym is allocated when flag with_val is set:

    if (with_val) {
        sym = agattr(g, AGEDGE, "len", "1");
    }

So just squash the warning by setting the
pointer to NULL and test it in guard condition
instead of testing the flag:

            if (sym && val) {
                sprintf(buf, "%f", val[j]);
                agxset(e, sym, buf);
            }

2 years agohtmltable: initialize a variable
Costa Shulyupin [Sun, 27 Mar 2022 03:51:12 +0000 (06:51 +0300)]
htmltable: initialize a variable

Squash
warning: ‘mxysize’ may be used uninitialized in this function [-Wmaybe-uninitialized]

2 years agoMerge branch 'smattr/3404C6B4-EB48-44F0-8CD6-983567F718EC' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 18:52:08 +0000 (18:52 +0000)]
Merge branch 'smattr/3404C6B4-EB48-44F0-8CD6-983567F718EC' into 'main'

gvgen: remove unused unistd.h #include

See merge request graphviz/graphviz!2543

2 years agogvgen makeTreeGen: squash a 'time_t'→'unsigned' conversion warning
Matthew Fernandez [Wed, 30 Mar 2022 04:18:39 +0000 (21:18 -0700)]
gvgen makeTreeGen: squash a 'time_t'→'unsigned' conversion warning

2 years agogvgen makeRandom: squash a 'time_t'→'unsigned' conversion warning
Matthew Fernandez [Wed, 30 Mar 2022 04:17:48 +0000 (21:17 -0700)]
gvgen makeRandom: squash a 'time_t'→'unsigned' conversion warning

2 years agogvgen makeTree: remove use of 'unsigned int' type mixing
Matthew Fernandez [Wed, 30 Mar 2022 04:15:32 +0000 (21:15 -0700)]
gvgen makeTree: remove use of 'unsigned int' type mixing

Everything else in this function including its callers and callees uses `int`.
Using `unsigned int` within it was leading to MSVC C4018 warnings.

2 years agogvgen: remove unused unistd.h #include
Matthew Fernandez [Wed, 30 Mar 2022 04:12:39 +0000 (21:12 -0700)]
gvgen: remove unused unistd.h #include

Gitlab: #2204

2 years agoMerge branch 'smattr/E49AF984-3CD6-407B-A6F9-EB8A1DF600FB' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 16:18:37 +0000 (16:18 +0000)]
Merge branch 'smattr/E49AF984-3CD6-407B-A6F9-EB8A1DF600FB' into 'main'

CMake: enable DevIL plugin

See merge request graphviz/graphviz!2549

2 years agoMerge branch 'smattr/0C611C83-0C0E-441A-8341-2736681C3F5F' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 15:59:24 +0000 (15:59 +0000)]
Merge branch 'smattr/0C611C83-0C0E-441A-8341-2736681C3F5F' into 'main'

remove build system support for Lefty

See merge request graphviz/graphviz!2542

2 years agoCMake: enable DevIL plugin
Matthew Fernandez [Fri, 1 Apr 2022 00:20:34 +0000 (17:20 -0700)]
CMake: enable DevIL plugin

Gitlab: #1836

2 years agoremove build system support for 'lefty'
Matthew Fernandez [Tue, 29 Mar 2022 03:52:37 +0000 (20:52 -0700)]
remove build system support for 'lefty'

04a78cc9ae01b2a7e5d5435146cd503c45af90b9 disabled Lefty in the Autotools build
system. The only fall out from this seems to have been Gentoo discovering
mistakes in the Graphviz Autotools files.¹ With mild evidence that there is no
one downstream relying on Lefty, we take the next step in its removal. If
another three months pass with no issues, we can remove Lefty from the Graphviz
tree altogether.

CC: David Seifert <soap@gentoo.org>
Gitlab: related to #1836, #1854

¹ https://gitlab.com/graphviz/graphviz/-/merge_requests/2520

2 years agoremove build system support for 'dotty'
Matthew Fernandez [Tue, 29 Mar 2022 15:05:33 +0000 (08:05 -0700)]
remove build system support for 'dotty'

`dotty` is built on top of `lefty` which is deprecated and will be removed in a
future commit.

2 years agoremove build system support for 'lneato'
Matthew Fernandez [Tue, 29 Mar 2022 14:59:05 +0000 (07:59 -0700)]
remove build system support for 'lneato'

`lneato` is built on top of `lefty` which is deprecated and will be removed in a
future commit.

2 years agoMerge branch 'smattr/B664DAE8-8F55-42C9-A090-8D658C3F6777' into 'main'
Matthew Fernandez [Sat, 2 Apr 2022 01:23:20 +0000 (01:23 +0000)]
Merge branch 'smattr/B664DAE8-8F55-42C9-A090-8D658C3F6777' into 'main'

WebP plugin: squash warnings and enable in the CMake build system

See merge request graphviz/graphviz!2546

2 years agoCMake: enable WebP plugin
Matthew Fernandez [Thu, 31 Mar 2022 03:49:05 +0000 (20:49 -0700)]
CMake: enable WebP plugin

Gitlab: #1836

2 years agoWebP plugin: remove unnecessary parens
Matthew Fernandez [Thu, 31 Mar 2022 03:42:14 +0000 (20:42 -0700)]
WebP plugin: remove unnecessary parens

2 years agowebp_loadimage_cairo: squash -Wunused-parameter warning
Matthew Fernandez [Thu, 31 Mar 2022 03:38:56 +0000 (20:38 -0700)]
webp_loadimage_cairo: squash -Wunused-parameter warning

This function is used as a callback, so needs to have this type signature.

2 years agowebp_really_loadimage: correct type for 'data_size'
Matthew Fernandez [Thu, 31 Mar 2022 03:36:40 +0000 (20:36 -0700)]
webp_really_loadimage: correct type for 'data_size'

Squashes a -Wconversion warning.

2 years agowebp_format: squash -Wsign-conversion warnings
Matthew Fernandez [Thu, 31 Mar 2022 03:30:34 +0000 (20:30 -0700)]
webp_format: squash -Wsign-conversion warnings

2 years agoWebP plugin: remove unnecessary casts
Matthew Fernandez [Thu, 31 Mar 2022 03:24:14 +0000 (20:24 -0700)]
WebP plugin: remove unnecessary casts

2 years agoMerge branch 'smattr/495CECF8-863F-4028-A599-2376050D52EA' into 'main'
Matthew Fernandez [Fri, 1 Apr 2022 06:13:03 +0000 (06:13 +0000)]
Merge branch 'smattr/495CECF8-863F-4028-A599-2376050D52EA' into 'main'

upgrade Pylint

See merge request graphviz/graphviz!2545

2 years agoupgrade Pylint
Matthew Fernandez [Thu, 31 Mar 2022 00:33:35 +0000 (17:33 -0700)]
upgrade Pylint

2 years agoMerge branch 'smattr/A69045D6-DB2A-400C-AAC4-6E626F818E3E' into 'main'
Matthew Fernandez [Fri, 1 Apr 2022 00:01:11 +0000 (00:01 +0000)]
Merge branch 'smattr/A69045D6-DB2A-400C-AAC4-6E626F818E3E' into 'main'

CI: remove Ubuntu 21.04

See merge request graphviz/graphviz!2544

2 years agoCI: remove Ubuntu 21.04
Matthew Fernandez [Thu, 31 Mar 2022 03:07:46 +0000 (20:07 -0700)]
CI: remove Ubuntu 21.04

Ubuntu 21.04 was EOLed on 2022-01-20.¹

¹ https://wiki.ubuntu.com/Releases

2 years agoMerge branch 'smattr/0F04F849-05F9-46B6-A6B8-B4DB5F4DBF82' into 'main'
Matthew Fernandez [Wed, 30 Mar 2022 04:02:47 +0000 (04:02 +0000)]
Merge branch 'smattr/0F04F849-05F9-46B6-A6B8-B4DB5F4DBF82' into 'main'

remove 'WIN32_LEAN_AND_MEAN' manipulation

See merge request graphviz/graphviz!2538

2 years agoremove 'WIN32_LEAN_AND_MEAN' manipulation
Matthew Fernandez [Sun, 27 Mar 2022 02:39:53 +0000 (19:39 -0700)]
remove 'WIN32_LEAN_AND_MEAN' manipulation

This macro is a legacy toggle to suppress parts of the Windows API surface in
order to accelerate compilation. In a parallel compilation of a code base the
size of Graphviz, it has a negligible effect. As always, Raymond Chen gives the
back story.¹ This commit removes these tricks to ease future maintenance.

¹ https://devblogs.microsoft.com/oldnewthing/20091130-00/?p=15863

2 years agoMerge branch 'smattr/469B07AD-AF55-4239-AFAD-9601CEFA4059' into 'main'
Matthew Fernandez [Wed, 30 Mar 2022 01:20:49 +0000 (01:20 +0000)]
Merge branch 'smattr/469B07AD-AF55-4239-AFAD-9601CEFA4059' into 'main'

CMake: enable Smyrna on Linux

See merge request graphviz/graphviz!2540

2 years agoCI: enable Smyrna on Ubuntu CMake jobs
Matthew Fernandez [Tue, 22 Mar 2022 01:20:19 +0000 (18:20 -0700)]
CI: enable Smyrna on Ubuntu CMake jobs

2 years agoCMake: enable 'smyrna'
Matthew Fernandez [Mon, 21 Mar 2022 04:02:58 +0000 (21:02 -0700)]
CMake: enable 'smyrna'

Gitlab: #1836, #1854

2 years agotests: strip 'XType' warnings in '-?' usage test
Matthew Fernandez [Sat, 26 Mar 2022 19:36:30 +0000 (12:36 -0700)]
tests: strip 'XType' warnings in '-?' usage test

On macOS, Smyrna prints some warnings prior to the usage text:

  2022-03-26 19:32:21.216 smyrna[70079:124370] XType: com.apple.fonts is not
    accessible.
  2022-03-26 19:32:21.216 smyrna[70079:124370] XType: XTFontStaticRegistry is
    enabled.
  Usage: smyrna [-v?] <file>

Gitlab: related to #1836, #1854

2 years agotests: when squashing macOS 'XType' warnings, also swallow trailing '\n'
Matthew Fernandez [Sun, 27 Mar 2022 18:20:16 +0000 (11:20 -0700)]
tests: when squashing macOS 'XType' warnings, also swallow trailing '\n'

Enabling Smyrna on macOS fails the test `test_tools` because running `smyrna -?`
outputs some XType warnings prior to the usage text. Suppressing these with
`remove_xtype_warnings` still does not fix the issue because the seen text now
begins “\n\nusage:…”. This change makes `remove_xtype_warnings` act more
precisely and strip the end of line character that is part of the warning as
well.

Gitlab: related to #1836, #1854

2 years agotests: move 'XType' stripping into a library function
Matthew Fernandez [Sat, 26 Mar 2022 19:40:01 +0000 (12:40 -0700)]
tests: move 'XType' stripping into a library function

We will need to use this in another test case in an upcoming commit.

2 years agolib/glcomp: silence deprecation warnings
Matthew Fernandez [Sat, 26 Mar 2022 01:42:46 +0000 (18:42 -0700)]
lib/glcomp: silence deprecation warnings

Warnings about OpenGL function usage fail the CMake build when Smyrna is enabled
on macOS.

Gitlab: related to #1836, #1854

2 years agoadd an OpenGL abstraction header
Matthew Fernandez [Thu, 24 Mar 2022 04:18:20 +0000 (21:18 -0700)]
add an OpenGL abstraction header

On macOS, the OpenGL implementation is provided by the XCode SDK under the
“OpenGL/” prefix instead of “GL/” as on other operating systems. Note that
glut.h is still provided by the Freeglut package under “GL/”.

Gitlab: related to #1836, #1854

2 years agoCI: replicate Qt tweak explanation from one macOS file into another
Matthew Fernandez [Wed, 23 Mar 2022 03:39:41 +0000 (20:39 -0700)]
CI: replicate Qt tweak explanation from one macOS file into another

Makes it slightly less cryptic to the reader why these steps are being done.

2 years agoCMake: make all glcomp checks required if 'with_smyrna=ON'
Matthew Fernandez [Tue, 22 Mar 2022 14:43:27 +0000 (07:43 -0700)]
CMake: make all glcomp checks required if 'with_smyrna=ON'

Given there is a build system flag `with_smyrna` that defaults to `OFF`, it
seems to make more sense to unconditionally attempt to build glcomp when this
flag is on. The current silent disabling behavior when dependencies are missing
results in a confusing link failure when glcomp cannot be found. Following this
change, this is instead a configuration failure pointing to the missing
dependency(ies).

2 years agoMerge branch 'smattr/A63E118C-81BA-4D68-8659-80C2FE6883AE' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 17:31:43 +0000 (17:31 +0000)]
Merge branch 'smattr/A63E118C-81BA-4D68-8659-80C2FE6883AE' into 'main'

move installation test into CI-only tests

See merge request graphviz/graphviz!2528

2 years agomove installation test into CI-only tests
Matthew Fernandez [Thu, 24 Mar 2022 02:24:52 +0000 (19:24 -0700)]
move installation test into CI-only tests

This test was introduced in !1347¹ in response to some version confusion due to
the Graphviz version being generated in several different places. Locally, this
test could fail misleadingly if the developer had new commits in their Graphviz
checkout and had not recompiled. But these failures are not relevant; running
the test suite against a slightly different version of Graphviz should not
unconditionally fail one of the tests. Moreover a developer working locally is
generally only running a single work flow, so their local Graphviz version is
generated in a single place.

The place where we do worry about version divergence is in CI, where the steps
for generating the Graphviz version for different platforms are in different
places and can accidentally skew. So this change makes the test only run in CI,
not locally.

Note that we can also drop the conditional logic to recover the version from the
GRAPHVIZ_VERSION file because the `$GV_VERSION` environment variable is defined
in all the CI testing jobs.

¹ https://gitlab.com/graphviz/graphviz/-/merge_requests/1347

2 years agoMerge branch 'smattr/6E28F98D-AFCD-4FD0-8D05-340CC2F883A7' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 15:19:05 +0000 (15:19 +0000)]
Merge branch 'smattr/6E28F98D-AFCD-4FD0-8D05-340CC2F883A7' into 'main'

CMake: some minor clean up

See merge request graphviz/graphviz!2534

2 years agoCMake: replace a hard-coded libm reference with '$MATH_LIB'
Matthew Fernandez [Sat, 26 Mar 2022 18:39:42 +0000 (11:39 -0700)]
CMake: replace a hard-coded libm reference with '$MATH_LIB'

2 years agoCMake: use 'SYSTEM' for third-party include directories
Matthew Fernandez [Sat, 26 Mar 2022 18:37:29 +0000 (11:37 -0700)]
CMake: use 'SYSTEM' for third-party include directories

This tells CMake to use `-isystem` for these directories instead of `-I`,
suppressing any compiler warnings in third-party code.

2 years agoCMake: fix indentation in lib/mingle’s CMakeLists.txt
Matthew Fernandez [Sat, 26 Mar 2022 18:32:26 +0000 (11:32 -0700)]
CMake: fix indentation in lib/mingle’s CMakeLists.txt

2 years agolneato on Windows: remove unused 'panic' function
Matthew Fernandez [Sat, 26 Mar 2022 18:20:18 +0000 (11:20 -0700)]
lneato on Windows: remove unused 'panic' function

2 years agoCMake: remove generator expressions in comments
Matthew Fernandez [Sat, 26 Mar 2022 18:16:26 +0000 (11:16 -0700)]
CMake: remove generator expressions in comments

Generator expressions¹ within strings are not expanded. So these lines were
leading to confusing build output indicating the literal text of the generator
expression was being symlinked:

  [ 79%] Linking C executable dot
  Linking $<TARGET_FILE_NAME:dot> as circo
  Linking $<TARGET_FILE_NAME:dot> as fdp
  Linking $<TARGET_FILE_NAME:dot> as neato
  Linking $<TARGET_FILE_NAME:dot> as osage
  Linking $<TARGET_FILE_NAME:dot> as patchwork
  Linking $<TARGET_FILE_NAME:dot> as sfdp
  Linking $<TARGET_FILE_NAME:dot> as twopi
  [ 79%] Built target dot

¹ https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html

2 years agoMerge branch 'smattr/AEEEBED2-E88B-4F17-BA22-76A206A83DAD' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 05:51:29 +0000 (05:51 +0000)]
Merge branch 'smattr/AEEEBED2-E88B-4F17-BA22-76A206A83DAD' into 'main'

gdiplus plugin: remove MS Visual Studio 8 patches

See merge request graphviz/graphviz!2539

2 years agogdiplus plugin: remove MS Visual Studio 8 patches
Matthew Fernandez [Sun, 27 Mar 2022 22:20:58 +0000 (15:20 -0700)]
gdiplus plugin: remove MS Visual Studio 8 patches

These patches appear to have been working around some non-portable code in the
headers shipped with Microsoft Visual Studio 8 (a.k.a. Microsoft Visual Studio
2005). This version of Visual Studio was EOLed on 2016-04-12. Neither the CMake
nor MS Build build systems (the only CI environments for which compilation of
this plugin is enabled) were using these patches. So apparently they have not
been useful for a long time.

2 years agoMerge branch 'smattr/17FC7676-22B2-48E6-9D6F-0BC12096581A' into 'main'
Matthew Fernandez [Tue, 29 Mar 2022 03:08:43 +0000 (03:08 +0000)]
Merge branch 'smattr/17FC7676-22B2-48E6-9D6F-0BC12096581A' into 'main'

remove unused Smyrna icons

See merge request graphviz/graphviz!2537

2 years agoshare/gui: remove duplicate 'zoom.png'
Matthew Fernandez [Wed, 23 Mar 2022 02:42:42 +0000 (19:42 -0700)]
share/gui: remove duplicate 'zoom.png'

2 years agoshare/gui: remove duplicate 'move.png'
Matthew Fernandez [Wed, 23 Mar 2022 02:41:55 +0000 (19:41 -0700)]
share/gui: remove duplicate 'move.png'

2 years agoremove 'rect_select*.png' Smyrna icons
Matthew Fernandez [Wed, 23 Mar 2022 02:32:14 +0000 (19:32 -0700)]
remove 'rect_select*.png' Smyrna icons

These appear to have never been used.

2 years agoremove 'preview.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:29:14 +0000 (19:29 -0700)]
remove 'preview.png' Smyrna icon

This appears to have never been used.

2 years agoshare/gui: remove duplicate pan.png
Matthew Fernandez [Wed, 23 Mar 2022 02:27:31 +0000 (19:27 -0700)]
share/gui: remove duplicate pan.png

2 years agoremove 'node.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:27:04 +0000 (19:27 -0700)]
remove 'node.png' Smyrna icon

This seems to have never been used.

2 years agoremove 'fit.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:22:51 +0000 (19:22 -0700)]
remove 'fit.png' Smyrna icon

The last use of this was removed in 68ba63a7c72e61bc0b2f12db9041f4dde4ab47cf.

2 years agoremove 'fish.PNG' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:19:43 +0000 (19:19 -0700)]
remove 'fish.PNG' Smyrna icon

This seems to have never been used.

2 years agoremove 'edge.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:18:19 +0000 (19:18 -0700)]
remove 'edge.png' Smyrna icon

This seems to have never been used.

2 years agoremove 'ltwopi.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:15:06 +0000 (19:15 -0700)]
remove 'ltwopi.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'lneato.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:13:43 +0000 (19:13 -0700)]
remove 'lneato.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'lfdp.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:12:31 +0000 (19:12 -0700)]
remove 'lfdp.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'ldot.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:09:54 +0000 (19:09 -0700)]
remove 'ldot.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'lcirco.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:08:27 +0000 (19:08 -0700)]
remove 'lcirco.png' Smyrna icon

The last use of this was removed in 89ba8c1507b84cef5bc892322ee767ed048101f4.

2 years agoremove 'glade-3.png' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:07:01 +0000 (19:07 -0700)]
remove 'glade-3.png' Smyrna icon

This seems to have never been used.

2 years agoremove 'dot.PNG' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 02:05:38 +0000 (19:05 -0700)]
remove 'dot.PNG' Smyrna icon

This seems to have never been used.

2 years agoremove 'rotate.*' Smyrna icons
Matthew Fernandez [Wed, 23 Mar 2022 01:51:51 +0000 (18:51 -0700)]
remove 'rotate.*' Smyrna icons

The last use of these was removed in f565e185203d287fd659af1f11d83bcf44c351f3.

2 years agoremove 'zoomplus.raw' Smyrna icon
Matthew Fernandez [Wed, 23 Mar 2022 01:49:17 +0000 (18:49 -0700)]
remove 'zoomplus.raw' Smyrna icon

The last use of this was removed in 9a9cfd4e90775aa14a11a0db6745783f3a59ef56.