]>
granicus.if.org Git - graphviz/log
Magnus Jacobsson [Tue, 20 Oct 2020 16:23:00 +0000 (18:23 +0200)]
Add subset of macOS rtest reference files
Generated with ./rtest.py -g. The .gv files are identical to those in
the linux.x86 subdirectory. The .ps file has slight differences, but
no visible differences.
Magnus Jacobsson [Wed, 21 Oct 2020 06:53:12 +0000 (08:53 +0200)]
Add brew install pango to macos build jobs
Needed for png format and cairo renderer.
Fixes https://gitlab.com/graphviz/graphviz/-/issues/1860.
Magnus Jacobsson [Tue, 20 Oct 2020 13:51:12 +0000 (15:51 +0200)]
Add support for macOS to ci/install.sh
Magnus Jacobsson [Tue, 20 Oct 2020 13:42:18 +0000 (15:42 +0200)]
Refactor ci/install.sh to check for build system before OS
Magnus Jacobsson [Tue, 20 Oct 2020 06:32:44 +0000 (08:32 +0200)]
Fix tred -? to actually print usage instead of error on macOS
Final commit that fixes https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:32:16 +0000 (08:32 +0200)]
Fix sccmap -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:31:58 +0000 (08:31 +0200)]
Fix nop -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:31:49 +0000 (08:31 +0200)]
Fix mm2gv -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:31:38 +0000 (08:31 +0200)]
Fix gvpack -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:31:02 +0000 (08:31 +0200)]
Fix gvcolor -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:30:44 +0000 (08:30 +0200)]
Fix gc -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:30:27 +0000 (08:30 +0200)]
Fix dijkstra -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:29:49 +0000 (08:29 +0200)]
Fix gvmap -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:29:03 +0000 (08:29 +0200)]
Fix cluster -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:28:21 +0000 (08:28 +0200)]
Fix edgepaint -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Tue, 20 Oct 2020 06:11:33 +0000 (08:11 +0200)]
Fix ccomps -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852
Magnus Jacobsson [Tue, 20 Oct 2020 06:08:51 +0000 (08:08 +0200)]
Fix bcomps -? to actually print usage instead of error on macOS
Towards https://gitlab.com/graphviz/graphviz/-/issues/1852.
Magnus Jacobsson [Fri, 11 Sep 2020 06:50:27 +0000 (08:50 +0200)]
Restore whitespace and comment after earlier bad merge conflict resolution
Matthew Fernandez [Sat, 24 Oct 2020 02:36:07 +0000 (02:36 +0000)]
Merge branch 'smattr/
629f9eac -8e8a-486d-9695-
cc857dce075c ' into 'master'
some clean up
See merge request graphviz/graphviz!1620
Matthew Fernandez [Sat, 17 Oct 2020 22:08:24 +0000 (15:08 -0700)]
remove rtest.sh redirect
Nothing in the repository uses this any more.
Matthew Fernandez [Sat, 17 Oct 2020 22:04:36 +0000 (15:04 -0700)]
remove unnecessary 'global' statements in rtest
These variables were either unused in the contained function or only read from.
Matthew Fernandez [Sat, 17 Oct 2020 22:00:06 +0000 (15:00 -0700)]
fix some comparisons between booleans and ints in rtest
This all worked fine, but for consistency we should be treating these variables
as booleans everywhere.
Matthew Fernandez [Sat, 17 Oct 2020 21:41:26 +0000 (14:41 -0700)]
remove legacy comment
The variable this is referring to, LINECNT, was removed when this script was
ported to Python in
a1b9ffc0c37a435607ac8b1c123c8c542ef1cec9 .
Matthew Fernandez [Sat, 17 Oct 2020 21:37:33 +0000 (14:37 -0700)]
remove some unused variables in rtest
Matthew Fernandez [Sat, 17 Oct 2020 21:21:49 +0000 (14:21 -0700)]
squash a -Wabsolute-value warning
In
8414e62738bf7f52596eb83049ecef758582c760 I misread the surrounding code and
thought this was a float being operated on here.
Matthew Fernandez [Sat, 17 Oct 2020 21:18:12 +0000 (14:18 -0700)]
squash -Wcomment warning
Matthew Fernandez [Sat, 17 Oct 2020 21:13:01 +0000 (14:13 -0700)]
remove unused onexit() prototype
Matthew Fernandez [Sat, 17 Oct 2020 21:12:19 +0000 (14:12 -0700)]
remove unused _exit() prototype
Matthew Fernandez [Sat, 17 Oct 2020 20:58:21 +0000 (13:58 -0700)]
remove unused prototypes for frexp() and ldexp()
Matthew Fernandez [Sat, 17 Oct 2020 20:56:55 +0000 (13:56 -0700)]
remove unneeded X_OK shim
Nothing in Graphviz uses X_OK.
Matthew Fernandez [Sat, 17 Oct 2020 20:52:01 +0000 (13:52 -0700)]
remove POOLMTXRETURN()
Matthew Fernandez [Sat, 17 Oct 2020 20:40:04 +0000 (13:40 -0700)]
remove POOLMTXSTART() no-op
Matthew Fernandez [Sat, 17 Oct 2020 20:27:59 +0000 (13:27 -0700)]
remove POOLMTXUNLOCK() no-op
Matthew Fernandez [Sat, 17 Oct 2020 20:15:38 +0000 (13:15 -0700)]
remove POOLMTXLOCK() no-op
Matthew Fernandez [Sat, 17 Oct 2020 20:01:51 +0000 (13:01 -0700)]
remove SFMTXUNLOCK() no-op
Matthew Fernandez [Sat, 17 Oct 2020 19:41:41 +0000 (12:41 -0700)]
remove no-op SFMTXLOCK()
Matthew Fernandez [Sat, 17 Oct 2020 19:24:03 +0000 (12:24 -0700)]
remove useless extern declarations
These variables already have extern linkage.
Matthew Fernandez [Sat, 17 Oct 2020 03:00:47 +0000 (20:00 -0700)]
remove now unused vthread.h
Matthew Fernandez [Sat, 17 Oct 2020 02:43:02 +0000 (19:43 -0700)]
remove unused sf_mutex field from Sfextern_t
Matthew Fernandez [Sat, 17 Oct 2020 02:17:23 +0000 (19:17 -0700)]
remove unused mtx parameter to SFCLEAR() macro
Matthew Fernandez [Sat, 17 Oct 2020 02:15:59 +0000 (19:15 -0700)]
remove unused mutex field from SFIO structures
Matthew Fernandez [Sat, 17 Oct 2020 01:56:16 +0000 (18:56 -0700)]
remove unused Sfonce functionality
Matthew Fernandez [Sat, 17 Oct 2020 01:59:00 +0000 (18:59 -0700)]
remove SFONCE() no-op
Matthew Fernandez [Sat, 17 Oct 2020 01:41:22 +0000 (18:41 -0700)]
remove vmtx mutex no-ops
Matthew Fernandez [Sat, 17 Oct 2020 01:13:32 +0000 (18:13 -0700)]
remove unused SFIO vthread prototypes
Matthew Fernandez [Sat, 17 Oct 2020 00:42:16 +0000 (17:42 -0700)]
remove unused sftell()
Matthew Fernandez [Sat, 17 Oct 2020 00:28:25 +0000 (17:28 -0700)]
remove unused _sfstrtod()
Mark Hansen [Fri, 23 Oct 2020 11:03:44 +0000 (11:03 +0000)]
Merge branch 'orientation' into 'master'
Combine `orientation` attr for graphs and nodes
See merge request graphviz/graphviz!1640
Mark Hansen [Fri, 23 Oct 2020 11:02:01 +0000 (22:02 +1100)]
Combine `orientation` attr for graphs and nodes
This simplifies the generation quite a lot, gets rid of the duplicated
anchors for differently-named.
Removes a little confusion too, in my opinion.
It's not perfect: they have different datatypes.
Mark Hansen [Fri, 23 Oct 2020 10:45:23 +0000 (10:45 +0000)]
Merge branch 'stray-a' into 'master'
attrs.html: Close TT tag
See merge request graphviz/graphviz!1639
Mark Hansen [Fri, 23 Oct 2020 10:44:54 +0000 (21:44 +1100)]
attrs.html: Close TT tag
Mark Hansen [Fri, 23 Oct 2020 10:23:33 +0000 (10:23 +0000)]
Merge branch 'stray-a' into 'master'
attrs.html: Remove stray anchor close tag
See merge request graphviz/graphviz!1638
Mark Hansen [Fri, 23 Oct 2020 10:22:55 +0000 (21:22 +1100)]
attrs.html: Remove stray anchor close tag
Mark Hansen [Thu, 22 Oct 2020 10:17:05 +0000 (10:17 +0000)]
Merge branch 'ps' into 'master'
attrs.html: Rename 'kind' to 'types'.
See merge request graphviz/graphviz!1636
Mark Hansen [Thu, 22 Oct 2020 10:16:28 +0000 (21:16 +1100)]
attrs.html: Rename 'kind' to 'types'.
Matches the title of the table, and colloquial use.
Mark Hansen [Thu, 22 Oct 2020 10:12:29 +0000 (10:12 +0000)]
Merge branch 'ps' into 'master'
attrs.html: Rename attr.uses to used_by
See merge request graphviz/graphviz!1635
Mark Hansen [Thu, 22 Oct 2020 10:11:58 +0000 (21:11 +1100)]
attrs.html: Rename attr.uses to used_by
Matches table header.
Makes more sense when you're looking at an attribute definition
Mark Hansen [Thu, 22 Oct 2020 10:09:37 +0000 (10:09 +0000)]
Merge branch 'ps' into 'master'
Add consistent indentation to attrs.html
See merge request graphviz/graphviz!1634
Mark Hansen [Thu, 22 Oct 2020 10:06:53 +0000 (21:06 +1100)]
Add consistent indentation to attrs.html
No-op as far as appearance goes.
But makes looking at diffs much easier!
Mark Hansen [Thu, 22 Oct 2020 09:57:59 +0000 (09:57 +0000)]
Merge branch 'ps' into 'master'
attrs.html: don't special-case double/int/string
See merge request graphviz/graphviz!1633
Mark Hansen [Thu, 22 Oct 2020 09:57:29 +0000 (20:57 +1100)]
attrs.html: don't special-case double/int/string
Instead, add (very basic) type definitions for them.
This simplifies the template.
Mark Hansen [Thu, 22 Oct 2020 09:47:51 +0000 (09:47 +0000)]
Merge branch 'ps' into 'master'
attrs.html: Stop special-casing bitmap output
See merge request graphviz/graphviz!1632
Mark Hansen [Thu, 22 Oct 2020 09:47:34 +0000 (20:47 +1100)]
attrs.html: Stop special-casing bitmap output
No-op change.
Mark Hansen [Thu, 22 Oct 2020 09:45:20 +0000 (09:45 +0000)]
Merge branch 'ps' into 'master'
attrs: Remove special-casing postscript template
See merge request graphviz/graphviz!1631
Mark Hansen [Thu, 22 Oct 2020 09:44:21 +0000 (20:44 +1100)]
attrs: Remove special-casing postscript template
Just spell out postscript in the source
Matthew Fernandez [Thu, 22 Oct 2020 00:28:18 +0000 (00:28 +0000)]
Merge branch 'smattr/
07caebcd -6088-4479-89d4-
80d864a567fa ' into 'master'
speed up Neato
See merge request graphviz/graphviz!1619
Matthew Fernandez [Thu, 15 Oct 2020 03:06:22 +0000 (20:06 -0700)]
squash a -Wfloat-conversion warning
Matthew Fernandez [Thu, 15 Oct 2020 02:32:58 +0000 (19:32 -0700)]
inline and fuse a number of loops in majorization code
This accelerates the Neato example from #1652 by ~9.5%.
Matthew Fernandez [Thu, 15 Oct 2020 01:59:51 +0000 (18:59 -0700)]
inline some vector computations and fuse two loops
This slightly accelerates a current test case by ~0.1%. Related to #1652.
Mark Hansen [Wed, 21 Oct 2020 11:09:32 +0000 (11:09 +0000)]
Merge branch 'nslimit6' into 'master'
Remove no-op bool case
See merge request graphviz/graphviz!1628
Mark Hansen [Wed, 21 Oct 2020 11:09:06 +0000 (22:09 +1100)]
Remove no-op bool case
It behaved the same as the 'else'
Mark Hansen [Wed, 21 Oct 2020 11:04:57 +0000 (11:04 +0000)]
Merge branch 'nslimit5' into 'master'
Replace TT with CODE element
See merge request graphviz/graphviz!1627
Mark Hansen [Wed, 21 Oct 2020 11:04:34 +0000 (22:04 +1100)]
Replace TT with CODE element
TT is deprecated
Mark Hansen [Wed, 21 Oct 2020 11:02:04 +0000 (11:02 +0000)]
Merge branch 'nslimit4' into 'master'
attrs.html: clean ID and NAMEs
See merge request graphviz/graphviz!1626
Mark Hansen [Wed, 21 Oct 2020 10:59:22 +0000 (21:59 +1100)]
attrs.html: clean ID and NAMEs
- Convert NAMEs to IDs, as recommended for non-form elements.
https://stackoverflow.com/a/
7470325 /171898
- Quote HREFs and IDs
Mark Hansen [Wed, 21 Oct 2020 10:55:07 +0000 (10:55 +0000)]
Merge branch 'nslimit3' into 'master'
Remove two-spacing from front of HTML continuation
See merge request graphviz/graphviz!1625
Mark Hansen [Wed, 21 Oct 2020 10:54:42 +0000 (10:54 +0000)]
Merge branch 'nslimit2' into 'master'
Simplify parsing, now all attributes have one name
Closes graphviz.gitlab.io#64
See merge request graphviz/graphviz!1623
Mark Hansen [Wed, 21 Oct 2020 10:39:05 +0000 (21:39 +1100)]
Remove two-spacing from front of HTML continuation
No need for this, just adds complexity to the parser.
Mark Hansen [Wed, 21 Oct 2020 10:37:41 +0000 (10:37 +0000)]
Merge branch 'nslimie1' into 'master'
Split nslimit and nslimit1 attributes
See merge request graphviz/graphviz!1622
Mark Hansen [Wed, 21 Oct 2020 10:30:23 +0000 (21:30 +1100)]
Simplify parsing, now all attributes have one name
Closes #64
Mark Hansen [Wed, 21 Oct 2020 10:16:29 +0000 (21:16 +1100)]
Split nslimit and nslimit1 attributes
They're the only attributes that don't already have their own sections,
they complicate parsing and emitting, and on balance I think they're
better explained separately (but next to each other).
Closes #64
Matthew Fernandez [Tue, 20 Oct 2020 02:10:13 +0000 (19:10 -0700)]
Merge branch '
9ddbb9ea -f0a4-481d-9c40-
b9709aa1680c ' into HEAD
Matthew Fernandez [Mon, 12 Oct 2020 00:37:29 +0000 (17:37 -0700)]
squash a -Wimplicit-fallthrough warning
GCC recognizes "fall through" and "fallthrough" comments to suppress this
warning but not "falling through."
Matthew Fernandez [Mon, 12 Oct 2020 00:33:54 +0000 (17:33 -0700)]
remove now-unnecessary use of volatile on some locals
Related to #1801.
Matthew Fernandez [Mon, 12 Oct 2020 00:33:29 +0000 (17:33 -0700)]
remove now-unused ljbuf
Related to #1801.
Matthew Fernandez [Mon, 12 Oct 2020 00:23:48 +0000 (17:23 -0700)]
undo an unnecessary use of setjmp/longjmp
This code actually correctly marks the variables that are affected by the
setjmp/longjmp as volatile, but there is still no need for this complexity. A
standard error code return does the trick much simpler. Related to #1801.
Magnus Jacobsson [Mon, 19 Oct 2020 17:16:09 +0000 (17:16 +0000)]
Merge branch 'remove-fedora-29-and-30-jobs-from-ci' into 'master'
Remove Fedora 29 and 30 jobs from CI
See merge request graphviz/graphviz!1617
Magnus Jacobsson [Mon, 12 Oct 2020 20:45:40 +0000 (22:45 +0200)]
Remove EOL Fedora 30 Dockerfile
Magnus Jacobsson [Mon, 12 Oct 2020 20:45:32 +0000 (22:45 +0200)]
Remove EOL Fedora 29 Dockerfile
Magnus Jacobsson [Mon, 12 Oct 2020 18:39:09 +0000 (20:39 +0200)]
Stop building & testing for EOL Fedora 30 in CI
Magnus Jacobsson [Mon, 12 Oct 2020 18:37:05 +0000 (20:37 +0200)]
Stop building & testing for EOL Fedora 29 in CI
Matthew Fernandez [Mon, 19 Oct 2020 15:32:22 +0000 (08:32 -0700)]
Merge branch '
91908b3f -1fea-401e-a238-
435c742d3589 ' into HEAD
Matthew Fernandez [Sat, 10 Oct 2020 22:36:52 +0000 (15:36 -0700)]
fix Lefty's reliance on dup() internals
This addresses the following Coverity warnings:
Error: RESOURCE_LEAK (CWE-772): [#def39]
graphviz-2.40.1/cmd/lefty/os/unix/io.c:362: open_fn: Returning handle opened by "dup".
graphviz-2.40.1/cmd/lefty/os/unix/io.c:362: leaked_handle: Failing to save or close handle opened by "dup(fd[1])" leaks it.
# 360| panic2 (POS, "ptyopen", "cannot fork");
# 361| case 0:
# 362|-> close (fd[0]), close (0), dup (fd[1]);
# 363| close (1), dup (fd[1]), close (fd[1]);
# 364| execl (shell, shbname, "-c", cmd, NULL);
Error: RESOURCE_LEAK (CWE-772): [#def40]
graphviz-2.40.1/cmd/lefty/os/unix/io.c:363: open_fn: Returning handle opened by "dup".
graphviz-2.40.1/cmd/lefty/os/unix/io.c:363: leaked_handle: Failing to save or close handle opened by "dup(fd[1])" leaks it.
# 361| case 0:
# 362| close (fd[0]), close (0), dup (fd[1]);
# 363|-> close (1), dup (fd[1]), close (fd[1]);
# 364| execl (shell, shbname, "-c", cmd, NULL);
# 365| panic2 (POS, "ptyopen", "child cannot exec: %s\n", cmd);
Error: RESOURCE_LEAK (CWE-772): [#def41]
graphviz-2.40.1/cmd/lefty/os/unix/io.c:429: open_fn: Returning handle opened by "dup".
graphviz-2.40.1/cmd/lefty/os/unix/io.c:429: leaked_handle: Failing to save or close handle opened by "dup(p1[1])" leaks it.
# 427| panic2 (POS, "pipeopen", "child cannot exec: %s\n", cmd2);
# 428| }
# 429|-> close (1), dup (p1[1]), close (p1[1]);
# 430| close (0), dup (p2[0]), close (p2[0]);
# 431| execl (shell, shbname, "-c", cmd, NULL);
Error: RESOURCE_LEAK (CWE-772): [#def42]
graphviz-2.40.1/cmd/lefty/os/unix/io.c:430: open_fn: Returning handle opened by "dup".
graphviz-2.40.1/cmd/lefty/os/unix/io.c:430: leaked_handle: Failing to save or close handle opened by "dup(p2[0])" leaks it.
# 428| }
# 429| close (1), dup (p1[1]), close (p1[1]);
# 430|-> close (0), dup (p2[0]), close (p2[0]);
# 431| execl (shell, shbname, "-c", cmd, NULL);
# 432| panic2 (POS, "pipeopen", "child cannot exec: %s\n", cmd);
Fixes #1823. Related to #1464.
Matthew Fernandez [Fri, 16 Oct 2020 14:39:33 +0000 (14:39 +0000)]
Merge branch 'master' into 'master'
Since the string from strerror should never be modified, use const.
See merge request graphviz/graphviz!1618
Matthew Fernandez [Fri, 16 Oct 2020 03:24:53 +0000 (20:24 -0700)]
Merge branch '
b2f0e4be -93c5-4d03-9a33-
16c7f45988a8 ' into HEAD
Matthew Fernandez [Sat, 10 Oct 2020 00:33:42 +0000 (17:33 -0700)]
remove unused sfsize()
Matthew Fernandez [Sat, 10 Oct 2020 00:29:14 +0000 (17:29 -0700)]
remove unused sfset()
Matthew Fernandez [Sat, 10 Oct 2020 00:24:56 +0000 (17:24 -0700)]
remove unused SFSEEK() macro
Matthew Fernandez [Sat, 10 Oct 2020 00:23:21 +0000 (17:23 -0700)]
remove unused sfpurge()
Matthew Fernandez [Sat, 10 Oct 2020 00:19:03 +0000 (17:19 -0700)]
remove unused sfprints()