]>
granicus.if.org Git - graphviz/log
Matthew Fernandez [Sat, 30 May 2020 01:25:53 +0000 (18:25 -0700)]
mark gvplugin_api input as const
Matthew Fernandez [Sat, 30 May 2020 01:10:33 +0000 (18:10 -0700)]
mark string arguments to gvplugin_package_record() as const
Magnus Jacobsson [Fri, 5 Jun 2020 13:01:22 +0000 (13:01 +0000)]
Merge branch 'replace-symlink-kludge-with-libedit-devel' into 'master'
Change to install libedit-devel instead of symlinking
See merge request graphviz/graphviz!1400
Magnus Jacobsson [Fri, 5 Jun 2020 10:01:00 +0000 (10:01 +0000)]
Merge branch 'add-rtest' into 'master'
Add rtest
See merge request graphviz/graphviz!1395
Magnus Jacobsson [Fri, 5 Jun 2020 09:09:20 +0000 (09:09 +0000)]
Merge branch 'fix-neato-mode-hier' into 'master'
Fix mode=hier in neato
Closes #1726
See merge request graphviz/graphviz!1393
Magnus Jacobsson [Tue, 2 Jun 2020 22:05:12 +0000 (00:05 +0200)]
Change to install libedit-devel instead of symlinking
Thanks @ellson
Magnus Jacobsson [Wed, 3 Jun 2020 11:33:16 +0000 (13:33 +0200)]
Remove python interpreter selection. Always use python3
Mark Hansen [Wed, 3 Jun 2020 11:28:31 +0000 (11:28 +0000)]
Merge branch 'entity-reference' into 'master'
Terminate > html entity references
See merge request graphviz/graphviz!1399
Mark Hansen [Wed, 3 Jun 2020 10:36:20 +0000 (20:36 +1000)]
Terminate > html entity references
Fixes #33
Mark Hansen [Wed, 3 Jun 2020 11:03:30 +0000 (11:03 +0000)]
Merge branch 'templates' into 'master'
Use jinja2.PackageLoader
See merge request graphviz/graphviz!1398
Mark Hansen [Tue, 2 Jun 2020 11:25:54 +0000 (21:25 +1000)]
Use jinja2.PackageLoader
This resolves the path to the templates/ folder relative to the python
package (templates.py).
The FileSystemLoader was relative to current working directory.
After this, it doesn't matter what your current working directory is.
Mark Hansen [Wed, 3 Jun 2020 10:40:14 +0000 (10:40 +0000)]
Merge branch 'consolidate' into 'master'
Extract common Jinja2 environment code
See merge request graphviz/graphviz!1397
Mark Hansen [Tue, 2 Jun 2020 11:23:26 +0000 (21:23 +1000)]
Extract common Jinja2 environment code
Into one file.
Matthew Fernandez [Sat, 30 May 2020 19:58:28 +0000 (12:58 -0700)]
fix documentation links
Fixes #1621.
Magnus Jacobsson [Mon, 1 Jun 2020 04:52:53 +0000 (06:52 +0200)]
Use test code and data from git repo in CI
Before this, the test code and data from the portable source was used,
but we didn't want to add all the rtest reference files to the
portable source so this is a better solution. It also removes the need
to rebuild the portable soruce when testing local changes to the
tests during development.
Magnus Jacobsson [Sun, 31 May 2020 16:07:43 +0000 (18:07 +0200)]
Remove trailing whitespace
Magnus Jacobsson [Sun, 31 May 2020 15:46:41 +0000 (17:46 +0200)]
Add rtest to CI
Magnus Jacobsson [Sun, 31 May 2020 15:41:10 +0000 (17:41 +0200)]
Add output of success when verbose
Magnus Jacobsson [Sun, 31 May 2020 15:36:57 +0000 (17:36 +0200)]
Refactor python interpreter selection
Magnus Jacobsson [Sun, 31 May 2020 15:36:02 +0000 (17:36 +0200)]
Install graphviz-gd rpm and deps to get png
Magnus Jacobsson [Sun, 31 May 2020 14:41:02 +0000 (16:41 +0200)]
Change to use installed diffimg in rtest.sh
Magnus Jacobsson [Sat, 4 Apr 2020 14:15:51 +0000 (16:15 +0200)]
Add ksh to Ubuntu 18.04 & 19.10 Dockerfiles. Needed for rtest
Magnus Jacobsson [Fri, 3 Apr 2020 15:46:27 +0000 (17:46 +0200)]
Temporarily disable unstable fdp test
This was originally thought to be a bug, see
https://gitlab.com/graphviz/graphviz/-/issues/1690, but it's the
expected behavior.
Magnus Jacobsson [Fri, 3 Apr 2020 14:59:58 +0000 (16:59 +0200)]
Update linux.x86 rtest url_dot.*map* reference files with sligthly changed coordinates
Magnus Jacobsson [Fri, 3 Apr 2020 14:53:34 +0000 (16:53 +0200)]
Update linux.x86 rtest gv reference files with sligthly changed coorinates
Magnus Jacobsson [Fri, 3 Apr 2020 14:51:59 +0000 (16:51 +0200)]
Remove redundant attributes from rtest linux.x86 reference data
Magnus Jacobsson [Fri, 3 Apr 2020 14:11:56 +0000 (16:11 +0200)]
Remove obsolete samearrowhead/tail attributes from rtest reference data
Magnus Jacobsson [Fri, 3 Apr 2020 14:04:34 +0000 (16:04 +0200)]
Remove obsolete samearrowhead/tail attributes from rtest input data
Magnus Jacobsson [Fri, 3 Apr 2020 13:06:35 +0000 (15:06 +0200)]
Update linux.x86 rtest svg reference files
Compared old and new images by visual inspection and found no
differences except:
html2_dot.svg: Color names used instead of hex codes which gives
different shades of gray. Seems to conform to SVG color scheme
according to https://www.graphviz.org/doc/info/colors.html. Slightly
different edge contact point.
url_dot.svg: Color names used instead of hex codes which gives
different shades of green and gray. Seems to conform to SVG color
scheme according to https://www.graphviz.org/doc/info/colors.html.
cairo_dot_cairo.svg: Old has white background. New has
transparent. This seems ok since the default bgcolor is <none>
according to https://www.graphviz.org/doc/info/attrs.html#a:bgcolor.
Magnus Jacobsson [Fri, 3 Apr 2020 10:10:27 +0000 (12:10 +0200)]
Update linux.x86 rtest ps & ps2 reference files
Compared old and new images by visual inspection and found no
differences except:
size_ex_dot.ps: A huge graph with slightly different edge routing.
Magnus Jacobsson [Fri, 3 Apr 2020 09:34:31 +0000 (11:34 +0200)]
Update linux.x86 rtest png reference files
Compared old and new images by visual inspection and found no
differences except:
decorate_dot.png: Quite different aspect ratio. Size changed from 1413
x 2963 to 1191 x 1644. Some text overlap in the new one.
fdp_clus_fdp.png: Edge overlap nodes in the old one. The new one is
ok.
Magnus Jacobsson [Fri, 3 Apr 2020 09:18:56 +0000 (11:18 +0200)]
Set rtest exit status to total number of errors
Magnus Jacobsson [Mon, 30 Mar 2020 14:34:12 +0000 (16:34 +0200)]
Disable non-working ksh version check
John Ellson [Tue, 2 Jun 2020 17:32:02 +0000 (13:32 -0400)]
back out LATEST softlink changes to unbreak pipeline
John Ellson [Tue, 2 Jun 2020 17:04:13 +0000 (13:04 -0400)]
do the same for the md5
Magnus Jacobsson [Tue, 2 Jun 2020 16:58:10 +0000 (18:58 +0200)]
Update ChangeLog
John Ellson [Tue, 2 Jun 2020 16:31:58 +0000 (12:31 -0400)]
maintain a graphviz-LATEST.tar.gz softlink to simplify the web page linkage
Magnus Jacobsson [Tue, 2 Jun 2020 14:22:22 +0000 (16:22 +0200)]
Fix mode=hier in neato
Fixes https://gitlab.com/graphviz/graphviz/-/issues/1726.
The bug was introduced in
443592f1e8950df88f6df9c71b60667c9ad98006
Mark Hansen [Tue, 2 Jun 2020 11:30:03 +0000 (11:30 +0000)]
Merge branch 'inline-all-shapes' into 'master'
Inline shapes.3 into shapes.html.j2
See merge request graphviz/graphviz!1392
Mark Hansen [Tue, 2 Jun 2020 11:28:35 +0000 (11:28 +0000)]
Merge branch 'shapes-html' into 'master'
Inline shapes.1 and shapes.2 into shapes.html.j2
See merge request graphviz/graphviz!1391
Mark Hansen [Tue, 2 Jun 2020 11:06:37 +0000 (21:06 +1000)]
Inline shapes.3 into shapes.html.j2
Now shapes.html.j2 is a complete template for the shapes.html page.
Mark Hansen [Tue, 2 Jun 2020 11:03:54 +0000 (11:03 +0000)]
Merge branch 'shapes-html' into 'master'
Update shapes.html to match output of mkshhtml.py
See merge request graphviz/graphviz!1390
Mark Hansen [Tue, 2 Jun 2020 10:50:29 +0000 (20:50 +1000)]
Inline shapes.1 and shapes.2 into shapes.html.j2
Mark Hansen [Tue, 2 Jun 2020 10:42:08 +0000 (20:42 +1000)]
Update shapes.html to match output of mkshhtml.py
Whitespace changes and a diff in a PRE tag.
Mark Hansen [Tue, 2 Jun 2020 09:09:20 +0000 (09:09 +0000)]
Merge branch '
D987C1A2 -7266-425B-85A9-
0066E60CA0EA ' into 'master'
write output of long chain test to /dev/null
Closes #1720
See merge request graphviz/graphviz!1382
Magnus Jacobsson [Mon, 1 Jun 2020 15:50:58 +0000 (15:50 +0000)]
Merge branch 'squash-fedora-docker-images' into 'master'
Squash Fedora Dockerfiles yums into fewer layers
See merge request graphviz/graphviz!1389
Magnus Jacobsson [Mon, 1 Jun 2020 06:53:53 +0000 (08:53 +0200)]
Squash Fedora Dockerfiles yums into fewer layers
Magnus Jacobsson [Mon, 1 Jun 2020 15:27:32 +0000 (15:27 +0000)]
Merge branch 're-add-expat-devel-to-fedora33-dockerfile' into 'master'
Re-add expat-devel to Fedora33 Dockerfile
See merge request graphviz/graphviz!1384
Matthew Fernandez [Sun, 31 May 2020 17:22:07 +0000 (10:22 -0700)]
write output of long chain test to /dev/null
This avoids generating a large file in the source tree that we don't need. In my
runs in a Linux VM, this also significantly speeds up the test suite.
Closes #1720.
Mark Hansen [Mon, 1 Jun 2020 12:25:20 +0000 (12:25 +0000)]
Merge branch 'mksshhtml' into 'master'
Convert mkshhtml from ksh to Python/Jinja2
See merge request graphviz/graphviz!1388
Mark Hansen [Mon, 1 Jun 2020 12:03:23 +0000 (22:03 +1000)]
Convert mkshhtml from ksh to Python/Jinja2
Soon I'll inline the other parts of shapes.html into this template,
which should give us more flexibility to easily
change the template.
Magnus Jacobsson [Mon, 1 Jun 2020 09:38:30 +0000 (11:38 +0200)]
Replace no longer existent qt5-devel with qt5-qtbase-devel
Magnus Jacobsson [Mon, 1 Jun 2020 09:30:10 +0000 (11:30 +0200)]
Re-add expat-devel to Fedora 33 Dockerfile
Was implicitly removed with
9c8ec112a76feaa7278374eb9192b8acb0280cf8 ,
but is required from redhat/graphviz.spec.fedora.in.
Mark Hansen [Mon, 1 Jun 2020 11:52:37 +0000 (11:52 +0000)]
Merge branch 'merge-attrs' into 'master'
Merge mktypes.py into mkattrs.html
See merge request graphviz/graphviz!1387
Mark Hansen [Mon, 1 Jun 2020 11:41:34 +0000 (11:41 +0000)]
Merge branch 'attrs-inline' into 'master'
Migrate mktypes.sh from ksh to Python/Jinja2
See merge request graphviz/graphviz!1386
Mark Hansen [Mon, 1 Jun 2020 11:31:21 +0000 (21:31 +1000)]
Merge mktypes.py into mkattrs.html
Ultimately only one HTML page is generated.
This ensures the entire page is present in one template.
Verified there are no diffs in the output.
Mark Hansen [Mon, 1 Jun 2020 11:19:12 +0000 (21:19 +1000)]
Migrate mktypes.sh from ksh to Python/Jinja2
This is one step towards creating the attrs.html page from one
python/jinja2 template.
Mark Hansen [Mon, 1 Jun 2020 11:18:10 +0000 (11:18 +0000)]
Merge branch 'attrs-inline' into 'master'
Inline attrs.1 into Jinja2 template
See merge request graphviz/graphviz!1385
Mark Hansen [Mon, 1 Jun 2020 11:06:00 +0000 (11:06 +0000)]
Merge branch 'attrs-jinja3' into 'master'
Convert mkattrs.sh to Python/Jinja2 templating
See merge request graphviz/graphviz!1379
Mark Hansen [Mon, 1 Jun 2020 10:51:39 +0000 (20:51 +1000)]
Inline attrs.1 into Jinja2 template
It's nice to have fewer moving parts, and brings
the context together.
Mark Hansen [Sun, 17 May 2020 07:12:52 +0000 (17:12 +1000)]
Convert mkattrs.sh to Python/Jinja2 templating
John Ellson [Sun, 31 May 2020 23:44:35 +0000 (19:44 -0400)]
don't suppress make errors for documentation targets
John Ellson [Sun, 31 May 2020 22:24:44 +0000 (18:24 -0400)]
fix syntax error instead (BuildRequires: glade3-libgradeui-devel)
John Ellson [Sun, 31 May 2020 21:43:22 +0000 (17:43 -0400)]
remove Requires for glade3-libgladeui-devel from all Fedora
John Ellson [Sun, 31 May 2020 18:36:02 +0000 (14:36 -0400)]
add ghostscript to Buildrequres in spec files
John Ellson [Sun, 31 May 2020 18:30:04 +0000 (14:30 -0400)]
don't require glade3-libgladeui-devel on fc33 or later
John Ellson [Sun, 31 May 2020 18:02:57 +0000 (14:02 -0400)]
remove requirement for glade3-libgladeui-devel - no longer used
Mark Hansen [Sun, 31 May 2020 11:56:54 +0000 (11:56 +0000)]
Merge branch 'update-attrs' into 'master'
Re-generate attrs.html from doc/infosrc
See merge request graphviz/graphviz!1381
Mark Hansen [Sun, 31 May 2020 11:55:26 +0000 (11:55 +0000)]
Merge branch 'mypy' into 'master'
Ignore mypy Python typechecking directory.
See merge request graphviz/graphviz!1380
Mark Hansen [Sun, 31 May 2020 11:47:08 +0000 (11:47 +0000)]
Merge branch 'sdlshapespng' into 'master'
Replace usages of sdlshapes.jpg with sdlshapes.png
See merge request graphviz/graphviz!1378
Mark Hansen [Sun, 31 May 2020 11:35:54 +0000 (21:35 +1000)]
Re-generate attrs.html from doc/infosrc
There have been a few updates to infosrc that haven't
cascaded to the doc/ directory. Fix that.
Long-term we probably want to have these automatically built from source.
Mark Hansen [Sun, 31 May 2020 11:33:16 +0000 (21:33 +1000)]
Ignore mypy Python typechecking directory.
Mark Hansen [Sun, 31 May 2020 11:12:39 +0000 (11:12 +0000)]
Merge branch 'output-into-header' into 'master'
Docs: Migrate header and footer into template
See merge request graphviz/graphviz!1377
Mark Hansen [Sat, 16 May 2020 04:38:46 +0000 (14:38 +1000)]
Replace usages of sdlshapes.jpg with sdlshapes.png
There were a lot of compression artifacts in the .jpg, which the .png
doesn't have. It's rendering black lines
and text on a white background, JPEG's
compression wasn't really made for this.
As a bonus, this cuts a dep on the GMT library.
Mark Hansen [Sun, 31 May 2020 10:48:59 +0000 (20:48 +1000)]
Docs: Migrate header and footer into template
Mark Hansen [Sun, 31 May 2020 03:07:08 +0000 (03:07 +0000)]
Merge branch '
9f864c3e -ade8-4fa8-aa86-
38becf1f96cc ' into 'master'
various small cleanup
See merge request graphviz/graphviz!1376
Matthew Fernandez [Sun, 31 May 2020 02:30:06 +0000 (19:30 -0700)]
remove unused vmstub.h
Matthew Fernandez [Mon, 25 May 2020 20:44:50 +0000 (13:44 -0700)]
fix comment typo
Matthew Fernandez [Mon, 25 May 2020 18:29:07 +0000 (11:29 -0700)]
remove unused CLIPBB macro
Matthew Fernandez [Mon, 25 May 2020 18:25:39 +0000 (11:25 -0700)]
remove MEMSET macro
This macro stepped the target pointer forwards, but the only place in which it
was used subsequently stepped the pointer backwards. The manual unrolling of
short lengths in the macro is something modern compilers and/or CPUs are capable
of if the length is predictable statically or dynamically, respectively.
Mark Hansen [Sat, 30 May 2020 23:58:18 +0000 (23:58 +0000)]
Merge branch 'jinja2' into 'master'
Migrate output format doc generation ksh to jinja2
See merge request graphviz/graphviz!1362
John Ellson [Sat, 30 May 2020 16:22:35 +0000 (12:22 -0400)]
ghostscript needed for ps2pdf, for pdf docs -- fix for #1719
Mark Hansen [Sat, 16 May 2020 08:08:12 +0000 (18:08 +1000)]
Migrate output format doc generation ksh to jinja2
This commit replaces the ksh-based templating with Python Jinja2
templating.
Previously output.html was generated with:
- output.1
- the output of mkoutput.sh
- output.2
My end goal here is to make it much simpler to generate more complex
output format docs - however I've made this change so that the output is
virtually unchanged, except for HTML-escaping a single apostrophe.
My plan is to follow this up with adding some more features to the
output format documentation.
Templating in general provides a few opportunities:
- safe auto-html-escaping
- easier editing, easier adding of more data
- some separation of logic and templating
- inclusion of subtemplates
I chose Jinja2 because:
- It's the most popular Python templating engine, used by mature
products like Ansible and Flask.
- Graphviz's docs generation already takes a dependency on Python for
jconvert.py.
- The Python language is pretty accessible to contributors.
- Jinja2 seems pretty stable, going back to 2007. Unlikely to break
soon.
Alternatives considered:
- I could just as well have gone with Go's stdlib template/html but I
don't think Go is already used to build Graphviz, and Go isn't as
popular as Python, so not as accessible to contributors.
- Python Django templates: they're pretty similar to Jinja2, but I think
Django's templates are more heavyweight
Mark Hansen [Fri, 29 May 2020 12:04:33 +0000 (12:04 +0000)]
Merge branch 'makef' into 'master'
Add rule to build schema.html in Makefile
See merge request graphviz/graphviz!1354
Mark Hansen [Thu, 14 May 2020 11:49:32 +0000 (21:49 +1000)]
Add rule to build schema.html in Makefile
Fixes error when running Makefile:
make: *** No rule to make target `schema.html', needed by `all'. Stop.
Mark Hansen [Thu, 28 May 2020 11:21:18 +0000 (11:21 +0000)]
Merge branch 'man-fix' into 'master'
Fixed man pages according to the man page scan
See merge request graphviz/graphviz!1367
Mark Hansen [Thu, 28 May 2020 10:58:27 +0000 (10:58 +0000)]
Merge branch '
6bb063a6 -d073-4d0a-8d5c-
3f41f0a3e248 ' into 'master'
remove unused dotgen2
See merge request graphviz/graphviz!1366
Mark Hansen [Thu, 28 May 2020 10:56:39 +0000 (10:56 +0000)]
Merge branch '
3ac2f1bd -c3cc-445c-8cc6-
6da2d9487a51 ' into 'master'
use Python 3 compatible syntax in autotools check
Closes #1626
See merge request graphviz/graphviz!1373
Mark Hansen [Thu, 28 May 2020 10:55:15 +0000 (10:55 +0000)]
Merge branch 'phony' into 'master'
Mark Makefiles that don't generate files as .PHONY
See merge request graphviz/graphviz!1361
Mark Hansen [Thu, 28 May 2020 10:54:08 +0000 (10:54 +0000)]
Merge branch 'ps_to_jpg' into 'master'
Remove unused script ps_to_jpg.sh
See merge request graphviz/graphviz!1358
Mark Hansen [Thu, 28 May 2020 10:53:54 +0000 (10:53 +0000)]
Merge branch 'cleanupgif' into 'master'
make distclean: rm {forward,back,both,nohead}.gif
See merge request graphviz/graphviz!1360
Mark Hansen [Thu, 28 May 2020 10:53:38 +0000 (10:53 +0000)]
Merge branch 'awk' into 'master'
brewer.awk: Close file after opening.
See merge request graphviz/graphviz!1353
Mark Hansen [Thu, 28 May 2020 10:53:18 +0000 (10:53 +0000)]
Merge branch 'psconvert' into 'master'
doc: Use 'gmt psconvert' -- new name for ps2raster
See merge request graphviz/graphviz!1357
Mark Hansen [Thu, 28 May 2020 10:52:53 +0000 (10:52 +0000)]
Merge branch 'deadcode' into 'master'
Remove unused functions from w3data.js
See merge request graphviz/graphviz!1352
Mark Hansen [Thu, 28 May 2020 10:52:33 +0000 (10:52 +0000)]
Merge branch 'deadmkoutputs' into 'master'
doc: Remove dead code for lines starting with '#<'
See merge request graphviz/graphviz!1356
Magnus Jacobsson [Wed, 27 May 2020 21:24:18 +0000 (21:24 +0000)]
Merge branch 'centos' into 'master'
Squash CentOS Dockerfiles yums into fewer layers
See merge request graphviz/graphviz!1364
Magnus Jacobsson [Wed, 27 May 2020 15:36:58 +0000 (17:36 +0200)]
Merge branch 'mr-graphviz-1363'
Magnus Jacobsson [Wed, 27 May 2020 14:42:42 +0000 (14:42 +0000)]
Merge branch 'noupdate' into 'master'
Collapse CI Dockerfile into a single layer
See merge request graphviz/graphviz!1359
Matthew Fernandez [Sun, 24 May 2020 16:55:56 +0000 (09:55 -0700)]
use Python 3 compatible syntax in autotools check
We expect `python` to be a symlink to Python 3, not Python 2 but it does not
hurt to use syntax compatible with both. Other Python checks in configure.ac
were already using compatible syntax.
Fixes #1626.
Magnus Jacobsson [Fri, 22 May 2020 13:59:37 +0000 (13:59 +0000)]
Merge branch 'class-doc' into 'master'
Add documentation for SVG class attribute
See merge request graphviz/graphviz!1369