]>
granicus.if.org Git - graphviz/log
Magnus Jacobsson [Sat, 26 Sep 2020 10:13:42 +0000 (12:13 +0200)]
Skip execution of dot_builtins in tools test for Centos and Fedora builds
Fails because dot_builtins is not installed for Ubuntu or Centos. See
https://gitlab.com/graphviz/graphviz/-/issues/1839.
Magnus Jacobsson [Sat, 26 Sep 2020 08:09:00 +0000 (10:09 +0200)]
Skip execution of all tools not built with MSBuild in tools test for MSBuild builds
Fails because not all tools are built with MSBuild. See
https://gitlab.com/graphviz/graphviz/-/issues/1837.
Magnus Jacobsson [Sat, 26 Sep 2020 08:07:08 +0000 (10:07 +0200)]
Add all tools built with autotools on Ubuntu 18.04 to tools test
Magnus Jacobsson [Sat, 26 Sep 2020 11:26:06 +0000 (13:26 +0200)]
Fix gvmap.sh -? option to exit with zero exit status
Magnus Jacobsson [Sat, 26 Sep 2020 09:53:42 +0000 (11:53 +0200)]
Correct shebang of gvmap.sh to use ksh
Magnus Jacobsson [Sat, 26 Sep 2020 08:52:45 +0000 (10:52 +0200)]
Add option -? for usage to vimdot
Magnus Jacobsson [Sat, 26 Sep 2020 07:32:39 +0000 (09:32 +0200)]
Skip execution of gvpack in tools test for non-Windows CMake builds
Fails becasue gvpack does not find libgvplugin_neato_layout.so.6 when
built with CMake. See
https://gitlab.com/graphviz/graphviz/-/issues/1838.
Magnus Jacobsson [Thu, 24 Sep 2020 16:18:59 +0000 (18:18 +0200)]
Add check of usage to tools test
Magnus Jacobsson [Fri, 25 Sep 2020 06:38:33 +0000 (08:38 +0200)]
Fix edgepaint -? to actually print usage instead of error
Magnus Jacobsson [Fri, 25 Sep 2020 06:08:03 +0000 (08:08 +0200)]
Fix edgepaint -o option
Magnus Jacobsson [Thu, 24 Sep 2020 21:05:58 +0000 (23:05 +0200)]
Fix apparently incorrect indentation in mingle
This change corrects hard-to-read code by changing a few instances of
four spaces to tabs which is the prevalent indentation method in the
surrounding code. There are more incorrect indentation in this file,
but it is left untouched since it is less distracting.
Magnus Jacobsson [Thu, 24 Sep 2020 16:18:32 +0000 (18:18 +0200)]
Correct misspelled 'smyrna' in usage
Magnus Jacobsson [Thu, 24 Sep 2020 16:17:57 +0000 (18:17 +0200)]
Remove '"' from usage text in non-Windows version of dotty
Removed both from dotty.bsh and dotty.sh which is the one that is
released as dotty.
Magnus Jacobsson [Fri, 25 Sep 2020 14:57:05 +0000 (16:57 +0200)]
Skip execution of all tools not built with CMake in tools test for CMake builds
Fails because not all tools are built with CMake. See
https://gitlab.com/graphviz/graphviz/-/issues/1753 and
https://gitlab.com/graphviz/graphviz/-/issues/1836.
Magnus Jacobsson [Fri, 25 Sep 2020 14:56:02 +0000 (16:56 +0200)]
Skip execution of mingle in tools test for Ubuntu and Centos builds
Fails because mingle is not built for Ubuntu and Centos. See
https://gitlab.com/graphviz/graphviz/-/issues/1835.
Magnus Jacobsson [Fri, 25 Sep 2020 14:55:14 +0000 (16:55 +0200)]
Skip execution of smyrna in tools test for Centos builds
Fails because smyrna is not built for Centos. See
https://gitlab.com/graphviz/graphviz/-/issues/1834.
Magnus Jacobsson [Sun, 20 Sep 2020 15:26:41 +0000 (17:26 +0200)]
Skip execution of smyrna in tools test for Windows MSBuilds
Fails because of missing DLLs. See
https://gitlab.com/graphviz/graphviz/-/issues/1829.
Magnus Jacobsson [Sat, 19 Sep 2020 15:39:31 +0000 (17:39 +0200)]
Add new tools test that tests that all tools can be started
Magnus Jacobsson [Thu, 24 Sep 2020 15:46:31 +0000 (17:46 +0200)]
Propagate OS ID to pytest
Magnus Jacobsson [Sun, 20 Sep 2020 20:55:49 +0000 (22:55 +0200)]
Fix smyrna -? to actually print usage instead of error
Magnus Jacobsson [Sun, 20 Sep 2020 20:02:44 +0000 (22:02 +0200)]
Add option -? for usage to non-Windows version of lneato
Added the option to lneato.ksh, lneato.bsh and lneato.sh which is the
one that is released as lneato.
Magnus Jacobsson [Sun, 20 Sep 2020 19:50:06 +0000 (21:50 +0200)]
Add option -? for usage to non-Windows version of dotty
Magnus Jacobsson [Sun, 20 Sep 2020 12:52:03 +0000 (14:52 +0200)]
Add option -? for usage to Windows version of lneato
Magnus Jacobsson [Sun, 20 Sep 2020 12:48:09 +0000 (14:48 +0200)]
Add option -? for usage to Windows version of dotty
Magnus Jacobsson [Sun, 20 Sep 2020 11:23:06 +0000 (13:23 +0200)]
Add option -? for usage to diffimg
Magnus Jacobsson [Thu, 17 Sep 2020 16:07:35 +0000 (18:07 +0200)]
Add archiving of test report also from tests on Windows
Matthew Fernandez [Fri, 2 Oct 2020 02:16:40 +0000 (02:16 +0000)]
Merge branch '
0943AE25 -50C6-419B-8583-
E855B1BA66AA ' into 'master'
fix name of rebuild_vlists in an error message
See merge request graphviz/graphviz!1596
Matthew Fernandez [Thu, 1 Oct 2020 14:39:23 +0000 (07:39 -0700)]
Merge branch 'master' into HEAD
Matthew Fernandez [Thu, 1 Oct 2020 14:38:55 +0000 (07:38 -0700)]
add changelog note about E2K support
Related to !1595.
Matthew Fernandez [Wed, 30 Sep 2020 15:03:18 +0000 (15:03 +0000)]
Merge branch '
9B333B00 -0CA0-4019-8DF1-
DC96CA0EFF97 ' into 'master'
switch to ustar POSIX format for tarballs produced by make dist
Closes #1830
See merge request graphviz/graphviz!1590
Matthew Fernandez [Wed, 30 Sep 2020 15:01:12 +0000 (08:01 -0700)]
fix name of rebuild_vlists in an error message
Matthew Fernandez [Thu, 24 Sep 2020 01:52:23 +0000 (18:52 -0700)]
switch to ustar POSIX format for tarballs produced by make dist
Without setting this option, Automake was defaulting to the “V7” format that
only supports filenames up to 99 characters. This was causing the following
(unnoticed) error during portable source generation:
tardir=graphviz-2.44.2~dev.
20200921 .1021 && ${TAR-tar} chof - "$tardir" | eval GZIP= gzip --best -c >graphviz-2.44.2~dev.
20200921 .1021.tar.gz
tar: graphviz-2.44.2~dev.
20200921 .1021/macosx/graphviz.xcodeproj/project.xcworkspace/contents.xcworkspacedata: file name is too long (max 99); not dumped
tar: graphviz-2.44.2~dev.
20200921 .1021/macosx/graphviz.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist: file name is too long (max 99); not dumped
tar: Exiting with failure status due to previous errors
In this commit, we switch to the newer “ustar” format that supports filenames
up to 256 characters. This format is still widely supported. From the Automake
documentation [0]:
tar-ustar selects the ustar format defined by POSIX 1003.1-1988. This format
is old enough to be portable: As of 2018, it is supported by the native tar
command on GNU, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, and Solaris, at least.
It fully supports empty directories. It can store file names with up to 256
characters, provided that the file name can be split at directory separator in
two parts, first of them being at most 155 bytes long. So, in most cases the
maximum file name length will be shorter than 256 characters.
Closes #1830.
[0]: https://www.gnu.org/software/automake/manual/html_node/List-of-Automake-options.html
Magnus Jacobsson [Wed, 30 Sep 2020 07:49:07 +0000 (07:49 +0000)]
Merge branch 'install-plugins-at-build-time' into 'master'
Configure plugins at build time
See merge request graphviz/graphviz!1581
Magnus Jacobsson [Tue, 15 Sep 2020 17:33:18 +0000 (19:33 +0200)]
Remove now obsolete exec of dot -c for Windows CI builds
Magnus Jacobsson [Tue, 15 Sep 2020 18:23:22 +0000 (20:23 +0200)]
Add install of plugin configuration file config6 for Windows MSBuild builds
Magnus Jacobsson [Wed, 16 Sep 2020 05:32:36 +0000 (07:32 +0200)]
Add gd and gdiplus plugins dependency to dot for MSBuild
This will ensure that the plugin configuration file config6, which
will be generated directly after dot is built in an upcoming commit,
contains all plugins.
Magnus Jacobsson [Tue, 15 Sep 2020 16:53:44 +0000 (18:53 +0200)]
Remove now obsolete exec of dot -c for Linux CMake CI builds
Magnus Jacobsson [Sun, 13 Sep 2020 15:07:44 +0000 (17:07 +0200)]
Add install of plugin configuration file config6 for CMake builds
Matthew Fernandez [Wed, 30 Sep 2020 00:19:17 +0000 (00:19 +0000)]
Merge branch '
06e77d83 -9cd7-4e6a-b814-
d74136617645 ' into 'master'
remove more unused files
See merge request graphviz/graphviz!1589
Matthew Fernandez [Wed, 23 Sep 2020 04:01:06 +0000 (21:01 -0700)]
remove unused sfvalue()
Matthew Fernandez [Wed, 23 Sep 2020 03:53:32 +0000 (20:53 -0700)]
remove unused sfulen()
Matthew Fernandez [Wed, 23 Sep 2020 03:45:39 +0000 (20:45 -0700)]
remove unused sfstacked()
Matthew Fernandez [Wed, 23 Sep 2020 03:38:02 +0000 (20:38 -0700)]
remove unused sfputu() and variants
Matthew Fernandez [Wed, 23 Sep 2020 03:30:21 +0000 (20:30 -0700)]
remove unused sfputm() and variants
Matthew Fernandez [Wed, 23 Sep 2020 03:20:20 +0000 (20:20 -0700)]
remove unused sfputl() and variants
Matthew Fernandez [Wed, 23 Sep 2020 03:12:52 +0000 (20:12 -0700)]
remove unused sfputd() and variants
Matthew Fernandez [Wed, 23 Sep 2020 03:05:00 +0000 (20:05 -0700)]
remove unused sfllen() and variants
Matthew Fernandez [Wed, 23 Sep 2020 02:56:03 +0000 (19:56 -0700)]
remove unused sferror()
Matthew Fernandez [Wed, 23 Sep 2020 02:48:44 +0000 (19:48 -0700)]
remove unused sfeof()
Matthew Fernandez [Wed, 23 Sep 2020 02:41:39 +0000 (19:41 -0700)]
remove unused sfdlen() and variants
Matthew Fernandez [Wed, 23 Sep 2020 02:31:33 +0000 (19:31 -0700)]
remove unused sfclrerr()
Related to #19. I do not believe this is a full fix. It just bypasses the first
error in the referenced issue.
Michael Shigorin [Tue, 29 Sep 2020 11:26:12 +0000 (14:26 +0300)]
configure.ac: Add e2k platform
Elbrus (also known as Elbrus 2000) is a Russian 64-bit LE VLIW.
Matthew Fernandez [Tue, 29 Sep 2020 00:42:21 +0000 (00:42 +0000)]
Merge branch '
22783486 -1007-4063-bcc5-
c902a9bf8dc7 ' into 'master'
remove direct use of 'environ'
See merge request graphviz/graphviz!1587
Matthew Fernandez [Tue, 22 Sep 2020 02:51:49 +0000 (19:51 -0700)]
remove build system detection of _NSGetEnviron() and crt_externs.h
Neither of these are used any more.
Matthew Fernandez [Tue, 22 Sep 2020 02:34:58 +0000 (19:34 -0700)]
remove now unnecessary environ abstraction code
Matthew Fernandez [Tue, 22 Sep 2020 02:33:10 +0000 (19:33 -0700)]
remove direct use of environ
This code was manually parsing environment variable settings for some reason. It
also (incorrectly) assumed $_ would always be the first environment variable.
Matthew Fernandez [Tue, 22 Sep 2020 02:09:17 +0000 (19:09 -0700)]
remove unused uid_t #define
Matthew Fernandez [Tue, 29 Sep 2020 00:22:47 +0000 (00:22 +0000)]
Merge branch '1785-4' into 'master'
disambiguate #includes (4/5)
See merge request graphviz/graphviz!1588
Matthew Fernandez [Thu, 3 Sep 2020 03:51:07 +0000 (20:51 -0700)]
disambiguate tclpkg/tclpathplan #includes
Related to #1242 and #1785.
Matthew Fernandez [Thu, 3 Sep 2020 03:42:40 +0000 (20:42 -0700)]
remove unnecessary tclpkg/tclpathplan include path
Matthew Fernandez [Thu, 3 Sep 2020 03:39:03 +0000 (20:39 -0700)]
disambiguate tclpkg/tcldot #includes
Related to #1242 and #1785.
Matthew Fernandez [Thu, 3 Sep 2020 03:27:30 +0000 (20:27 -0700)]
remove unnecessary tclpkg/tcldot include path
Matthew Fernandez [Thu, 3 Sep 2020 02:46:29 +0000 (19:46 -0700)]
disambiguate tclpkg/gv #includes
Related to #1242 and #1785.
Matthew Fernandez [Thu, 3 Sep 2020 02:32:17 +0000 (19:32 -0700)]
remove unnecessary tclpkg/gv include path
Matthew Fernandez [Sun, 27 Sep 2020 02:17:39 +0000 (02:17 +0000)]
Merge branch '
4a751607 -966c-4130-84cb-
77a26d194de8 ' into 'master'
drop explicit libstdc++ references, allowing linking with libc++
Closes #163
See merge request graphviz/graphviz!1586
Matthew Fernandez [Mon, 21 Sep 2020 00:38:52 +0000 (17:38 -0700)]
remove explicit linking of libstdc++
The autotools build should now be compatible with libc++. Closes #163.
Matthew Fernandez [Mon, 21 Sep 2020 00:36:22 +0000 (17:36 -0700)]
force the C++ compiler to be used when linking C++-dependent targets
This looks pretty hacky, but is apparently the libtool-sanctioned way of doing
this [0]. Related to #163.
[0]: https://www.gnu.org/software/automake/manual/automake.html#Libtool-Convenience-Libraries
Matthew Fernandez [Mon, 21 Sep 2020 00:17:24 +0000 (17:17 -0700)]
remove duplicated Makefile content
Matthew Fernandez [Sat, 26 Sep 2020 01:28:05 +0000 (01:28 +0000)]
Merge branch '
23CD380E -C5C0-414F-B23F-
122C42B26417 ' into 'master'
remove testing pieces from CMake build
Closes #1795
See merge request graphviz/graphviz!1584
Matthew Fernandez [Sat, 19 Sep 2020 17:19:49 +0000 (10:19 -0700)]
remove testing pieces from CMake build
The existing test fragments in the CMake files had two undesirable effects:
1. Projects using Graphviz as a subdirectory would pick up this test suite and
it would get run as part of their own test suite. See #1795.
2. The fragments incorrectly gave the impression this was the canonical set of
Graphviz tests and/or that this is what was run in CI. The current reality
is that CI ignores this path to a subset of the tests, and most of the
maintainers do not run this either.
Matthew Fernandez [Sat, 19 Sep 2020 17:00:32 +0000 (10:00 -0700)]
remove build system workaround for GCC 3
We no longer support anything below GCC 4.4.7.
Matthew Fernandez [Sat, 19 Sep 2020 16:56:58 +0000 (09:56 -0700)]
don't squash -O2 when using ICC
ICC is Intel's C Compiler. All recent versions of it *do* support `-O2`.
Matthew Fernandez [Sat, 26 Sep 2020 01:05:01 +0000 (01:05 +0000)]
Merge branch '
803B960B -999F-41B4-981C-
21E1EB0BB124 ' into 'master'
remove eFence support
Closes #1827
See merge request graphviz/graphviz!1585
Matthew Fernandez [Sat, 19 Sep 2020 21:35:02 +0000 (14:35 -0700)]
remove eFence support
The eFence memory debugging tool has these days been superseded by Valgrind and
Address Sanitizer. Closes #1827.
Matthew Fernandez [Sat, 19 Sep 2020 21:34:10 +0000 (14:34 -0700)]
remove commented out library checks
Matthew Fernandez [Sat, 19 Sep 2020 21:33:01 +0000 (14:33 -0700)]
remove legacy comment
Matthew Fernandez [Fri, 25 Sep 2020 15:41:02 +0000 (15:41 +0000)]
Merge branch '
6B1AB424 -B66A-42CC-B5CF-
BAC9AEEF6129 ' into 'master'
miscellaneous cleanup
See merge request graphviz/graphviz!1583
Matthew Fernandez [Sat, 19 Sep 2020 01:02:16 +0000 (18:02 -0700)]
remove ignore rules from some legacy files
libgraph was removed in
d5f98556f654b41e5fdabd2d6f7528256bdea519 .
Matthew Fernandez [Sat, 19 Sep 2020 00:57:21 +0000 (17:57 -0700)]
remove commented out strToL
Matthew Fernandez [Sat, 19 Sep 2020 00:55:02 +0000 (17:55 -0700)]
remove Windows strto[u]ll redirects
These functions exist on Windows. There is no need to remap them.
Matthew Fernandez [Sat, 19 Sep 2020 00:45:15 +0000 (17:45 -0700)]
remove unused 'external'
Matthew Fernandez [Sat, 19 Sep 2020 00:43:56 +0000 (17:43 -0700)]
remove unused 'cast'
Magnus Jacobsson [Wed, 23 Sep 2020 06:55:59 +0000 (06:55 +0000)]
Merge branch 'fix-linux-cmake-and-add-test-job-to-ci' into 'master'
Add Linux CMake test job to CI (including needed generation of a .deb package and correction of some linking problems)
See merge request graphviz/graphviz!1578
Magnus Jacobsson [Tue, 15 Sep 2020 14:02:51 +0000 (16:02 +0200)]
Add skip of format png:gd also for Linux CMake rtest
Magnus Jacobsson [Tue, 15 Sep 2020 13:21:43 +0000 (15:21 +0200)]
Add skip of PNG diff for also for Linux CMake rtest
Magnus Jacobsson [Mon, 14 Sep 2020 22:23:54 +0000 (00:23 +0200)]
Add skip of test_1813 also for Linux CMake
Magnus Jacobsson [Fri, 11 Sep 2020 05:45:09 +0000 (07:45 +0200)]
Add ubuntu18-04-cmake-test job to CI
Also adapt existing test jobs to accomodate this.
Magnus Jacobsson [Mon, 14 Sep 2020 21:34:49 +0000 (23:34 +0200)]
Fix lib/pack objs not included in lib/gvc dynamic lib for CMake builds
This is what the autotools builds do.
For some reason this was not a problem on Windows.
Without this, the rtest/test_examples.py gave errors like this for neatopack.c:
neatopack.c:(.text+0x81): undefined reference to `ccomps'
Magnus Jacobsson [Mon, 14 Sep 2020 13:18:42 +0000 (15:18 +0200)]
Fix lib/common objs not included in lib/gvc lib for CMake builds
This is what the autotools builds do.
For some reason this was not a problem on Windows.
Without this, the rtest/test_examples.py gave errors like this for e.g. demo.c:
demo.c:(.text+0x29): undefined reference to `gvParseArgs'
Magnus Jacobsson [Tue, 15 Sep 2020 11:58:55 +0000 (13:58 +0200)]
Correct link library order for mm2gv
The sparse lib depends on many of the libs that were listed before it.
An upcoming change to lib/gvc revealed this and without this change,
the following link error would occur:
../../lib/sparse/libsparse.a(SparseMatrix.c.o): In function `SparseMatrix_page_rank':
SparseMatrix.c:(.text+0x12471): undefined reference to `Verbose'
Magnus Jacobsson [Fri, 18 Sep 2020 09:11:44 +0000 (11:11 +0200)]
Fix math library not linked with lib/sparse and remove from gvpack
The gvpack tool only uses math functions indirectly through other
libraries including plugin/neato_layout which use lib/sparse.
Magnus Jacobsson [Mon, 14 Sep 2020 14:14:32 +0000 (16:14 +0200)]
Remove obsolete Linux special add of math target link library
Since the previous commit, this is no longer necessary for programs
that only use math functions indirectly through lib/gvc.
Magnus Jacobsson [Mon, 14 Sep 2020 13:12:49 +0000 (15:12 +0200)]
Fix math library not linked with lib/gvc for Linux CMake builds
This is what the autotools builds do.
$(MATH_LIB) was already referenced by lib/gvc/CmakeLists.txt, but it
was never given any value.
For Windows, this is not necessary since math functions are included
in the Universal C Runtime library (UCRT).
Without this, the rtest/test_examples.py gave errors like this for e.g. demo.c:
/usr/lib/gcc/x86_64-linux-gnu/7/../../../../lib/libgvc.so: undefined reference to `atan2'
Magnus Jacobsson [Fri, 18 Sep 2020 09:55:17 +0000 (11:55 +0200)]
Archive Linux CMake builds under Packages/experimental to avoid deployment
Changes COLLECTION to experimental for Linux CMake builds which causes
the artifacts to be archived under Packages/experimental which is not
deployed to https://www2.graphviz.org/Packages.
Magnus Jacobsson [Sun, 13 Sep 2020 18:35:13 +0000 (20:35 +0200)]
Add generation of a Debian package from Ubuntu CMake build
Also adapts jobs & scripts.
This does not yet replicate the structure of Debian packages produced
by autotools. Everything is put into one single package named
Graphviz-<version>-Linux.deb.
Matthew Fernandez [Tue, 22 Sep 2020 15:13:15 +0000 (15:13 +0000)]
Merge branch '1785-3' into 'master'
disambiguate #includes (3/5)
See merge request graphviz/graphviz!1582
Matthew Fernandez [Tue, 22 Sep 2020 15:01:38 +0000 (15:01 +0000)]
Merge branch '
afabefdf -dab2-43e5-bacd-
ece9214998cd ' into 'master'
remove ad hoc name mangling in the gml parser
Closes #1806
See merge request graphviz/graphviz!1580
Matthew Fernandez [Sat, 29 Aug 2020 23:19:41 +0000 (16:19 -0700)]
disambiguate plugin/xlib #includes
Related to #1785.
Matthew Fernandez [Sat, 29 Aug 2020 23:13:29 +0000 (16:13 -0700)]
remove unnecessary plugin/xlib include path
Matthew Fernandez [Sat, 29 Aug 2020 22:53:29 +0000 (15:53 -0700)]
disambiguate plugin/webp #includes
Related to #1785.