]>
granicus.if.org Git - graphviz/log
Matthew Fernandez [Mon, 22 Feb 2021 03:01:10 +0000 (19:01 -0800)]
fix buffer overflow in unflatten
GCC 8.3.0 with -Wformat-overflow is capable of noticing that the sprintf in this
function can overflow the target buffer.
Matthew Fernandez [Sun, 28 Feb 2021 06:24:55 +0000 (06:24 +0000)]
Merge branch 'smattr/
BF97B15D -EDF2-4F74-B79D-
E3C0E7E2124F ' into 'master'
fix GVPR's ability to comprehend absolute paths on Windows
Closes #1780
See merge request graphviz/graphviz!1790
Mark Hansen [Sun, 28 Feb 2021 06:04:40 +0000 (06:04 +0000)]
Merge branch 'redir' into 'master'
Redirect doc files to graphviz.org
See merge request graphviz/graphviz!1802
Matthew Fernandez [Sun, 3 Jan 2021 00:00:19 +0000 (16:00 -0800)]
fix: detect absolute paths correctly in GVPR on Windows
This code was incorrectly depending on WIN32_DLL which was not defined when the
source file was built. Rather than addressing this directly, we make gvpr comply
more accurately with its man page:
If progfile contains a slash character, the name is taken as the pathname of
the file.
We now look for a path separator, backslash on Windows and forward slash on
anything else. Fixes #1780.
Matthew Fernandez [Sat, 2 Jan 2021 23:59:19 +0000 (15:59 -0800)]
test case for #1780
Mark Hansen [Sun, 28 Feb 2021 03:15:05 +0000 (14:15 +1100)]
Redirect more duplicate docs to graphviz site
I've deleted schema.html instead of redirecting because it's not
intended to be shown as a top-level page on its own, but rather included
in another page as a subtree.
Towards https://gitlab.com/graphviz/graphviz.gitlab.io/-/issues/39
Mark Hansen [Sun, 28 Feb 2021 03:05:09 +0000 (14:05 +1100)]
chmod -x todo.html
No need for this to be executable. It doesn't have a #! line.
Mark Hansen [Sun, 28 Feb 2021 02:54:40 +0000 (13:54 +1100)]
Redirect doc files to graphviz.org
The canonical location for these docs is in the graphviz.gitlab.io repo,
and it's extra work to maintain them in both places. The files have
gotten a bit out of sync, and have been migrated to markdown in the
other repo.
Adding the redirects ensures that they point at the latest versions with
the latest changes.
Matthew Fernandez [Sat, 27 Feb 2021 20:11:38 +0000 (20:11 +0000)]
Merge branch 'smattr/
18D8E0C0 -7D8C-46F2-93F8-
78506439944D ' into 'master'
remove strcmp micro-optimizations
See merge request graphviz/graphviz!1788
Matthew Fernandez [Mon, 4 Jan 2021 00:16:23 +0000 (16:16 -0800)]
remove strcmp micro-optimizations
Modern compilers can do these tricks themselves, so we are better off writing
more straightforward readable code.
Matthew Fernandez [Sat, 27 Feb 2021 19:11:45 +0000 (19:11 +0000)]
Merge branch 'smattr/
F47441CD -2230-40EC-BADB-
64374F9272ED ' into 'master'
don't clone the history of submodules in Windows CI tasks
See merge request graphviz/graphviz!1787
Matthew Fernandez [Sun, 21 Feb 2021 17:58:06 +0000 (09:58 -0800)]
don't clone the history of submodules in Windows CI tasks
The Windows builds only need the tip of these repositories, so no need to spend
time and bandwidth retrieving their history.
Matthew Fernandez [Sat, 27 Feb 2021 18:35:42 +0000 (18:35 +0000)]
Merge branch 'smattr/
BD4AB1A8 -8439-48CA-8E01-
7E1A407AAB82 ' into 'master'
remove sed as a Windows build dependency
See merge request graphviz/graphviz!1786
Matthew Fernandez [Sun, 21 Feb 2021 05:35:01 +0000 (21:35 -0800)]
remove use of sed in CMake files
We now no longer need sed in either CMake or Visual Studio, removing it as a
build dependency on Windows.
Matthew Fernandez [Sun, 21 Feb 2021 05:18:38 +0000 (21:18 -0800)]
remove use of sed in Visual Studio files
It should now be possible to build Graphviz using Visual Studio on Windows
without sed installed.
Matthew Fernandez [Sun, 21 Feb 2021 05:15:33 +0000 (21:15 -0800)]
teach version script how to output CPP definitions
Matthew Fernandez [Sun, 21 Feb 2021 05:06:34 +0000 (21:06 -0800)]
remove use of sed hacks in autogen.sh to get version components
Matthew Fernandez [Sun, 21 Feb 2021 04:56:25 +0000 (20:56 -0800)]
add flags to version script to print individual version components
Currently unused.
Matthew Fernandez [Sun, 21 Feb 2021 04:38:49 +0000 (20:38 -0800)]
move patch version adjustment earlier in version script
This has no relevant effect right now, but will be useful for upcoming changes
that need to see the updated patch version when branching on what to output.
Matthew Fernandez [Fri, 26 Feb 2021 06:16:30 +0000 (06:16 +0000)]
Merge branch 'smattr/
2EA29827 -1F04-461D-8980-
B91F4AD999F4 ' into 'master'
more precise dependencies for CI build tasks
Closes #1959
See merge request graphviz/graphviz!1799
Matthew Fernandez [Fri, 26 Feb 2021 04:48:55 +0000 (20:48 -0800)]
more precise dependencies for CI build tasks
This is an optimization that allows, e.g., the ubuntu18-04-build task to start
as soon as its Docker image is available and the portable source tarball has
been built. Prior to this change, this task would also block on all the other
docker_build_* tasks. Closes #1959.
Matthew Fernandez [Fri, 26 Feb 2021 01:27:22 +0000 (01:27 +0000)]
Merge branch 'smattr/
5a886023 -3f7d-4966-81ba-
dae26ba1ae43 ' into 'master'
remove ksh as a build/test dependency
See merge request graphviz/graphviz!1764
Matthew Fernandez [Fri, 19 Feb 2021 04:40:17 +0000 (20:40 -0800)]
use the user's default shell for gvmap.sh
This removes a dependency on ksh. It is still possible to run this script under
ksh, but it is also now possible to run it under e.g. Bash.
Matthew Fernandez [Fri, 19 Feb 2021 04:33:21 +0000 (20:33 -0800)]
port gvmap.sh to POSIX-compatible syntax
This retains the ability to run this script with ksh, while also paving the way
for moving to a POSIX shell.
Matthew Fernandez [Fri, 19 Feb 2021 03:55:45 +0000 (19:55 -0800)]
remove unused clean up trap handler in gvmap
Nothing creates the files that this handler tries to delete, so it is not
necessary.
Matthew Fernandez [Thu, 25 Feb 2021 15:45:28 +0000 (15:45 +0000)]
Merge branch 'add-pylint' into 'master'
add pylint job
See merge request graphviz/graphviz!1784
swaldhoer [Sat, 20 Feb 2021 19:25:50 +0000 (20:25 +0100)]
Add Python dependencies as requirements.txt
Add linting of Python scripts
Matthew Fernandez [Wed, 24 Feb 2021 17:09:16 +0000 (17:09 +0000)]
Merge branch 'smattr/
0f3b0ef5 -6a75-43f6-9d83-
bb0784b8282f ' into 'master'
unify some Windows and non-Windows code
See merge request graphviz/graphviz!1763
Matthew Fernandez [Thu, 18 Feb 2021 05:15:54 +0000 (21:15 -0800)]
remove manual memory management of rectangle array
This unifies some Windows and non-Windows code, removes some unwise VLAs, and
removes the need to manually deallocate this array, making the code less error
prone. We could go further with removing manual allocations, but for now this is
a minimal net improvement.
Matthew Fernandez [Thu, 18 Feb 2021 05:01:25 +0000 (21:01 -0800)]
unify some array allocation across Windows and non-Windows
Just because GCC/Clang support variable length arrays, does not mean they are a
good idea. Using heap allocated memory for this is safer. This way we also get
to maintain a single code path. This adds some new compiler warnings, but
they're in line with the issues we already know (namely, passing int values as
allocation sizes).
Matthew Fernandez [Thu, 18 Feb 2021 04:53:54 +0000 (20:53 -0800)]
unify some fopen code across Windows and non-Windows
The mode flag 'b' is a no-op on POSIX, so we can use the same code everywhere.
Matthew Fernandez [Thu, 18 Feb 2021 04:35:36 +0000 (20:35 -0800)]
remove bool shims in diffimg
Now that we build with C99, the existence of this support is guaranteed to be
supplied in stdbool.h.
Matthew Fernandez [Thu, 18 Feb 2021 04:34:41 +0000 (20:34 -0800)]
remove commented out _WIN32 block
Mark Hansen [Wed, 24 Feb 2021 10:19:53 +0000 (10:19 +0000)]
Merge branch 'ci5' into 'master'
Change Docker context to be the repo root
See merge request graphviz/graphviz!1796
Mark Hansen [Wed, 24 Feb 2021 09:52:57 +0000 (20:52 +1100)]
Change Docker context to be the repo root
See https://stackoverflow.com/a/
24540011 /171898 and
https://docs.docker.com/engine/reference/builder/#usage
The directory passed to docker is the context. Previously we changed
directory into `ci/$IMAGE` then passed `.` as the "context".
Passing a subdir as context prevents any inclusion of files outside the
context, which isn't what we want: we want to include `requirements.txt`
from the root.
So instead, pass the entire repo as "context", and use the "-f" flag to
set the Dockerfile used.
Should help with #1743 and !1784
Matthew Fernandez [Tue, 23 Feb 2021 05:49:10 +0000 (05:49 +0000)]
Merge branch 'smattr/
1840627B -C284-4D16-B0FC-
2DEB1CA88F30 ' into 'master'
remove remaining Vim modeline comments
See merge request graphviz/graphviz!1762
Matthew Fernandez [Wed, 17 Feb 2021 01:06:33 +0000 (17:06 -0800)]
remove remaining Vim modeline comments
These have no effect in non-Vim editors or for Vim users that have modeline
disabled. A more modern way to achieve this is clang-format. This commit was
achieved with
$ find . -type f \( -iname "*.cs" -or -iname "*.y" -or -iname "*.l" -or \
-iname "*.m" -or -iname "*.c" -or -iname Makeile.am -or -iname "*.cpp" -or \
-iname "*.h" \) -exec sed -i '' -e ':a' -e 'N' -e '$!ba' -e \
's/\/\* vim:set [^\n]*\n\n//g' "{}" \;
and then manually collecting some further ones that were missing by this filter.
Matthew Fernandez [Tue, 23 Feb 2021 01:01:45 +0000 (17:01 -0800)]
Merge branch 'jarrodmillman:changelog-typo'
Jarrod Millman [Mon, 22 Feb 2021 18:56:39 +0000 (10:56 -0800)]
Fix release typo
Mark Hansen [Mon, 22 Feb 2021 21:14:09 +0000 (21:14 +0000)]
Merge branch 'ci5' into 'master'
Revert "Revert "Only run macOS CI on graphviz/graphviz repo""
See merge request graphviz/graphviz!1792
Mark Hansen [Mon, 22 Feb 2021 09:33:10 +0000 (20:33 +1100)]
Revert "Revert "Only run macOS CI on graphviz/graphviz repo""
This reverts commit
77c3b048f198798791193a028a77bf903a5b325e .
And replaces the variable with something that doesn't sound like a
GitLab predefined environment variable, to avoid surprise.
Towards #1951
https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
Matthew Fernandez [Sun, 21 Feb 2021 18:06:42 +0000 (18:06 +0000)]
Merge branch 'smattr/
37F06C45 -6BC7-4617-AA19-
99B187958B1C ' into 'master'
remove a useless conditional #include block
See merge request graphviz/graphviz!1759
Matthew Fernandez [Fri, 12 Feb 2021 01:17:39 +0000 (17:17 -0800)]
remove a useless conditional #include block
Matthew Fernandez [Sun, 21 Feb 2021 00:55:32 +0000 (00:55 +0000)]
Merge branch 'smattr/
c92aba1c -f53c-429e-acfd-
8c323bdc0654 ' into 'master'
some clean up of JSON back end
See merge request graphviz/graphviz!1756
Matthew Fernandez [Sun, 14 Feb 2021 19:50:08 +0000 (11:50 -0800)]
squash some -Wunused-parameter warnings
Matthew Fernandez [Sun, 14 Feb 2021 19:48:44 +0000 (11:48 -0800)]
abbreviate some code for comma-separated JSON
Matthew Fernandez [Sun, 14 Feb 2021 19:48:19 +0000 (11:48 -0800)]
remove some unnecessary bracketing
Matthew Fernandez [Sun, 14 Feb 2021 19:30:59 +0000 (11:30 -0800)]
remove commented out alternate write_subgs implementation
Matthew Fernandez [Sun, 21 Feb 2021 00:19:04 +0000 (00:19 +0000)]
Merge branch 'smattr/
65a6d0ab -fc93-4d90-8a02-
286d0922e43f ' into 'master'
remove regex usage and associated RxSpencer dependency
Closes #1919
See merge request graphviz/graphviz!1757
Matthew Fernandez [Sun, 14 Feb 2021 18:43:17 +0000 (10:43 -0800)]
remove RxSpencer dependency
Closes #1919.
Matthew Fernandez [Sun, 14 Feb 2021 18:40:12 +0000 (10:40 -0800)]
remove use of regex in smyrna
This "regex" was only ever used to match literals like "R" and the empty string.
Related to #1919.
Matthew Fernandez [Sun, 14 Feb 2021 18:31:14 +0000 (10:31 -0800)]
remove unused smyrna file
Matthew Fernandez [Sun, 14 Feb 2021 18:27:02 +0000 (10:27 -0800)]
remove use of regex for parsing SVG attributes
Related to #1919.
Matthew Fernandez [Sun, 14 Feb 2021 17:43:25 +0000 (09:43 -0800)]
add a test of user shapes
Matthew Fernandez [Sat, 20 Feb 2021 23:41:55 +0000 (23:41 +0000)]
Merge branch 'smattr/
005D38E6 -E842-4522-B368-
616652003649 ' into 'master'
fix HTML validation errors
Closes #1861
See merge request graphviz/graphviz!1758
Matthew Fernandez [Sun, 14 Feb 2021 22:05:19 +0000 (14:05 -0800)]
fix HTML validation errors in graphviz.html
Fixes #1861.
Matthew Fernandez [Sun, 14 Feb 2021 22:02:41 +0000 (14:02 -0800)]
fix HTML validation errors in types.html
Related to #1861.
Matthew Fernandez [Sun, 14 Feb 2021 21:38:47 +0000 (13:38 -0800)]
fit HTML validation errors in internal_todo.html
Related to #1861.
Matthew Fernandez [Sun, 14 Feb 2021 21:37:06 +0000 (13:37 -0800)]
fix validation error in shapes.html
Related to #1861.
Matthew Fernandez [Sun, 14 Feb 2021 21:26:49 +0000 (13:26 -0800)]
remove use of XMP tags in HTML
The XMP tag was deprecated for PRE [0]. Related to #1861.
[0]: https://html.spec.whatwg.org/multipage/obsolete.html#non-conforming-features
Matthew Fernandez [Sun, 14 Feb 2021 21:14:08 +0000 (13:14 -0800)]
fix invalid HTML in colors.html
Related to #1861.
Matthew Fernandez [Sat, 20 Feb 2021 23:05:50 +0000 (23:05 +0000)]
Merge branch 'smattr/
def8873c -a3d8-4ea5-bf26-
094a7b2f1f5c ' into 'master'
remove use of NiL in favor of NULL, and some other clean up
See merge request graphviz/graphviz!1755
Matthew Fernandez [Sun, 14 Feb 2021 17:03:17 +0000 (09:03 -0800)]
silence some -Wimplicit-fallthrough warnings
Matthew Fernandez [Sun, 14 Feb 2021 16:56:05 +0000 (08:56 -0800)]
remove NiL and use the standard library's NULL
There's no need for us to roll our own NULL substitute.
Matthew Fernandez [Sun, 14 Feb 2021 16:51:20 +0000 (08:51 -0800)]
remove commented out exconvert()
Mark Hansen [Sat, 20 Feb 2021 22:28:41 +0000 (22:28 +0000)]
Merge branch 'ci5' into 'master'
Revert "Only run macOS CI on graphviz/graphviz repo"
See merge request graphviz/graphviz!1785
Mark Hansen [Sat, 20 Feb 2021 22:07:19 +0000 (09:07 +1100)]
Revert "Only run macOS CI on graphviz/graphviz repo"
This reverts commit
5052447d34a37421282b8eb5a9677097518b86b7 .
Matthew Fernandez [Sat, 20 Feb 2021 16:29:21 +0000 (16:29 +0000)]
Merge branch 'smattr/
08168fc6 -58f9-44ca-845e-
9d35bd3b7699 ' into 'master'
clean up and bug fixes in libmingle
Closes #1938
See merge request graphviz/graphviz!1754
Matthew Fernandez [Sun, 14 Feb 2021 06:24:06 +0000 (22:24 -0800)]
remove useless comment
Matthew Fernandez [Sun, 14 Feb 2021 06:14:12 +0000 (22:14 -0800)]
replace header guards in mingle with more modern #pragma once
Matthew Fernandez [Sun, 14 Feb 2021 06:08:22 +0000 (22:08 -0800)]
fix memory leak in ANN bridge
Matthew Fernandez [Sun, 14 Feb 2021 06:02:54 +0000 (22:02 -0800)]
push some definitions closer to where they are used
Matthew Fernandez [Sun, 14 Feb 2021 05:56:05 +0000 (21:56 -0800)]
condense and simplify sorting code in ANN bridge
Related to #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:38:09 +0000 (21:38 -0800)]
remove useless inner loop in ANN bridge
Iterations after the first pass were no-ops. Closes #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:36:37 +0000 (21:36 -0800)]
mark dimension as a constant in ANN bridge
Related to #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:33:19 +0000 (21:33 -0800)]
remove unnecessary cast
Matthew Fernandez [Sun, 14 Feb 2021 05:32:00 +0000 (21:32 -0800)]
remove the ability to pass a dimension to ANN code
Internally this assumed dim == 4, so passing in a different value would result
in incorrect answers. Related to #1938.
Matthew Fernandez [Sun, 14 Feb 2021 05:24:09 +0000 (21:24 -0800)]
#include nearest_neighbor_graph_ann.h to avoid duplicating a prototype
Matthew Fernandez [Sun, 14 Feb 2021 05:20:25 +0000 (21:20 -0800)]
make nearest_neighbor_graph_ann.h #includable from C++
Mark Hansen [Sat, 20 Feb 2021 07:59:25 +0000 (07:59 +0000)]
Merge branch 'ci5' into 'master'
Only run macOS CI on graphviz/graphviz repo
Closes #1951
See merge request graphviz/graphviz!1783
Mark Hansen [Sat, 20 Feb 2021 07:35:19 +0000 (18:35 +1100)]
Only run macOS CI on graphviz/graphviz repo
Don't run on forks, which generally don't have access to macOS runners.
Fixes #1951
Mark Hansen [Sat, 20 Feb 2021 07:22:18 +0000 (07:22 +0000)]
Merge branch 'smoosh4' into 'master'
Don't checkout the source code for docker push
See merge request graphviz/graphviz!1782
Mark Hansen [Sat, 20 Feb 2021 07:08:40 +0000 (07:08 +0000)]
Merge branch 'smoosh3' into 'master'
Start building portable source ASAP
See merge request graphviz/graphviz!1781
Mark Hansen [Sat, 20 Feb 2021 07:07:12 +0000 (18:07 +1100)]
Don't checkout the source code for docker push
It's not used and not needed.
This might speed up the CI a little.
Based off
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
Mark Hansen [Sat, 20 Feb 2021 06:41:26 +0000 (06:41 +0000)]
Merge branch 'master' into 'master'
Fix docker push live step
See merge request graphviz/graphviz!1780
Mark Hansen [Sat, 20 Feb 2021 06:36:30 +0000 (17:36 +1100)]
Start building portable source ASAP
portable source doesn't need to depend on all previous stages, just the
building of ubuntu 18.04 image
Mark Hansen [Sat, 20 Feb 2021 06:18:40 +0000 (06:18 +0000)]
Merge branch 'master' into 'master'
Allow testing docker_push step in my own repo
See merge request graphviz/graphviz!1778
Mark Hansen [Sat, 20 Feb 2021 06:17:34 +0000 (17:17 +1100)]
Fix docker push live step
Was getting error
```
/bin/bash: line 118: docker: command not found
```
Mark Hansen [Sat, 20 Feb 2021 06:05:37 +0000 (17:05 +1100)]
Allow testing docker_push step in my own repo
With my own container registry
Before, I mistakenly thought that merge requests ran with the
credentials of graphviz/graphviz, now I see they only run with the
credentials of the source repo (markhnsn/graphviz). So it's safe to run
this on any master branch, even forks.
Mark Hansen [Sat, 20 Feb 2021 06:04:45 +0000 (06:04 +0000)]
Merge branch 'smoosh' into 'master'
docker: Split building SHA and pushing to :latest
See merge request graphviz/graphviz!1776
Mark Hansen [Sat, 20 Feb 2021 05:29:12 +0000 (16:29 +1100)]
docker: Split building SHA and pushing to :latest
Previously, we guarded the :latest tag by limiting it to master only,
not merge requests.
Now we need to split this:
- it's safe for merge requests to push to their own SHA, nobody else is
using that SHA
- the merge request tests assume that a docker image is tagged with a
SHA, so the merge request tests require the docker_build step to run.
I'm a bit disappointed I couldn't get this to work in a single step
(hence the undesirable duplication) -- perhaps there's a way to lock
down :latest within a single CI job that I'm missing?
This commit is loosely based off
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
Mark Hansen [Sat, 20 Feb 2021 04:45:37 +0000 (04:45 +0000)]
Merge branch 'smoosh' into 'master'
Bugfix: invalid spec
See merge request graphviz/graphviz!1775
Mark Hansen [Sat, 20 Feb 2021 04:44:37 +0000 (15:44 +1100)]
Bugfix: invalid spec
Forgot to capitalize this
Caused:
ERROR: Preparation failed: failed to pull image
"registry.gitlab.com/graphviz/graphviz/:
8437020a9de5bbd812cdc4cb09c94c349366631c "
with specified policies [always]: invalid reference format
(manager.go:205:0s)
Mark Hansen [Sat, 20 Feb 2021 04:34:28 +0000 (04:34 +0000)]
Merge branch 'smoosh' into 'master'
Stop pushing to deprecated per-image tags
See merge request graphviz/graphviz!1774
Mark Hansen [Sat, 20 Feb 2021 04:33:13 +0000 (15:33 +1100)]
Stop pushing to deprecated per-image tags
The tests are now all using separate images rather than tags on the one
image.
Mark Hansen [Sat, 20 Feb 2021 04:25:33 +0000 (04:25 +0000)]
Merge branch 'smoosh' into 'master'
Use Git SHAs fetching build and test docker images
See merge request graphviz/graphviz!1773
Mark Hansen [Sat, 20 Feb 2021 04:24:02 +0000 (15:24 +1100)]
Use Git SHAs fetching build and test docker images
Should fix a race condition on the :latest label
Took the chance to do a bit of deduplication. Not sure if I love the
result, but it does mean there's one place to edit for the schema of the
docker label to use.
Mark Hansen [Sat, 20 Feb 2021 04:12:20 +0000 (04:12 +0000)]
Merge branch 'smoosh' into 'master'
Bugfix: should have been /$IMAGE:latest
See merge request graphviz/graphviz!1772
Mark Hansen [Sat, 20 Feb 2021 04:11:37 +0000 (15:11 +1100)]
Bugfix: should have been /$IMAGE:latest
This was pushing all the different OS images to the top-level
graphviz/graphviz:latest package before.
Mark Hansen [Sat, 20 Feb 2021 04:11:08 +0000 (04:11 +0000)]
Merge branch 'smoosh' into 'master'
No-op: Use CI_IMAGE_REGISTRY variable
See merge request graphviz/graphviz!1771