]> granicus.if.org Git - graphviz/log
graphviz
2 years agoenable 'dot_builtins' in RPM package
Matthew Fernandez [Mon, 7 Feb 2022 06:49:36 +0000 (17:49 +1100)]
enable 'dot_builtins' in RPM package

It is not clear why this was excluded. This partially reverts
e5f514b283fa5fe8690f7d82fe7555e8ce74e371.

Gitlab: closes #1839

2 years agoCI: on RHEL distros, install all RPMs
Matthew Fernandez [Mon, 7 Feb 2022 07:44:11 +0000 (18:44 +1100)]
CI: on RHEL distros, install all RPMs

Commit c334e4e81aad15d3092d7c25038a4d2cf1cbff05 altered this step to only
install RPMs necessary for the test suite at the time. However, an upcoming
commit that enables `dot_builtins` causes graphviz-nox-* to depend on
libgvplugin_webp.so.6 that was not being installed. For simplicity, the present
commit reverts c334e4e81aad15d3092d7c25038a4d2cf1cbff05.

Note that this more closely matches the only reasonable way to use the
CI-produced RPMs: install all of them.

Gitlab: related to #1839

2 years agoCI: install R on Fedora
Matthew Fernandez [Mon, 7 Feb 2022 10:05:58 +0000 (21:05 +1100)]
CI: install R on Fedora

An upcoming commit will install the Graphviz R language bindings. These depend
on the `R` package that is not a dependency of any other currently installed
package.

Gitlab: related to #1839

2 years agoCI: install Perl on Fedora
Matthew Fernandez [Mon, 7 Feb 2022 10:03:26 +0000 (21:03 +1100)]
CI: install Perl on Fedora

An upcoming commit will install the Graphviz Perl language bindings. These
depend on the `perl` package that is not a dependency of any other currently
installed package.

Gitlab: related to #1839

2 years agoMerge branch 'smattr/1301EC82-E002-4551-8386-BB449F2816D6' into 'main'
Matthew Fernandez [Tue, 8 Feb 2022 03:32:15 +0000 (03:32 +0000)]
Merge branch 'smattr/1301EC82-E002-4551-8386-BB449F2816D6' into 'main'

API BREAK: fix: typedef 'ssize_t' to 'SSIZE_T' on Windows

Closes #1804

See merge request graphviz/graphviz!2433

2 years agoAPI BREAK: fix: typedef 'ssize_t' to 'SSIZE_T' on Windows
Matthew Fernandez [Mon, 7 Feb 2022 05:29:27 +0000 (16:29 +1100)]
API BREAK: fix: typedef 'ssize_t' to 'SSIZE_T' on Windows

In several places, code was using `int` as a drop-in replacement for `ssize_t`
on Windows where it does not exist. This is incorrect on some platforms. E.g. on
x86-64 this will result in `ssize_t` being a 32-bit type instead of a 64-bit
type. This change replaces it with the correct Windows equivalent, `SSIZE_T`.¹

¹ https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types?redirectedfrom=MSDN#ssize_t

Gitlab: fixes #1804

2 years agoMerge branch 'smattr/4F4E0C69-AA2D-473F-A930-83FC0A256AAF' into 'main'
Matthew Fernandez [Mon, 7 Feb 2022 08:52:43 +0000 (08:52 +0000)]
Merge branch 'smattr/4F4E0C69-AA2D-473F-A930-83FC0A256AAF' into 'main'

some non-functional changes for simplification/cleanup

See merge request graphviz/graphviz!2432

2 years agonetogen: [nfc] rewrite 'push' and 'pop' macros as functions
Matthew Fernandez [Sun, 6 Feb 2022 06:51:16 +0000 (17:51 +1100)]
netogen: [nfc] rewrite 'push' and 'pop' macros as functions

There is no need for these to be macros. Modern compilers will easily inline
these helpers. Making them functions provides additional type safety.

2 years agoneatogen: [nfc] remove unused 'read_top' macro
Matthew Fernandez [Sun, 6 Feb 2022 06:51:26 +0000 (17:51 +1100)]
neatogen: [nfc] remove unused 'read_top' macro

This macro also appears to be incorrect; it does not use its parameter `h` but
instead uses `s`.

2 years agogrammar.y startgraph: [nfc] remove a static local
Matthew Fernandez [Sun, 6 Feb 2022 06:19:35 +0000 (17:19 +1100)]
grammar.y startgraph: [nfc] remove a static local

A simpler way of achieving the warning squashing the comment here is implying
(uninitialized struct members) is to avoid the use of a static variable
altogether. Beyond being simpler, this explains to the compiler the contents of
this variable do not need to be preserved across calls and gets this function
closer to being thread safe.

2 years agogrammar.y pop: [nfc] fix incorrect pop from global stack
Matthew Fernandez [Sun, 6 Feb 2022 06:03:48 +0000 (17:03 +1100)]
grammar.y pop: [nfc] fix incorrect pop from global stack

This function was incorrectly referencing the global stack, `S`, instead of the
stack passed in. This change is marked NFC because `pop` is only ever called
with `S` as a parameter, but it still seemed worth correcting.

2 years agoMerge branch 'smattr/886DC5C9-BF2B-47F2-9E00-7083AAB2423F' into 'main'
Matthew Fernandez [Sun, 6 Feb 2022 21:39:02 +0000 (21:39 +0000)]
Merge branch 'smattr/886DC5C9-BF2B-47F2-9E00-7083AAB2423F' into 'main'

lib/pack cleanup

See merge request graphviz/graphviz!2430

2 years agogml2gv: [nfc] remove unnecessary include
Matthew Fernandez [Sat, 5 Feb 2022 06:19:57 +0000 (17:19 +1100)]
gml2gv: [nfc] remove unnecessary include

2 years agolib/pack: [nfc] remove duplicate include
Matthew Fernandez [Sat, 5 Feb 2022 07:14:05 +0000 (18:14 +1100)]
lib/pack: [nfc] remove duplicate include

2 years agolib/pack: [nfc] remove open coded NULLs
Matthew Fernandez [Sat, 5 Feb 2022 07:13:52 +0000 (18:13 +1100)]
lib/pack: [nfc] remove open coded NULLs

2 years agolib/pack: [nfc] remove unnecessary parens
Matthew Fernandez [Sat, 5 Feb 2022 06:56:44 +0000 (17:56 +1100)]
lib/pack: [nfc] remove unnecessary parens

2 years agoinsertFn: [nfc] remove unnecessary cast
Matthew Fernandez [Sat, 5 Feb 2022 06:43:55 +0000 (17:43 +1100)]
insertFn: [nfc] remove unnecessary cast

2 years agoMerge branch 'upgrade-to-macos-12-xcode-13' into 'main'
Magnus Jacobsson [Sun, 6 Feb 2022 18:59:48 +0000 (18:59 +0000)]
Merge branch 'upgrade-to-macos-12-xcode-13' into 'main'

Upgrade to MacOS 12, Xcode 13

See merge request graphviz/graphviz!2370

2 years agoCI: upgrade to macos-12-xcode-13
Magnus Jacobsson [Mon, 27 Dec 2021 16:46:00 +0000 (17:46 +0100)]
CI: upgrade to macos-12-xcode-13

2 years agoMerge branch 'smattr/F06FAC81-75F7-4E90-9AA8-368F7D31E8D8' into 'main'
Matthew Fernandez [Sat, 5 Feb 2022 06:08:32 +0000 (06:08 +0000)]
Merge branch 'smattr/F06FAC81-75F7-4E90-9AA8-368F7D31E8D8' into 'main'

cmd/tools: [nfc] some minor cleanup

See merge request graphviz/graphviz!2429

2 years agogxl2gv: [nfc] remove the need to cast 'mapLookup' parameter
Matthew Fernandez [Sat, 5 Feb 2022 01:34:19 +0000 (12:34 +1100)]
gxl2gv: [nfc] remove the need to cast 'mapLookup' parameter

The equivalent of the prior commit on gxl2gv.

2 years agographml2gv: [nfc] remove the need to cast 'mapLookup' parameter
Matthew Fernandez [Sat, 5 Feb 2022 01:32:53 +0000 (12:32 +1100)]
graphml2gv: [nfc] remove the need to cast 'mapLookup' parameter

2 years agographml2gv: [nfc] remove the need to cast 'isAnonGraph' parameter
Matthew Fernandez [Sat, 5 Feb 2022 01:30:21 +0000 (12:30 +1100)]
graphml2gv: [nfc] remove the need to cast 'isAnonGraph' parameter

Equivalent of 3e09cc381e53ece08529dd35d27a7a436dd9ab0f on graphml2gv.

2 years agoMerge branch 'smattr/729B6BDD-7A42-455A-8B12-AA2F3A929663' into 'main'
Matthew Fernandez [Fri, 4 Feb 2022 09:53:50 +0000 (09:53 +0000)]
Merge branch 'smattr/729B6BDD-7A42-455A-8B12-AA2F3A929663' into 'main'

add a test case for #2092

See merge request graphviz/graphviz!2427

2 years agodot2gxl: de-dupe 'gcalloc' implementation
Matthew Fernandez [Thu, 3 Feb 2022 04:06:12 +0000 (15:06 +1100)]
dot2gxl: de-dupe 'gcalloc' implementation

2 years agodot2gxl: [nfc] remove the need to cast 'isAnonGraph' parameter
Matthew Fernandez [Thu, 3 Feb 2022 03:55:57 +0000 (14:55 +1100)]
dot2gxl: [nfc] remove the need to cast 'isAnonGraph' parameter

2 years agoadd a test case for #2092
Matthew Fernandez [Thu, 3 Feb 2022 01:02:06 +0000 (12:02 +1100)]
add a test case for #2092

2 years agoMerge branch 'smattr/E428EEE4-08B8-472D-B3B6-87C93C5D321E' into 'main'
Matthew Fernandez [Fri, 4 Feb 2022 08:00:00 +0000 (08:00 +0000)]
Merge branch 'smattr/E428EEE4-08B8-472D-B3B6-87C93C5D321E' into 'main'

minor test clean up

See merge request graphviz/graphviz!2425

2 years agotest 1594: [nfc] tell 'subprocess' to discard stdout
Matthew Fernandez [Tue, 1 Feb 2022 10:26:56 +0000 (21:26 +1100)]
test 1594: [nfc] tell 'subprocess' to discard stdout

This test case was capturing stdout and then discarding it. It is more efficient
to just attach stdout directly to /dev/null.

2 years agotest 1594: remove work around for #1780
Matthew Fernandez [Tue, 1 Feb 2022 10:23:20 +0000 (21:23 +1100)]
test 1594: remove work around for #1780

Issue #1780 was fixed in a286e358006dd49d2b3348abd8a2aebcffd24dec.

2 years agoMerge branch 'smattr/650B3501-D9F6-4EDA-BE4C-1C8EA4C2283F' into 'main'
Matthew Fernandez [Fri, 4 Feb 2022 06:56:16 +0000 (06:56 +0000)]
Merge branch 'smattr/650B3501-D9F6-4EDA-BE4C-1C8EA4C2283F' into 'main'

add a test case for #2179

See merge request graphviz/graphviz!2426

2 years agotextspan.c: [nfc] remove unnecessary casts
Matthew Fernandez [Wed, 2 Feb 2022 11:50:47 +0000 (22:50 +1100)]
textspan.c: [nfc] remove unnecessary casts

2 years agoadd a test case for #2179
Matthew Fernandez [Tue, 1 Feb 2022 10:21:05 +0000 (21:21 +1100)]
add a test case for #2179

2 years agotest 1449: [nfc] do not capture stdout
Matthew Fernandez [Tue, 1 Feb 2022 10:19:29 +0000 (21:19 +1100)]
test 1449: [nfc] do not capture stdout

Graphviz is being passed `-o /dev/null` in this test case, so there is no need
to capture stdout.

2 years agoMerge branch 'smattr/629BA038-E6B6-4140-8BA3-CFB49323FE14-2' into 'main'
Matthew Fernandez [Thu, 3 Feb 2022 07:22:07 +0000 (07:22 +0000)]
Merge branch 'smattr/629BA038-E6B6-4140-8BA3-CFB49323FE14-2' into 'main'

CMake: fix CMAKE_LIBRARY_PATH is not honored

Closes #1973

See merge request graphviz/graphviz!2422

2 years agoCMake: use more standard, portable mechanism for setting install paths
Matthew Fernandez [Thu, 25 Nov 2021 16:16:36 +0000 (08:16 -0800)]
CMake: use more standard, portable mechanism for setting install paths

Fixes #1973.

Suggested-by: Satadru Pramanik
2 years agoincrease CMake log-level in CI
Matthew Fernandez [Thu, 25 Nov 2021 17:15:24 +0000 (09:15 -0800)]
increase CMake log-level in CI

Allows us to more easily debug failures.

2 years agoCMake: add a variable substitution step for plugin configuration step
Matthew Fernandez [Sun, 30 Jan 2022 23:54:46 +0000 (10:54 +1100)]
CMake: add a variable substitution step for plugin configuration step

This CMake script hard codes some library paths in a way that thwarts
user/system preferences (#1973). Attempts to solve this by falling back on
standard CMake mechanisms have been unsuccessful because an install script like
this runs in an isolated environment where it (correctly) does not have access
to the configuration from the build environment. To resolve this we need a way
to pass the install script parameters/arguments from the build context.
Introducing a level of indirection here gives us such a mechanism.

This change by itself does nothing. However an upcoming change will take
advantage of the `@…@` substitution mechanism enabled by this change.

Note that the word “configure” in these files is used to refer to two distinct
mechanisms:

  1. The CMake `configure_file` command does something analogous to Autotools’
     variable substitution during `./configure`.

  2. The Graphviz `dot -c …` configure step registers installed Graphviz
     plugins.

Gitlab: #1973

2 years agoMerge branch 'smattr/A8790232-0AB5-4072-B45F-50CCECF99A65' into 'main'
Matthew Fernandez [Wed, 2 Feb 2022 12:55:51 +0000 (12:55 +0000)]
Merge branch 'smattr/A8790232-0AB5-4072-B45F-50CCECF99A65' into 'main'

remove support for '-m' command-line option

See merge request graphviz/graphviz!2424

2 years agoremove support for '-m' command-line option
Matthew Fernandez [Tue, 1 Feb 2022 07:24:56 +0000 (18:24 +1100)]
remove support for '-m' command-line option

As described in the changelog entry, LSan and friends are a more effective way
of performing this testing now.

2 years agoMerge branch 'smattr/224C0C90-0ABD-44D2-9D3F-DCAD4702E26D' into 'main'
Matthew Fernandez [Wed, 2 Feb 2022 07:48:28 +0000 (07:48 +0000)]
Merge branch 'smattr/224C0C90-0ABD-44D2-9D3F-DCAD4702E26D' into 'main'

fix Gvedit `-?` and enable building in CI on macOS

See merge request graphviz/graphviz!2419

2 years agoCI: add installation of Qt5 on macOS
Matthew Fernandez [Wed, 26 Jan 2022 09:07:04 +0000 (20:07 +1100)]
CI: add installation of Qt5 on macOS

This is a dependency for building Gvedit on macOS. Note that installation is not
added to the CMake test job because Gvedit is not currently built in the CMake
build system on macOS.

Gitlab: #1842, #1854

2 years agofix: teach Gvedit `-?` on macOS
Matthew Fernandez [Thu, 27 Jan 2022 22:08:03 +0000 (09:08 +1100)]
fix: teach Gvedit `-?` on macOS

This is the equivalent of aa695fabf4ff342488229aabd43c0970470d711f and friends,
but for Gvedit. It was not previously detected that this problem also affects
Gvedit because it is not currently built on macOS in CI. That will be improved
in an upcoming commit.

Gitlab: #1842, #1852

2 years agoMerge branch 'smattr/3D701FC9-FA35-4BB3-BD91-3C6492C688BF' into 'main'
Matthew Fernandez [Wed, 2 Feb 2022 06:45:28 +0000 (06:45 +0000)]
Merge branch 'smattr/3D701FC9-FA35-4BB3-BD91-3C6492C688BF' into 'main'

CI: add a job for enforcing CMake file formatting

See merge request graphviz/graphviz!2423

2 years agoCI: add a job for enforcing CMake file formatting
Matthew Fernandez [Mon, 31 Jan 2022 02:34:12 +0000 (13:34 +1100)]
CI: add a job for enforcing CMake file formatting

This should hopefully reduce the mental load on MR reviewers going forwards.

2 years agoCMake: [nfc] add a leading comment to a macro
Matthew Fernandez [Tue, 1 Feb 2022 04:10:18 +0000 (15:10 +1100)]
CMake: [nfc] add a leading comment to a macro

Squashes a “[C0111] Missing docstring on function or macro declaration”
`cmake-lint` warning.

2 years agoCMake: [nfc] remove excess blank line
Matthew Fernandez [Tue, 1 Feb 2022 03:55:26 +0000 (14:55 +1100)]
CMake: [nfc] remove excess blank line

Squashes a “[C0305] too many newlines between statements” `cmake-lint` warning.

2 years agoCMake: [nfc] uppercase 'dotlink' variable
Matthew Fernandez [Tue, 1 Feb 2022 03:55:01 +0000 (14:55 +1100)]
CMake: [nfc] uppercase 'dotlink' variable

Upcoming changes that introduce `cmake-format` checks complain that this
identifier does not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`

2 years agoCMake: [nfc] uppercase 'dotcopy' variable
Matthew Fernandez [Tue, 1 Feb 2022 03:54:13 +0000 (14:54 +1100)]
CMake: [nfc] uppercase 'dotcopy' variable

Upcoming changes that introduce `cmake-format` checks complain that this
identifier does not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`

2 years agoCMake: [nfc] uppercase 'sources' variable
Matthew Fernandez [Tue, 1 Feb 2022 03:51:59 +0000 (14:51 +1100)]
CMake: [nfc] uppercase 'sources' variable

Upcoming changes that introduce `cmake-format` checks complain that this
identifier does not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`

2 years agoCMake: add comments to 'add_custom_command', 'add_custom_target' steps
Matthew Fernandez [Tue, 1 Feb 2022 03:50:45 +0000 (14:50 +1100)]
CMake: add comments to 'add_custom_command', 'add_custom_target' steps

Squashes “[C0113] Missing COMMENT in statement which allows it” `cmake-lint`
warnings.

2 years agoCMake: [nfc] uppercase 'create_test' macro
Matthew Fernandez [Tue, 1 Feb 2022 03:23:54 +0000 (14:23 +1100)]
CMake: [nfc] uppercase 'create_test' macro

Upcoming changes that introduce `cmake-format` checks complain that this
identifier does not comply with `[0-9A-Z_]+`.

2 years agoCMake: [nfc] wrap to 80 character column width
Matthew Fernandez [Tue, 1 Feb 2022 02:41:36 +0000 (13:41 +1100)]
CMake: [nfc] wrap to 80 character column width

Upcoming changes to introduce `cmake-format` checks default to this, which suits
Graphviz well as it matches the (claimed) `clang-format` C/C++ style.

2 years agoCMake: [nfc] fix a comment typo
Matthew Fernandez [Tue, 1 Feb 2022 02:39:57 +0000 (13:39 +1100)]
CMake: [nfc] fix a comment typo

2 years agoCMake: [nfc] standardize on 2-space indentation
Matthew Fernandez [Tue, 1 Feb 2022 01:27:04 +0000 (12:27 +1100)]
CMake: [nfc] standardize on 2-space indentation

Upcoming changes to introduce `cmake-format` checks default to this, which suits
Graphviz well as it matches the (claimed) `clang-format` C/C++ style.

2 years agoCMake: [nfc] uppercase 'PangoCairo_*' variables
Matthew Fernandez [Tue, 1 Feb 2022 01:25:33 +0000 (12:25 +1100)]
CMake: [nfc] uppercase 'PangoCairo_*' variables

Upcoming changes that introduce `cmake-format` checks complain that these
identifiers do not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`.

2 years agoCMake: [nfc] uppercase 'Svgpp_*' variables
Matthew Fernandez [Tue, 1 Feb 2022 01:05:53 +0000 (12:05 +1100)]
CMake: [nfc] uppercase 'Svgpp_*' variables

Upcoming changes that introduce `cmake-format` checks complain that these
identifiers do not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`.

2 years agoCMake: [nfc] uppercase 'RapidXml_*' variables
Matthew Fernandez [Mon, 31 Jan 2022 12:00:10 +0000 (23:00 +1100)]
CMake: [nfc] uppercase 'RapidXml_*' variables

Upcoming changes that introduce `cmake-format` checks complain that these
identifiers do not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`.

2 years agoCMake: [nfc] uppercase 'Getopt_*' variables
Matthew Fernandez [Mon, 31 Jan 2022 11:15:38 +0000 (22:15 +1100)]
CMake: [nfc] uppercase 'Getopt_*' variables

Upcoming changes that introduce `cmake-format` checks complain that these
identifiers do not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`.

2 years agoCMake: [nfc] uppercase 'Cairo_*' variables
Matthew Fernandez [Mon, 31 Jan 2022 06:57:50 +0000 (17:57 +1100)]
CMake: [nfc] uppercase 'Cairo_*' variables

Upcoming changes that introduce `cmake-format` checks complain that these
identifiers do not comply with `[A-Z][0-9A-Z_]+|_[0-9a-z_]+`.

2 years agoMerge branch 'fix-stdout-and-stderr-flushing-at-exit-on-mingw' into 'main'
Magnus Jacobsson [Mon, 31 Jan 2022 18:11:55 +0000 (18:11 +0000)]
Merge branch 'fix-stdout-and-stderr-flushing-at-exit-on-mingw' into 'main'

Fix stdout and stderr flushing at exit on MinGW

Closes #2178

See merge request graphviz/graphviz!2416

2 years agoMerge branch 'smattr/B165A187-BED3-4E13-8876-799331BFE43F' into 'main'
Matthew Fernandez [Mon, 31 Jan 2022 11:01:03 +0000 (11:01 +0000)]
Merge branch 'smattr/B165A187-BED3-4E13-8876-799331BFE43F' into 'main'

remove unused ltmain.sh.patch

See merge request graphviz/graphviz!2420

2 years agoadd a CHANGELOG entry for the stdout/stderr not flushed fix
Magnus Jacobsson [Thu, 20 Jan 2022 20:09:54 +0000 (21:09 +0100)]
add a CHANGELOG entry for the stdout/stderr not flushed fix

2 years agoreplace all instances of return from main with graphviz_exit()
Magnus Jacobsson [Wed, 19 Jan 2022 21:30:40 +0000 (22:30 +0100)]
replace all instances of return from main with graphviz_exit()

Fixes https://gitlab.com/graphviz/graphviz/-/issues/2178.

2 years agoreplace all instances of exit() with graphviz_exit()
Magnus Jacobsson [Sun, 16 Jan 2022 15:46:41 +0000 (16:46 +0100)]
replace all instances of exit() with graphviz_exit()

Partial fix for https://gitlab.com/graphviz/graphviz/-/issues/2178.

2 years agolneato: autotools: add 'lib' to include directories
Magnus Jacobsson [Mon, 17 Jan 2022 22:02:03 +0000 (23:02 +0100)]
lneato: autotools: add 'lib' to include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agolefty: autotools: add 'lib' to include directories
Magnus Jacobsson [Mon, 17 Jan 2022 07:07:40 +0000 (08:07 +0100)]
lefty: autotools: add 'lib' to include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agodotty: autotools: add 'lib' to include directories
Magnus Jacobsson [Mon, 17 Jan 2022 20:18:44 +0000 (21:18 +0100)]
dotty: autotools: add 'lib' to include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agodiffimg: autotools: add 'lib' to include directories
Magnus Jacobsson [Mon, 17 Jan 2022 07:07:40 +0000 (08:07 +0100)]
diffimg: autotools: add 'lib' to include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agolneato: MSBuild: add 'lib' to additional include directories
Magnus Jacobsson [Sun, 16 Jan 2022 23:05:45 +0000 (00:05 +0100)]
lneato: MSBuild: add 'lib' to additional include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agolefty: MSBuild: add 'lib' to additional include directories
Magnus Jacobsson [Sun, 16 Jan 2022 23:05:21 +0000 (00:05 +0100)]
lefty: MSBuild: add 'lib' to additional include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agodotty: MSBuild: add 'lib' to additional include directories
Magnus Jacobsson [Sun, 16 Jan 2022 23:04:40 +0000 (00:04 +0100)]
dotty: MSBuild: add 'lib' to additional include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agodiffimg: MSBuild: add 'lib' to additional include directories
Magnus Jacobsson [Sun, 16 Jan 2022 23:06:18 +0000 (00:06 +0100)]
diffimg: MSBuild: add 'lib' to additional include directories

An upcoming commit need this in order to be able to add an include of
cgraph/exit.h.

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

2 years agosparse: add a graphviz_exit function to general.h if STANDALONE
Magnus Jacobsson [Sun, 16 Jan 2022 16:10:59 +0000 (17:10 +0100)]
sparse: add a graphviz_exit function to general.h if STANDALONE

An previous commit added the same function to cgraph/exit.h, but that
library is not supposed to be used when STANDALONE is defined.

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

2 years agosparse: remove useless include of cgraph/sprint.h
Magnus Jacobsson [Sun, 16 Jan 2022 17:39:21 +0000 (18:39 +0100)]
sparse: remove useless include of cgraph/sprint.h

The last use of anything from sprint.h was removed in
https://gitlab.com/graphviz/graphviz/-/commit/c2d3526427a7259aa656ab72c83b43232ebfd806.

2 years agocgraph: add a graphviz_exit function in a new header file exit.h
Magnus Jacobsson [Sun, 16 Jan 2022 15:40:29 +0000 (16:40 +0100)]
cgraph: add a graphviz_exit function in a new header file exit.h

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

2 years agoremove unused ltmain.sh.patch
Matthew Fernandez [Sun, 30 Jan 2022 21:32:56 +0000 (08:32 +1100)]
remove unused ltmain.sh.patch

Use of this patch was dropped in b9a51d568fc4c842b8d4a930c50a655526a08fa7 in
2007.

2 years agoMerge branch 'smattr/11D3486A-E1F5-44A2-B19C-139B87699C57' into 'main'
Matthew Fernandez [Thu, 27 Jan 2022 10:28:35 +0000 (10:28 +0000)]
Merge branch 'smattr/11D3486A-E1F5-44A2-B19C-139B87699C57' into 'main'

suppress XType warnings during testing on macOS

See merge request graphviz/graphviz!2418

2 years agosuppress XType warnings during testing on macOS
Matthew Fernandez [Wed, 26 Jan 2022 07:25:46 +0000 (18:25 +1100)]
suppress XType warnings during testing on macOS

When upgrading from macOS 11 to macOS 12 in CI, running Graphviz outputs:

  dot[32116:62347] XType: com.apple.fonts is not accessible.
  dot[32116:62347] XType: XTFontStaticRegistry is enabled.

This causes some spurious failures in tests that are expecting stderr to be
silent. These warnings do not seem a serious issue, so this change suppresses
them during testing.

Gitlab: #2164

2 years agoMerge branch 'smattr/A97D3899-3C26-441B-809F-236E5F6E02FF' into 'main'
Matthew Fernandez [Thu, 27 Jan 2022 09:31:16 +0000 (09:31 +0000)]
Merge branch 'smattr/A97D3899-3C26-441B-809F-236E5F6E02FF' into 'main'

CI: add Automake installation for macOS

See merge request graphviz/graphviz!2417

2 years agoCI: add Automake installation for macOS
Matthew Fernandez [Mon, 24 Jan 2022 21:13:42 +0000 (08:13 +1100)]
CI: add Automake installation for macOS

Automake (and its dependent, Autoconf) are needed for Autotools-based Graphviz
compilation. They are currently available in the CI Gitlab macOS 11 shared
runner environment incidentally due to a transitive dependency via php.¹ The
same is not true in the macOS 12 environment.²

This commit moves to explicitly installing these Graphviz dependencies rather
relying on getting them implicitly. This makes the CI task for the macOS
Autotools build pass on macOS 12.

Gitlab: #2164

¹ https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/macstadium/orka/-/blob/df5b9cad3a482ec8b79b401c8d03bbc60f2f97c4/toolchain/big-sur.yml#L105-111
² https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/macstadium/orka/-/blob/df5b9cad3a482ec8b79b401c8d03bbc60f2f97c4/toolchain/monterey.yml#L48-49

2 years agoMerge branch 'smattr/3b702435-a919-4479-b146-c17909819e6e' into 'main'
Matthew Fernandez [Thu, 20 Jan 2022 03:12:40 +0000 (03:12 +0000)]
Merge branch 'smattr/3b702435-a919-4479-b146-c17909819e6e' into 'main'

work towards removing FALSE, TRUE

See merge request graphviz/graphviz!2410

2 years agolefty: use C99 bools for 'Erun' variables
Matthew Fernandez [Sun, 16 Jan 2022 20:01:37 +0000 (12:01 -0800)]
lefty: use C99 bools for 'Erun' variables

2 years agolefty: use a C99 bool for 'gmapon'
Matthew Fernandez [Sun, 16 Jan 2022 19:59:39 +0000 (11:59 -0800)]
lefty: use a C99 bool for 'gmapon'

2 years agoscan_num: use a C99 bool for 'saw_rp'
Matthew Fernandez [Sun, 16 Jan 2022 19:58:21 +0000 (11:58 -0800)]
scan_num: use a C99 bool for 'saw_rp'

2 years agoscan_num: use a C99 bool for 'saw_digit'
Matthew Fernandez [Sun, 16 Jan 2022 19:57:53 +0000 (11:57 -0800)]
scan_num: use a C99 bool for 'saw_digit'

2 years agolefty boolop: fix incorrect type in return statement
Matthew Fernandez [Sun, 16 Jan 2022 19:56:31 +0000 (11:56 -0800)]
lefty boolop: fix incorrect type in return statement

This was accidentally omitted in e5b641c6891e52d503bc63cb9f354b54abcdce8e.

2 years agolefty: use C99 bools for 'errdo' globals
Matthew Fernandez [Sun, 16 Jan 2022 19:55:42 +0000 (11:55 -0800)]
lefty: use C99 bools for 'errdo' globals

2 years agolefty: return a C99 bool from 'orderop'
Matthew Fernandez [Sun, 16 Jan 2022 19:52:51 +0000 (11:52 -0800)]
lefty: return a C99 bool from 'orderop'

2 years agolefty: use C99 bool constants to set 'Gnocallbacks'
Matthew Fernandez [Sun, 16 Jan 2022 19:50:14 +0000 (11:50 -0800)]
lefty: use C99 bool constants to set 'Gnocallbacks'

2 years agoSparseMatrix_symmetrize: take a C99 bool instead of an int
Matthew Fernandez [Sun, 16 Jan 2022 19:46:27 +0000 (11:46 -0800)]
SparseMatrix_symmetrize: take a C99 bool instead of an int

2 years agoSparseMatrix_is_symmetric: take a C99 bool instead of an int
Matthew Fernandez [Sun, 16 Jan 2022 19:42:06 +0000 (11:42 -0800)]
SparseMatrix_is_symmetric: take a C99 bool instead of an int

2 years agolefty Mhaspointers: use C99 bool values
Matthew Fernandez [Sun, 16 Jan 2022 19:33:11 +0000 (11:33 -0800)]
lefty Mhaspointers: use C99 bool values

2 years agouse C99 bools to set 'onstack'
Matthew Fernandez [Sun, 16 Jan 2022 19:30:36 +0000 (11:30 -0800)]
use C99 bools to set 'onstack'

2 years agoremove comparisons against 'TRUE' literal
Matthew Fernandez [Sun, 16 Jan 2022 19:20:35 +0000 (11:20 -0800)]
remove comparisons against 'TRUE' literal

The variables involved here are all booleans or used exclusively as booleans.

2 years agoremove comparisons against 'FALSE' literal
Matthew Fernandez [Sun, 16 Jan 2022 19:14:55 +0000 (11:14 -0800)]
remove comparisons against 'FALSE' literal

2 years agoMerge branch 'smattr/1C578045-99DC-414C-BF4A-C517F2EC40B8' into 'main'
Matthew Fernandez [Thu, 20 Jan 2022 02:09:29 +0000 (02:09 +0000)]
Merge branch 'smattr/1C578045-99DC-414C-BF4A-C517F2EC40B8' into 'main'

mingle: replace some `unique_ptr` with `vector`

See merge request graphviz/graphviz!2412

2 years agomingle bundle: replace a 'unique_ptr' with a 'vector'
Matthew Fernandez [Sun, 16 Jan 2022 22:04:09 +0000 (14:04 -0800)]
mingle bundle: replace a 'unique_ptr' with a 'vector'

Similar to the prior commit, when the `std::unique_ptr` usage was added here in
176c8a163a951a2b801956ed4a00da05603e3a06, I was incorrectly too focused on
preserving the previous property of this being a heap-allocated array. This is
not necessary, and using a `std::vector` instead allows more flexibility. E.g.
depending on the `std::vector` implementation, it could choose to allocate this
array on the stack instead of the heap.

2 years agomingle genBundleColors: replace a 'unique_ptr' with a 'vector'
Matthew Fernandez [Sun, 16 Jan 2022 22:00:51 +0000 (14:00 -0800)]
mingle genBundleColors: replace a 'unique_ptr' with a 'vector'

When the `std::unique_ptr` usage was added here in
869891f9c87b326ddef4de461b92de98ec647b82, I was incorrectly too focused on
preserving the previous property of this being a heap-allocated array. This is
not necessary, and using a `std::vector` instead allows more flexibility. E.g.
depending on the `std::vector` implementation, it could choose to allocate this
array on the stack instead of the heap.

2 years agoMerge branch 'smattr/AC433706-8F92-4102-816C-75433E82B00D' into 'main'
Matthew Fernandez [Wed, 19 Jan 2022 17:17:53 +0000 (17:17 +0000)]
Merge branch 'smattr/AC433706-8F92-4102-816C-75433E82B00D' into 'main'

expr: fix misinterpretation of shifts

Closes #2103

See merge request graphviz/graphviz!2409