]> granicus.if.org Git - graphviz/log
graphviz
4 years agoMerge branch 'BCD44381-875A-4264-9A43-FB6B88822A57' into 'master'
Matthew Fernandez [Thu, 8 Oct 2020 14:27:01 +0000 (14:27 +0000)]
Merge branch 'BCD44381-875A-4264-9A43-FB6B88822A57' into 'master'

remove legacy MSBuild references to lib/agraph

See merge request graphviz/graphviz!1610

4 years agoMerge branch 'fix-brew-install-on-macos' into 'master'
Magnus Jacobsson [Thu, 8 Oct 2020 08:03:28 +0000 (08:03 +0000)]
Merge branch 'fix-brew-install-on-macos' into 'master'

Fix brew install on macOS fail when upgrade is available

See merge request graphviz/graphviz!1609

4 years agoremove legacy MSBuild references to lib/agraph
Matthew Fernandez [Thu, 8 Oct 2020 03:34:35 +0000 (20:34 -0700)]
remove legacy MSBuild references to lib/agraph

lib/agraph was removed in b9b3cb9fbf7eabdb63c92abbea83e104ef5b4b04. Related to
#1549.

4 years agoAdd brew update to macOS CI jobs
Magnus Jacobsson [Wed, 7 Oct 2020 16:19:17 +0000 (18:19 +0200)]
Add brew update to macOS CI jobs

4 years agoMerge branch 'CE68F701-8CA3-411E-941A-829F7B4A0CFB' into 'master'
Matthew Fernandez [Wed, 7 Oct 2020 15:15:56 +0000 (15:15 +0000)]
Merge branch 'CE68F701-8CA3-411E-941A-829F7B4A0CFB' into 'master'

add changelog notes for Flex, Bison dependency bump

See merge request graphviz/graphviz!1599

4 years agoFix brew install on macOS fail when upgrade is available
Magnus Jacobsson [Wed, 7 Oct 2020 11:48:57 +0000 (13:48 +0200)]
Fix brew install on macOS fail when upgrade is available

brew install fails when there is an upgrade available, so run brew
upgrade when this happens.

4 years agoMerge branch '982ABEA8-CBD9-4AF8-B067-FD05D07A0118' into 'master'
Matthew Fernandez [Wed, 7 Oct 2020 03:27:44 +0000 (03:27 +0000)]
Merge branch '982ABEA8-CBD9-4AF8-B067-FD05D07A0118' into 'master'

remove more unused parts of SFIO

See merge request graphviz/graphviz!1597

4 years agoremove unused sfgetu()
Matthew Fernandez [Thu, 1 Oct 2020 01:55:21 +0000 (18:55 -0700)]
remove unused sfgetu()

4 years agoremove unused sfgetm()
Matthew Fernandez [Thu, 1 Oct 2020 01:39:49 +0000 (18:39 -0700)]
remove unused sfgetm()

4 years agoremove unused sfreserve()
Matthew Fernandez [Thu, 1 Oct 2020 01:00:32 +0000 (18:00 -0700)]
remove unused sfreserve()

4 years agoremove unused sfgetr()
Matthew Fernandez [Thu, 1 Oct 2020 00:54:22 +0000 (17:54 -0700)]
remove unused sfgetr()

4 years agoremove unused sfgetl()
Matthew Fernandez [Thu, 1 Oct 2020 00:51:18 +0000 (17:51 -0700)]
remove unused sfgetl()

4 years agoremove unused sfgetd()
Matthew Fernandez [Thu, 1 Oct 2020 00:48:09 +0000 (17:48 -0700)]
remove unused sfgetd()

4 years agoremove unused sfclrlock()
Matthew Fernandez [Thu, 1 Oct 2020 00:40:56 +0000 (17:40 -0700)]
remove unused sfclrlock()

4 years agoMerge branch '1785-5' into 'master'
Matthew Fernandez [Mon, 5 Oct 2020 15:01:10 +0000 (15:01 +0000)]
Merge branch '1785-5' into 'master'

disambiguate #includes (5/5)

Closes #1785 and #1242

See merge request graphviz/graphviz!1594

4 years agodisambiguate remaining memory.h #includes
Matthew Fernandez [Thu, 3 Sep 2020 04:05:57 +0000 (21:05 -0700)]
disambiguate remaining memory.h #includes

Unlike the preceding changes to disambiguate #includes, we cannot do this with
all the lib/common headers at once. Some of them are installed to users, so
making this change everywhere would be an API break that is undesirable at this
time. This specific header is disambiguated to fix #1242.

4 years agoremove lib/vpsc from include paths
Matthew Fernandez [Mon, 31 Aug 2020 00:52:48 +0000 (17:52 -0700)]
remove lib/vpsc from include paths

4 years agodisambiguate lib/vpsc #includes
Matthew Fernandez [Mon, 31 Aug 2020 00:47:52 +0000 (17:47 -0700)]
disambiguate lib/vpsc #includes

Fixes #1785.

4 years agoremove lib/vmalloc from include paths
Matthew Fernandez [Mon, 31 Aug 2020 00:41:54 +0000 (17:41 -0700)]
remove lib/vmalloc from include paths

4 years agoremove the need for lib/vmalloc to be in the include path
Matthew Fernandez [Mon, 31 Aug 2020 00:32:27 +0000 (17:32 -0700)]
remove the need for lib/vmalloc to be in the include path

Related to #1785.

4 years agoremove lib/twopigen from include path
Matthew Fernandez [Mon, 31 Aug 2020 00:18:35 +0000 (17:18 -0700)]
remove lib/twopigen from include path

4 years agoremove lib/topfish from include paths
Matthew Fernandez [Mon, 31 Aug 2020 00:12:38 +0000 (17:12 -0700)]
remove lib/topfish from include paths

4 years agoremove the need for lib/topfish to be in the include path
Matthew Fernandez [Mon, 31 Aug 2020 00:04:48 +0000 (17:04 -0700)]
remove the need for lib/topfish to be in the include path

Related to #1785.

4 years agoremove lib/spine from include paths
Matthew Fernandez [Mon, 31 Aug 2020 00:03:36 +0000 (17:03 -0700)]
remove lib/spine from include paths

4 years agoremove the need for lib/spine to be in the include path
Matthew Fernandez [Mon, 31 Aug 2020 00:02:39 +0000 (17:02 -0700)]
remove the need for lib/spine to be in the include path

Related to #1785.

4 years agoremove lib/sparse from include paths
Matthew Fernandez [Sun, 30 Aug 2020 23:33:07 +0000 (16:33 -0700)]
remove lib/sparse from include paths

4 years agoremove the need for lib/sparse to be in the include path
Matthew Fernandez [Sun, 30 Aug 2020 23:21:22 +0000 (16:21 -0700)]
remove the need for lib/sparse to be in the include path

Related to #1785.

4 years agoremove lib/sfio from include paths
Matthew Fernandez [Sun, 30 Aug 2020 23:11:37 +0000 (16:11 -0700)]
remove lib/sfio from include paths

4 years agoremove the need for lib/sfio to be in the include path
Matthew Fernandez [Sun, 30 Aug 2020 23:00:01 +0000 (16:00 -0700)]
remove the need for lib/sfio to be in the include path

4 years agoremove lib/sfdpgen from include paths
Matthew Fernandez [Sun, 30 Aug 2020 22:49:48 +0000 (15:49 -0700)]
remove lib/sfdpgen from include paths

4 years agoremove the need to have lib/sfdpgen in include path
Matthew Fernandez [Sun, 30 Aug 2020 22:33:20 +0000 (15:33 -0700)]
remove the need to have lib/sfdpgen in include path

Related to #1785.

4 years agoremove lib/rbtree from include paths
Matthew Fernandez [Sun, 30 Aug 2020 22:23:55 +0000 (15:23 -0700)]
remove lib/rbtree from include paths

4 years agoremove the need to lib/rbtree to be in the include path
Matthew Fernandez [Sun, 30 Aug 2020 22:04:03 +0000 (15:04 -0700)]
remove the need to lib/rbtree to be in the include path

Related to #1785.

4 years agoremove lib/patchwork from include paths
Matthew Fernandez [Sun, 30 Aug 2020 21:40:31 +0000 (14:40 -0700)]
remove lib/patchwork from include paths

4 years agoremove lib/osage from include paths
Matthew Fernandez [Sun, 30 Aug 2020 21:22:58 +0000 (14:22 -0700)]
remove lib/osage from include paths

4 years agoremove lib/ortho from include paths
Matthew Fernandez [Sun, 30 Aug 2020 19:42:24 +0000 (12:42 -0700)]
remove lib/ortho from include paths

4 years agoremove the need to have lib/ortho in the include path
Matthew Fernandez [Sun, 30 Aug 2020 19:33:05 +0000 (12:33 -0700)]
remove the need to have lib/ortho in the include path

Related to #1785.

4 years agoremove lib/neatogen from include paths
Matthew Fernandez [Sun, 30 Aug 2020 17:34:39 +0000 (10:34 -0700)]
remove lib/neatogen from include paths

4 years agoremove the need to have lib/neatogen in the include path
Matthew Fernandez [Sun, 30 Aug 2020 17:18:54 +0000 (10:18 -0700)]
remove the need to have lib/neatogen in the include path

Related to #1785.

4 years agoremove lib/mingle from include paths
Matthew Fernandez [Sun, 30 Aug 2020 16:42:50 +0000 (09:42 -0700)]
remove lib/mingle from include paths

4 years agoremove the need to have lib/mingle in the include path
Matthew Fernandez [Sun, 30 Aug 2020 16:34:51 +0000 (09:34 -0700)]
remove the need to have lib/mingle in the include path

Related to #1785.

4 years agoremove lib/label from include path
Matthew Fernandez [Sun, 30 Aug 2020 03:52:44 +0000 (20:52 -0700)]
remove lib/label from include path

4 years agodisambiguate lib/label #includes
Matthew Fernandez [Sun, 30 Aug 2020 03:44:16 +0000 (20:44 -0700)]
disambiguate lib/label #includes

Related to #1785.

4 years agoremove lib/inkpot from include paths
Matthew Fernandez [Sun, 30 Aug 2020 03:15:11 +0000 (20:15 -0700)]
remove lib/inkpot from include paths

4 years agoremove lib/ingraphs from include paths
Matthew Fernandez [Sun, 30 Aug 2020 02:50:53 +0000 (19:50 -0700)]
remove lib/ingraphs from include paths

4 years agoremove lib/glcomp from include paths
Matthew Fernandez [Sun, 30 Aug 2020 01:50:35 +0000 (18:50 -0700)]
remove lib/glcomp from include paths

4 years agoremove the need to have lib/glcomp in the include path
Matthew Fernandez [Sun, 30 Aug 2020 01:42:27 +0000 (18:42 -0700)]
remove the need to have lib/glcomp in the include path

Related to #1785.

4 years agoremove lib/fdpgen from include paths
Matthew Fernandez [Sun, 30 Aug 2020 00:50:37 +0000 (17:50 -0700)]
remove lib/fdpgen from include paths

4 years agoremove the need to have lib/fdpgen in the include path
Matthew Fernandez [Sun, 30 Aug 2020 00:34:29 +0000 (17:34 -0700)]
remove the need to have lib/fdpgen in the include path

Related to #1785.

4 years agoremove lib/expr from include paths
Matthew Fernandez [Sat, 29 Aug 2020 23:38:54 +0000 (16:38 -0700)]
remove lib/expr from include paths

4 years agoremove the need to have lib/expr in the include path
Matthew Fernandez [Sun, 23 Aug 2020 21:17:06 +0000 (14:17 -0700)]
remove the need to have lib/expr in the include path

Related to #1785.

4 years agoremove lib/edgepaint from include paths
Matthew Fernandez [Sun, 23 Aug 2020 20:49:46 +0000 (13:49 -0700)]
remove lib/edgepaint from include paths

Related to #1785.

4 years agoremove dotgen from include paths
Matthew Fernandez [Sat, 29 Aug 2020 23:29:11 +0000 (16:29 -0700)]
remove dotgen from include paths

4 years agoremove the need to have lib/dotgen in the include path
Matthew Fernandez [Sun, 23 Aug 2020 20:23:17 +0000 (13:23 -0700)]
remove the need to have lib/dotgen in the include path

Related to #1785.

4 years agoremove circogen from include paths
Matthew Fernandez [Sun, 23 Aug 2020 19:33:59 +0000 (12:33 -0700)]
remove circogen from include paths

Related to #1785.

4 years agoremove the need to have lib/circogen in include paths
Matthew Fernandez [Sun, 23 Aug 2020 19:11:40 +0000 (12:11 -0700)]
remove the need to have lib/circogen in include paths

4 years agoremove now unnecessary lib/ast include directory
Matthew Fernandez [Sun, 23 Aug 2020 02:57:32 +0000 (19:57 -0700)]
remove now unnecessary lib/ast include directory

Related to #1785.

4 years agoremove the need to have lib/ast in the include path
Matthew Fernandez [Sun, 23 Aug 2020 02:15:41 +0000 (19:15 -0700)]
remove the need to have lib/ast in the include path

Related to #1785.

4 years agoMerge branch 'add-macos-builds-to-gitlab-ci' into 'master'
Magnus Jacobsson [Mon, 5 Oct 2020 05:55:22 +0000 (05:55 +0000)]
Merge branch 'add-macos-builds-to-gitlab-ci' into 'master'

Add macOS builds to gitlab CI

See merge request graphviz/graphviz!1598

4 years agoMerge branch '74a4b672-00f6-4510-be6a-1c3f57a1935b' into 'master'
Matthew Fernandez [Sun, 4 Oct 2020 19:34:27 +0000 (19:34 +0000)]
Merge branch '74a4b672-00f6-4510-be6a-1c3f57a1935b' into 'master'

remove one use of longjmp

See merge request graphviz/graphviz!1593

4 years agoremove no longer necessary setjmp setup in libpack
Matthew Fernandez [Sun, 27 Sep 2020 20:57:39 +0000 (13:57 -0700)]
remove no longer necessary setjmp setup in libpack

Related to #1801.

4 years agoreturn failure from push() in libpack instead of longjmping
Matthew Fernandez [Sun, 27 Sep 2020 20:55:34 +0000 (13:55 -0700)]
return failure from push() in libpack instead of longjmping

Related to #1801.

4 years agocheck for failure of push() in dfs() in libpack
Matthew Fernandez [Sun, 27 Sep 2020 20:54:06 +0000 (13:54 -0700)]
check for failure of push() in dfs() in libpack

Related to #1801.

4 years agoadd a return value to push() in libpack
Matthew Fernandez [Sun, 27 Sep 2020 20:52:10 +0000 (13:52 -0700)]
add a return value to push() in libpack

Related to #1801.

4 years agoanticipate return of SIZE_MAX indicating failure from dfs()
Matthew Fernandez [Sun, 27 Sep 2020 20:43:46 +0000 (13:43 -0700)]
anticipate return of SIZE_MAX indicating failure from dfs()

Related to #1801.

4 years agoremove some unused macros
Matthew Fernandez [Sun, 27 Sep 2020 20:16:25 +0000 (13:16 -0700)]
remove some unused macros

4 years agoAdd archiving .tar.gz artifact from macOs autotools build
Magnus Jacobsson [Wed, 30 Sep 2020 17:35:50 +0000 (19:35 +0200)]
Add archiving .tar.gz artifact from macOs autotools build

4 years agoAdd generation of .tar.gz file from macOS autotools build
Magnus Jacobsson [Wed, 30 Sep 2020 17:31:14 +0000 (19:31 +0200)]
Add generation of .tar.gz file from macOS autotools build

4 years agoAdd macOS cmake build to CI
Magnus Jacobsson [Wed, 30 Sep 2020 15:16:30 +0000 (17:16 +0200)]
Add macOS cmake build to CI

4 years agoAdd macOS autotools build to CI
Magnus Jacobsson [Wed, 30 Sep 2020 15:16:19 +0000 (17:16 +0200)]
Add macOS autotools build to CI

4 years agoAdd macOS CI build template
Magnus Jacobsson [Wed, 30 Sep 2020 15:15:51 +0000 (17:15 +0200)]
Add macOS CI build template

4 years agoAdd support for macOS to ci/build.sh
Magnus Jacobsson [Wed, 30 Sep 2020 15:05:11 +0000 (17:05 +0200)]
Add support for macOS to ci/build.sh

4 years agoDon't build DEB package on macOS
Magnus Jacobsson [Wed, 30 Sep 2020 16:43:26 +0000 (18:43 +0200)]
Don't build DEB package on macOS

4 years agoRefactor ci/build.sh by merging if statement bodies
Magnus Jacobsson [Wed, 30 Sep 2020 14:56:05 +0000 (16:56 +0200)]
Refactor ci/build.sh by merging if statement bodies

4 years agoRefactor ci/build.sh by moving definitions
Magnus Jacobsson [Wed, 30 Sep 2020 14:51:33 +0000 (16:51 +0200)]
Refactor ci/build.sh by moving definitions

4 years agoRefactor ci/build.sh to check for build system before OS
Magnus Jacobsson [Wed, 30 Sep 2020 14:50:52 +0000 (16:50 +0200)]
Refactor ci/build.sh to check for build system before OS

4 years agoMerge branch 'add-tools-test' into 'master'
Magnus Jacobsson [Fri, 2 Oct 2020 14:29:44 +0000 (14:29 +0000)]
Merge branch 'add-tools-test' into 'master'

Add tools test

See merge request graphviz/graphviz!1592

4 years agoMerge branch '7f9609f1-0ed6-4616-a6b4-bf59bac9919f' into 'master'
Matthew Fernandez [Fri, 2 Oct 2020 14:21:04 +0000 (14:21 +0000)]
Merge branch '7f9609f1-0ed6-4616-a6b4-bf59bac9919f' into 'master'

fix build system support for pstopdf

See merge request graphviz/graphviz!1591

4 years agofix: pstopdf support in the Autotools build system
Matthew Fernandez [Sat, 26 Sep 2020 01:51:44 +0000 (18:51 -0700)]
fix: pstopdf support in the Autotools build system

pstopdf can now be used as a substitute for ps2pdf when using the Autotools
build system. This commit adapts a downstream packaging tweak from Homebrew [0]
commit f231dcfd69a290c8a289bccd8cfc9aa9b8dc5472, that now works correctly as of
the previous commit. Related to #1763.

  [0]: https://github.com/Homebrew/homebrew-core

4 years agoremove explicit output filename in PDF Makefile rules
Matthew Fernandez [Sat, 26 Sep 2020 01:37:26 +0000 (18:37 -0700)]
remove explicit output filename in PDF Makefile rules

For all of these rules, the output filename ps2pdf infers is the same as the
explicit one being removed, so this change is a no-op. The intent here is to
make these invocations compatible with either ps2pdf or pstopdf filling the role
of @PS2PDF@. The usage for these two differs slightly:

  ps2pdf infile [outfile]
  pstopdf infile [-o outfile]

pstopdf is not currently supported -- there is an attempt at this in
configure.ac, but it is faulty -- but we plan to support it in an upcoming
commit. Related to #1763.

4 years agoUpdate CHANGELOG with tools usage and other fixes
Magnus Jacobsson [Sat, 26 Sep 2020 14:36:52 +0000 (16:36 +0200)]
Update CHANGELOG with tools usage and other fixes

4 years agoSkip execution of dot_builtins in tools test for Centos and Fedora builds
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.

4 years agoSkip execution of all tools not built with MSBuild in tools test for MSBuild builds
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.

4 years agoAdd all tools built with autotools on Ubuntu 18.04 to tools test
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

4 years agoFix gvmap.sh -? option to exit with zero exit status
Magnus Jacobsson [Sat, 26 Sep 2020 11:26:06 +0000 (13:26 +0200)]
Fix gvmap.sh -? option to exit with zero exit status

4 years agoCorrect shebang of gvmap.sh to use ksh
Magnus Jacobsson [Sat, 26 Sep 2020 09:53:42 +0000 (11:53 +0200)]
Correct shebang of gvmap.sh to use ksh

4 years agoAdd option -? for usage to vimdot
Magnus Jacobsson [Sat, 26 Sep 2020 08:52:45 +0000 (10:52 +0200)]
Add option -? for usage to vimdot

4 years agoSkip execution of gvpack in tools test for non-Windows CMake builds
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.

4 years agoAdd check of usage to tools test
Magnus Jacobsson [Thu, 24 Sep 2020 16:18:59 +0000 (18:18 +0200)]
Add check of usage to tools test

4 years agoFix edgepaint -? to actually print usage instead of error
Magnus Jacobsson [Fri, 25 Sep 2020 06:38:33 +0000 (08:38 +0200)]
Fix edgepaint -? to actually print usage instead of error

4 years agoFix edgepaint -o option
Magnus Jacobsson [Fri, 25 Sep 2020 06:08:03 +0000 (08:08 +0200)]
Fix edgepaint -o option

4 years agoFix apparently incorrect indentation in mingle
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.

4 years agoCorrect misspelled 'smyrna' in usage
Magnus Jacobsson [Thu, 24 Sep 2020 16:18:32 +0000 (18:18 +0200)]
Correct misspelled 'smyrna' in usage

4 years agoRemove '"' from usage text in non-Windows version of dotty
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.

4 years agoSkip execution of all tools not built with CMake in tools test for CMake builds
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.

4 years agoSkip execution of mingle in tools test for Ubuntu and Centos builds
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.

4 years agoSkip execution of smyrna in tools test for Centos builds
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.

4 years agoSkip execution of smyrna in tools test for Windows MSBuilds
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.

4 years agoAdd new tools test that tests that all tools can be started
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

4 years agoPropagate OS ID to pytest
Magnus Jacobsson [Thu, 24 Sep 2020 15:46:31 +0000 (17:46 +0200)]
Propagate OS ID to pytest