]>
granicus.if.org Git - graphviz/log
Matthew Fernandez [Sat, 6 Mar 2021 02:05:08 +0000 (18:05 -0800)]
abbreviate computation of len_swidth in gvmap
C99 semantics allow us to avoid using an intermediate buffer for this operation.
Matthew Fernandez [Sat, 6 Mar 2021 01:59:23 +0000 (17:59 -0800)]
remove redundant swidth computation
The values being computed here were already computed in a previous block and
have not changed since. There was clearly copy-pasted wholesale from the code
above it.
Matthew Fernandez [Tue, 16 Mar 2021 02:19:15 +0000 (02:19 +0000)]
Merge branch 'smattr/
FD7CAB8E -F5F4-476A-83DE-
B2F650DD87C6 ' into 'master'
fix: remove BROWSER #define from Windows MS Build compilation
Closes #1954
See merge request graphviz/graphviz!1828
Matthew Fernandez [Thu, 4 Mar 2021 01:25:59 +0000 (17:25 -0800)]
fix: remove BROWSER #define from Windows MS Build compilation
This is only used by two plugins, glitz and xlib, and it’s unclear whether
either are intended to run on Windows. The code path using BROWSER is also only
enabled when the build environment has sys/types.h and unistd.h, neither of
which typically exist on Windows. In any event, xdg-open is not the way to open
a browser on Windows. It is better that we exclude this and fail at compile time
than build plugins that fail in unpredictable ways at runtime. Closes #1954.
Matthew Fernandez [Tue, 16 Mar 2021 00:48:16 +0000 (00:48 +0000)]
Merge branch 'smattr/
6992578B -3535-4D79-B858-
D75963CAD598 ' into 'master'
Start 2.47 development series
See merge request graphviz/graphviz!1842
Matthew Fernandez [Tue, 16 Mar 2021 00:06:40 +0000 (17:06 -0700)]
Start 2.47 development series
Matthew Fernandez [Tue, 16 Mar 2021 00:04:01 +0000 (00:04 +0000)]
Merge branch 'smattr/
2438B2D8 -0DA8-4113-BB34-
552A50EC9C91 ' into 'master'
Stable Release 2.47.0
See merge request graphviz/graphviz!1835
Matthew Fernandez [Wed, 10 Mar 2021 02:41:03 +0000 (18:41 -0800)]
Stable Release 2.47.0
Matthew Fernandez [Wed, 10 Mar 2021 01:48:06 +0000 (01:48 +0000)]
Merge branch 'smattr/
DE0345C1 -564D-44F6-82A4-
8369EFE0151A ' into 'master'
fix: correctly recognize Windows packages in deploy script
Closes #1955
See merge request graphviz/graphviz!1834
Matthew Fernandez [Wed, 10 Mar 2021 01:08:42 +0000 (17:08 -0800)]
fix: correctly recognize Windows packages in deploy script
239f6301789b603202d500f7ae58e800354c1524 identified Windows packages containing
the word “Windows” but the package filenames actually have this in lower case.
Closes #1955.
Matthew Fernandez [Tue, 9 Mar 2021 16:44:14 +0000 (16:44 +0000)]
Merge branch 'smattr/
F122BD95 -99D1-4293-A809-
6EF587D2D8ED ' into 'master'
deploy: generate SHA256 checksums in addition to MD5, and also apply to macOS and Windows packages
Closes #1955
See merge request graphviz/graphviz!1827
Matthew Fernandez [Wed, 3 Mar 2021 02:12:23 +0000 (18:12 -0800)]
generate checksums for macOS and Windows packages during deployment
This is in addition to the previously generated portable source checksum. For
now, it is assumed we don't need checksums for the fined grained Linux packages.
Closes #1955.
Matthew Fernandez [Wed, 3 Mar 2021 01:52:41 +0000 (17:52 -0800)]
generate a SHA256 checksum of the release tarball in addition to MD5
Related to #1955.
Matthew Fernandez [Wed, 3 Mar 2021 01:50:59 +0000 (17:50 -0800)]
extract checksumming in deploy script into a function
Related to #1955.
Matthew Fernandez [Tue, 9 Mar 2021 01:25:24 +0000 (17:25 -0800)]
Merge branch 'swaldhoer/simple-python-fixes'
swaldhoer [Thu, 25 Feb 2021 21:45:58 +0000 (22:45 +0100)]
use main convention
use argparse to work with command line arguments
sort imports alphabetically
fix whitespace inconsistencies
fix some pylint errors
fix formatting
Matthew Fernandez [Sun, 7 Mar 2021 20:56:08 +0000 (20:56 +0000)]
Merge branch 'smattr/
8FF1769C -58CB-4DD6-891E-
3ACEE75C40A0 ' into 'master'
some libgvpr cleanup
See merge request graphviz/graphviz!1813
Matthew Fernandez [Mon, 1 Mar 2021 03:42:32 +0000 (19:42 -0800)]
avoid some use of literal 0 for a pointer
We can write this clearer as NULL.
Matthew Fernandez [Mon, 1 Mar 2021 03:40:11 +0000 (19:40 -0800)]
use more explicit types for some booleans
Now that we build with C99, we can be more expressive with types.
Matthew Fernandez [Mon, 1 Mar 2021 03:32:18 +0000 (19:32 -0800)]
reflow some lines
Matthew Fernandez [Mon, 1 Mar 2021 02:53:43 +0000 (18:53 -0800)]
remove some unnecessary bracketing
Matthew Fernandez [Mon, 1 Mar 2021 02:41:30 +0000 (18:41 -0800)]
undo another strcmp micro-optimization
Matthew Fernandez [Sun, 3 Jan 2021 18:03:33 +0000 (10:03 -0800)]
replace another sfstropen with agxbuf
Related to #1873.
Matthew Fernandez [Sun, 3 Jan 2021 17:35:10 +0000 (09:35 -0800)]
replace another sfstropen in GVPR with an agxbuf
Related to #1873.
Matthew Fernandez [Sun, 3 Jan 2021 01:49:25 +0000 (17:49 -0800)]
remove a use of sfstropen in GVPR
Related to #1873.
Matthew Fernandez [Sun, 7 Mar 2021 19:46:30 +0000 (19:46 +0000)]
Merge branch 'smattr/
37ce32ea -c880-4551-bbc7-
91d0a3ccc596 ' into 'master'
rewrite agxbputc as a function
Closes #1814
See merge request graphviz/graphviz!1812
Matthew Fernandez [Mon, 1 Mar 2021 04:30:59 +0000 (20:30 -0800)]
rewrite agxbputc as a function
This solves an issue where the macro implementation did not sufficiently bracket
its arguments. Fixes #1814.
Matthew Fernandez [Sat, 6 Mar 2021 16:58:15 +0000 (16:58 +0000)]
Merge branch 'smattr/
F8CE1A6E -745B-4768-839C-
5004B9EECA6E ' into 'master'
remove yet more strcmp micro-optimizations
See merge request graphviz/graphviz!1805
Matthew Fernandez [Sun, 28 Feb 2021 07:11:59 +0000 (23:11 -0800)]
remove commented out M_PI
Matthew Fernandez [Sun, 28 Feb 2021 06:36:04 +0000 (22:36 -0800)]
remove another strcmp micro-optimization
Matthew Fernandez [Sun, 28 Feb 2021 06:08:02 +0000 (22:08 -0800)]
remove no-longer-used Strcmp
Matthew Fernandez [Sun, 28 Feb 2021 06:03:43 +0000 (22:03 -0800)]
swap Strcmp calls for strcmp
Strcmp optimized strcmp by unrolling the first iteration of a byte comparison
loop. This is no longer an optimization. In modern compilers/libc, (1) strcmp is
generally no longer a byte-by-byte comparison loop and (2) the compiler knows
strcmp as a built-in and can do this kind of unrolling itself. As a result, the
compiler actually has to do *more* work to reverse Strcmp back into strcmp and
thus determine it can use, e.g., SIMD optimizations.
This is essentially the next step of
f5a326cb061866bb3beaa33c3e5169efe7fc134d .
Matthew Fernandez [Sat, 6 Mar 2021 01:54:26 +0000 (01:54 +0000)]
Merge branch 'smattr/
d509f519 -e63e-4df1-ab2b-
6daac754ff43 ' into 'master'
remove an intermediate buffer in libxdot’s jsonString
See merge request graphviz/graphviz!1800
Matthew Fernandez [Sat, 27 Feb 2021 04:10:31 +0000 (20:10 -0800)]
remove intermediate buffer in libxdot
The function jsonString was trying to optimize processing by constructing a
string in an intermediate agxbuf before passing this buffer to the caller’s
print callback. An implicit assumption is that the callback is significantly
more expensive than outputting to the intermediate buffer. This is not true. The
only callbacks ever passed to this function are agxbprint itself and fputs,
which does efficient buffering. Both of these are at least as efficient as
agxbuf, making the trip through the intermediate buffer actually a
*de-optimization*.
Matthew Fernandez [Sat, 27 Feb 2021 03:45:08 +0000 (19:45 -0800)]
remove irrelevant comment
JSON encoding needs no special UTF-8 handling.
Matthew Fernandez [Sat, 27 Feb 2021 03:31:05 +0000 (19:31 -0800)]
add a test case for xdot's JSON output
Related to #1958.
Matthew Fernandez [Sat, 27 Feb 2021 03:25:30 +0000 (19:25 -0800)]
refactor existing test cases that compile C to call common code
Matthew Fernandez [Sat, 27 Feb 2021 03:12:30 +0000 (19:12 -0800)]
helper test function for running C code
Matthew Fernandez [Sat, 27 Feb 2021 03:04:07 +0000 (19:04 -0800)]
helper test function for compiling C code
Matthew Fernandez [Sat, 27 Feb 2021 02:52:10 +0000 (18:52 -0800)]
add a test program for proving jsonXDot
Related to #1958.
Mark Hansen [Fri, 5 Mar 2021 09:21:31 +0000 (09:21 +0000)]
Merge branch 'master' into 'master'
Revert "Revert "Build docker images with buildkit""
Closes #1963
See merge request graphviz/graphviz!1829
Mark Hansen [Thu, 4 Mar 2021 10:06:56 +0000 (21:06 +1100)]
Revert "Revert "Build docker images with buildkit""
This reverts commit
6cdd95b8776d54eb1a474e1d90f7f3b7e85a7e01 .
I'm now confident I can make Docker buildkit caching work after
observing it work on graphviz.gitlab.io. repo.
I now understand why I wasn't seeing caching before:
- I was pushing to my own fork of graphviz
- I didn't push to the master branch
- So I didn't build a `live` tag
- So I didn't have anything to cache from
Matthew Fernandez [Wed, 3 Mar 2021 16:22:06 +0000 (16:22 +0000)]
Merge branch 'smattr/
7DFF32C2 -8BCC-4FDB-8174-
28981F4494E5 ' into 'master'
removes Windows strdup redirection
See merge request graphviz/graphviz!1797
Matthew Fernandez [Thu, 25 Feb 2021 03:19:17 +0000 (19:19 -0800)]
removes Windows strdup redirection
Microsoft already provides a shim that does this [0].
[0]: https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/strdup-wcsdup?view=msvc-160
Mark Hansen [Tue, 2 Mar 2021 11:13:08 +0000 (11:13 +0000)]
Merge branch 'arrows' into 'master'
Move arrows.html generation into jinja2 templates
See merge request graphviz/graphviz!1826
Mark Hansen [Tue, 2 Mar 2021 10:46:00 +0000 (10:46 +0000)]
Merge branch 'shapes-no-table' into 'master'
Generate shapes responsively: reflow small screens
See merge request graphviz/graphviz!1825
Mark Hansen [Tue, 2 Mar 2021 10:23:08 +0000 (21:23 +1100)]
Move arrows.html generation into jinja2 templates.
In preparation for moving this to Jekyll repo.
Mark Hansen [Tue, 2 Mar 2021 10:09:20 +0000 (21:09 +1100)]
Generate shapes responsively: reflow small screens
Don't use a fixed table of width 4, reflow to the available space.
This was a bit of a pain to get the CSS right. This stackoverflow answer
was very helpful: https://stackoverflow.com/a/
14155983 /171898
This is towards moving shapes.html into graphviz.gitlab.io repo. Simpler
for loops that jekyll can handle.
Mark Hansen [Tue, 2 Mar 2021 10:09:20 +0000 (21:09 +1100)]
Generate shapes responsively: reflow small screens
Don't use a fixed table of width 4, reflow to the available space.
This was a bit of a pain to get the CSS right. This stackoverflow answer
was very helpful: https://stackoverflow.com/a/
14155983 /171898
This is towards moving shapes.html into graphviz.gitlab.io repo. Simpler
for loops that jekyll can handle.
Mark Hansen [Tue, 2 Mar 2021 09:51:51 +0000 (09:51 +0000)]
Merge branch 'no-color' into 'master'
Remove colors.html.j2, it's migrated to docs repo
Closes #1967 and #1968
See merge request graphviz/graphviz!1824
Mark Hansen [Tue, 2 Mar 2021 09:44:37 +0000 (09:44 +0000)]
Merge branch 'awk-color' into 'master'
Fix single-line color generation
Closes #1967
See merge request graphviz/graphviz!1823
Mark Hansen [Tue, 2 Mar 2021 09:10:05 +0000 (20:10 +1100)]
Remove colors.html.j2, it's migrated to docs repo
Moved to graphviz.gitlab.io in
https://gitlab.com/graphviz/graphviz.gitlab.io/-/merge_requests/269
Fixes https://gitlab.com/graphviz/graphviz/-/issues/1968
Mark Hansen [Tue, 2 Mar 2021 08:59:20 +0000 (19:59 +1100)]
Fix single-line color generation
Looks like awk has actually added a `-s` flag in the last ten years, breaking this code! Amazing.
Fixes https://gitlab.com/graphviz/graphviz/-/issues/1967
Mark Hansen [Tue, 2 Mar 2021 08:59:20 +0000 (19:59 +1100)]
Fix single-line color generation
Looks like awk has actually added a `-s` flag in the last ten years, breaking this code! Amazing.
Fixes https://gitlab.com/graphviz/graphviz/-/issues/1967
Mark Hansen [Tue, 2 Mar 2021 08:39:39 +0000 (08:39 +0000)]
Merge branch 'color-template2' into 'master'
Close output file descriptor only after done writing
Closes #1965
See merge request graphviz/graphviz!1822
Mark Hansen [Tue, 2 Mar 2021 08:14:13 +0000 (19:14 +1100)]
Close output file descriptor only after done writing
Previously we would close the output as soon as we wrote a single line.
This didn't account for continuation lines, where $1 == "".
The subsequent printfs would be to a closed file.
Fixes #1965
Mark Hansen [Tue, 2 Mar 2021 08:12:33 +0000 (08:12 +0000)]
Merge branch 'color-template2' into 'master'
Split generation of colors.html in Makefile
See merge request graphviz/graphviz!1821
Mark Hansen [Tue, 2 Mar 2021 07:45:15 +0000 (18:45 +1100)]
Split generation of colors.html in Makefile
Allows us to separately generate then check in
the constituent color html files as includes in the graphviz.gitlab.io
repo.
Which would let us remove the colors.html template from this repo.
Mark Hansen [Tue, 2 Mar 2021 07:30:53 +0000 (07:30 +0000)]
Merge branch 'lang-2' into 'master'
Remove lang.html.j2: it's migrated repos
See merge request graphviz/graphviz!1820
Matthew Fernandez [Tue, 2 Mar 2021 06:44:45 +0000 (06:44 +0000)]
Merge branch 'smattr/
A6912F38 -21BB-46AC-AE57-
DF0CA1990112 ' into 'master'
strlen-related clean up and warning squashing
See merge request graphviz/graphviz!1795
Matthew Fernandez [Wed, 24 Feb 2021 04:08:02 +0000 (20:08 -0800)]
remove commented out execOp
Matthew Fernandez [Wed, 24 Feb 2021 04:07:45 +0000 (20:07 -0800)]
remove unnecessary bracketing
Matthew Fernandez [Wed, 24 Feb 2021 03:52:30 +0000 (19:52 -0800)]
remove use of int as size_t in gprintf
Matthew Fernandez [Wed, 24 Feb 2021 03:51:22 +0000 (19:51 -0800)]
remove use of int as size_t in pathAppend
This removes three -Wsign-conversion and -Wconversion warnings.
Matthew Fernandez [Wed, 24 Feb 2021 03:44:08 +0000 (19:44 -0800)]
use stronger typing for pathAppend
This removes one -Wsign-conversion warning.
Matthew Fernandez [Wed, 24 Feb 2021 03:37:37 +0000 (19:37 -0800)]
remove commented out code in make_map.c
Matthew Fernandez [Wed, 24 Feb 2021 03:35:57 +0000 (19:35 -0800)]
remove commented out #include
Matthew Fernandez [Wed, 24 Feb 2021 04:22:38 +0000 (20:22 -0800)]
remove intermediate buffer in dot_polygon
This buffer was only used to calculate how many bytes were necessary to
allocate. The semantics of snprintf allow us to achieve this without the buffer.
Matthew Fernandez [Wed, 24 Feb 2021 03:32:19 +0000 (19:32 -0800)]
remove use of int as size_t in dot_polygon
This removes four -Wconversion warnings.
Matthew Fernandez [Wed, 24 Feb 2021 03:31:08 +0000 (19:31 -0800)]
remove use of %d to print size_t
Now that we build with C99, %zu is available.
Matthew Fernandez [Wed, 24 Feb 2021 03:22:51 +0000 (19:22 -0800)]
remove some unnecessary casts
Matthew Fernandez [Wed, 24 Feb 2021 03:20:55 +0000 (19:20 -0800)]
remove some unnecessary bracketing
Matthew Fernandez [Wed, 24 Feb 2021 02:14:53 +0000 (18:14 -0800)]
remove use of int as size_t in colorxlate
This removes one -Wconversion and two -Wsign-conversion warnings.
Matthew Fernandez [Wed, 24 Feb 2021 02:11:03 +0000 (18:11 -0800)]
remove use of int as size_t in fullColor
This removes two -Wconversion and one -Wsign-conversion warnings.
Matthew Fernandez [Wed, 24 Feb 2021 02:00:54 +0000 (18:00 -0800)]
remove use of int as size_t in canontoken
This removes two -Wconversion and one -Wsign-conversion warnings.
Matthew Fernandez [Wed, 24 Feb 2021 01:56:03 +0000 (17:56 -0800)]
remove strncmp micro-optimization in rindexOf
Compilers can do this trick themselves if they decide there is speed to be
gained from it.
Matthew Fernandez [Wed, 24 Feb 2021 01:54:31 +0000 (17:54 -0800)]
remove use of int as size_t in rindexOf
This removes two -Wconversion and one -Wsign-conversion warnings.
Matthew Fernandez [Wed, 24 Feb 2021 02:06:19 +0000 (18:06 -0800)]
rewrite indexOf
There is a C standard library function that does almost all of this for us. This
removes two -Wconversion and one -Wsign-conversion warnings.
Matthew Fernandez [Wed, 24 Feb 2021 01:02:48 +0000 (17:02 -0800)]
remove commented out strdup
This is part of “Extensions to the C Library Part II: Dynamic Allocation
Functions, ISO/IEC TR 24731-2:2010.” It is also slated for inclusion in ISO C23.
In practice, all modern libc implementations provide it.
Matthew Fernandez [Mon, 1 Mar 2021 16:39:56 +0000 (16:39 +0000)]
Merge branch 'smattr/
487954c2 -c50c-4d99-a3d0-
a01379415823 ' into 'master'
port rtest2 to pytest and re-enable it
See merge request graphviz/graphviz!1794
Matthew Fernandez [Tue, 23 Feb 2021 05:06:28 +0000 (21:06 -0800)]
remove now-legacy rtest2 directory
Matthew Fernandez [Tue, 23 Feb 2021 04:51:46 +0000 (20:51 -0800)]
consolidate ported rtest2 into tests/
Matthew Fernandez [Tue, 23 Feb 2021 04:45:15 +0000 (20:45 -0800)]
port rtest2 to pytest
Only two of the reference tests pass, but this is at least the first step
towards resurrecting these.
Matthew Fernandez [Tue, 23 Feb 2021 04:13:53 +0000 (20:13 -0800)]
decompress test_reference
Git data is already compressed. We do not gain anything by storing compressed
files within the repository.
Mark Hansen [Mon, 1 Mar 2021 10:59:24 +0000 (10:59 +0000)]
Merge branch 'color-template' into 'master'
Use python template to generate colors.html
See merge request graphviz/graphviz!1819
Mark Hansen [Mon, 1 Mar 2021 10:55:22 +0000 (10:55 +0000)]
Merge branch 'w3data' into 'master'
Remove w3data.js from this repo
See merge request graphviz/graphviz!1818
Mark Hansen [Mon, 1 Mar 2021 10:52:58 +0000 (10:52 +0000)]
Merge branch 'lang' into 'master'
Generate lang.html with a template
See merge request graphviz/graphviz!1817
Mark Hansen [Mon, 1 Mar 2021 10:51:44 +0000 (10:51 +0000)]
Merge branch 'no_json' into 'master'
Remove graphviz_json_schema.json copy
See merge request graphviz/graphviz!1816
Mark Hansen [Mon, 1 Mar 2021 10:44:16 +0000 (10:44 +0000)]
Merge branch 'no-a_' into 'master'
Remove doc/info/a_{forward,nohead}.dot
See merge request graphviz/graphviz!1815
Mark Hansen [Mon, 1 Mar 2021 10:41:23 +0000 (21:41 +1100)]
Remove lang.html.j2: it's migrated repos
In https://gitlab.com/graphviz/graphviz.gitlab.io/-/merge_requests/268,
I added a copy of lang.html.j2 to graphviz.gitlab.io.
Now there's no need to keep two copies.
Instead we only generate the insides of lang.html: an EBNF HTML diagram,
grammar.html
Mark Hansen [Mon, 1 Mar 2021 09:42:10 +0000 (20:42 +1100)]
Use python template to generate colors.html
One step closer to migrating this to the other repo as a jekyll file.
Confirmed with diff that the only differences are extra blank lines,
nothing important.
Mark Hansen [Mon, 1 Mar 2021 10:12:37 +0000 (10:12 +0000)]
Merge branch 'no-html' into 'master'
Inline html.{1,2,3} files into shapes.html template
See merge request graphviz/graphviz!1814
Mark Hansen [Mon, 1 Mar 2021 09:26:29 +0000 (20:26 +1100)]
Remove w3data.js from this repo
It's been migrated fully to graphviz.gitlab.io docs repo.
No more references in this repo.
Mark Hansen [Mon, 1 Mar 2021 09:24:24 +0000 (20:24 +1100)]
Generate lang.html with a template
This is a bit more complex, but it does let us see the entire doc in one
template.
One step closer to being able to generate this in jekyll and have a
single source of truth for this doc.
Mark Hansen [Mon, 1 Mar 2021 09:11:41 +0000 (20:11 +1100)]
Remove graphviz_json_schema.json copy
This file is used in doc/infosrc/ to generate an HTML table. It's not
used here in this directory, it's just a copy.
This is unused here, not part of the html_DATA Makefile in this
directory.
Mark Hansen [Mon, 1 Mar 2021 09:07:51 +0000 (20:07 +1100)]
Remove doc/info/a_{forward,nohead}.dot
These seem completely unreferenced.
Mark Hansen [Mon, 1 Mar 2021 08:46:28 +0000 (19:46 +1100)]
Inline html.{1,2,3} files into shapes.html template
shapes.html is the only place these files are used.
Moving them into a template is one step towards being able to build this
file in the other graphviz repo (and having a single source of truth for
this doc)
Mark Hansen [Sun, 28 Feb 2021 11:19:07 +0000 (11:19 +0000)]
Merge branch 'no-buildkit' into 'master'
Revert "Build docker images with buildkit"
Closes #1963
See merge request graphviz/graphviz!1811
Mark Hansen [Sun, 28 Feb 2021 10:54:10 +0000 (10:54 +0000)]
Merge branch 'command' into 'master'
Delete command.html: moved to graphviz.gitlab.io
See merge request graphviz/graphviz!1810
Mark Hansen [Sun, 28 Feb 2021 10:52:21 +0000 (10:52 +0000)]
Merge branch 'mv-tcl' into 'master'
Move doc/info/*.tcl build scripts to doc/infosrc
See merge request graphviz/graphviz!1807