]> granicus.if.org Git - graphviz/log
graphviz
7 years agoignore cmake generted files
John Ellson [Tue, 18 Jul 2017 20:25:26 +0000 (16:25 -0400)]
ignore cmake generted files

7 years agore-enable php now that swig-3.0.11 is available
John Ellson [Tue, 18 Jul 2017 14:39:34 +0000 (10:39 -0400)]
re-enable php now that swig-3.0.11 is available

7 years agoMerge pull request #1256 from ErwinJanssen/prune
John Ellson [Tue, 18 Jul 2017 00:49:37 +0000 (20:49 -0400)]
Merge pull request #1256 from ErwinJanssen/prune

Cleanup and pruning

7 years agoUpdate macro checks in lib/sfio
Erwin Janssen [Thu, 13 Jul 2017 19:20:08 +0000 (21:20 +0200)]
Update macro checks in lib/sfio

Some macro's are checked by value when a `defined(MACRO)` would be more
appropriate. Other checks could be chagned into an `#ifdef`.

7 years agoRemove lib/sfio/features/stdio
Erwin Janssen [Thu, 13 Jul 2017 11:10:45 +0000 (13:10 +0200)]
Remove lib/sfio/features/stdio

This file is never used in the build process and can therefore be removed.

7 years agoMove type checks features/sfio to configure.ac
Erwin Janssen [Mon, 10 Jul 2017 13:38:35 +0000 (15:38 +0200)]
Move type checks features/sfio to configure.ac

The following type checks have been moved:
- off64_t
- struct stat64

7 years agoMove two checks from features/sfio into the code
Erwin Janssen [Sat, 3 Jun 2017 09:47:10 +0000 (11:47 +0200)]
Move two checks from features/sfio into the code

Two checks in features/sfio performed a sizeof comparison to set a
define. This comparison could be moved into the code, where sizeof
comparisons are already being used.

7 years agoReplace _hdr_stat with HAVE_STAT_H
Erwin Janssen [Fri, 2 Jun 2017 23:07:50 +0000 (01:07 +0200)]
Replace _hdr_stat with HAVE_STAT_H

The check for <stat.h> is already included in configure.ac, so
this could be used instead of the check in features/sfio.

7 years agoRemoved two unused checks from features/sfio
Erwin Janssen [Fri, 2 Jun 2017 22:48:05 +0000 (00:48 +0200)]
Removed two unused checks from features/sfio

The results of the checks for 'exit cleanup' and 'vax asm' are never
used anywere, so they can be removed.

7 years agoReplace _sys_stat with HAVE_SYS_STAT_H
Erwin Janssen [Fri, 2 Jun 2017 21:47:13 +0000 (23:47 +0200)]
Replace _sys_stat with HAVE_SYS_STAT_H

The check for <sys/stat.h> is already included in configure.ac, so
this could be used instead of the check in features/sfio.

7 years agoMove function checks features/sfio to configure.ac
Erwin Janssen [Tue, 30 May 2017 20:42:27 +0000 (22:42 +0200)]
Move function checks features/sfio to configure.ac

The following function checks have been moved:
- ftruncate
- lseek64
- getpagesize (was already present in configure.ac)
- select (check for 5 arg interface no longer required)
- stat64
- unlink
- vfork
- waitpid

The following function checks have been removed becuase they were
not used:
- remove

7 years agoRemove check for log2
Erwin Janssen [Mon, 29 May 2017 14:38:30 +0000 (16:38 +0200)]
Remove check for log2

The function `log2` is part of the standard C library, so checking for
it's presence is not required.

7 years agoRemove usage of `NO_POSTSCRIPT_ALIAS`
Erwin Janssen [Mon, 29 May 2017 14:11:33 +0000 (16:11 +0200)]
Remove usage of `NO_POSTSCRIPT_ALIAS`

This value is a remaining artifact from when libgd was included in the
Graphviz source. Since this is no longer the case, this value can be
removed.

7 years agoRemove MSWIN32 define in favor of _WIN32
Erwin Janssen [Mon, 29 May 2017 12:18:02 +0000 (14:18 +0200)]
Remove MSWIN32 define in favor of _WIN32

Instead of using the the `MSWIN32` define set by the user, rely on the
define `_WIN32`, which is set by the compiler.

Some whitespace was also trimmed.

7 years agoRevert "Remove old hacks used when coordintes were integers."
John Ellson [Wed, 12 Jul 2017 00:19:57 +0000 (20:19 -0400)]
Revert "Remove old hacks used when coordintes were integers."

This reverts commit 0f82197c80980b96ac00633b5c5852a4c9abc3cd.

That commit was the casue of Issue #1255

7 years agoMerge pull request #1254 from ErwinJanssen/format-number-svg
John Ellson [Thu, 6 Jul 2017 14:47:51 +0000 (10:47 -0400)]
Merge pull request #1254 from ErwinJanssen/format-number-svg

Fix issue #1249

7 years agoModify `gvprintdouble()`
Erwin Janssen [Thu, 6 Jul 2017 08:05:09 +0000 (10:05 +0200)]
Modify `gvprintdouble()`

Use the name technique in `gvprintdouble` as in `xdot_fmt_num`. This
prevents strange characters in the SVG output when numbers get larger.

Updated the references files to reflect this change.

7 years agoMerge pull request #1253 from bmwiedemann/date
John Ellson [Tue, 4 Jul 2017 23:29:14 +0000 (19:29 -0400)]
Merge pull request #1253 from bmwiedemann/date

Allow to override build date

7 years agoAllow to override build date
Bernhard M. Wiedemann [Tue, 4 Jul 2017 06:29:08 +0000 (08:29 +0200)]
Allow to override build date

that gets written to man pages
in order to allow for reproducible builds.
See https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable.

7 years agoMerge pull request #1251 from ErwinJanssen/link-tred-visual-studio
John Ellson [Mon, 26 Jun 2017 15:16:47 +0000 (11:16 -0400)]
Merge pull request #1251 from ErwinJanssen/link-tred-visual-studio

Link tred to the common library on Visual Studio

7 years agoLink tred to the common library on Visual Studio
Erwin Janssen [Sun, 25 Jun 2017 06:49:43 +0000 (08:49 +0200)]
Link tred to the common library on Visual Studio

An earlier change added features from lib/common to tred, but the
additional linking step for the Visual Studio build was not yet added.

7 years agoMerge pull request #1247 from krf/cmake-changes
John Ellson [Sat, 17 Jun 2017 15:26:56 +0000 (11:26 -0400)]
Merge pull request #1247 from krf/cmake-changes

CMake fixes (make compile; add graphviz_version.h)

7 years agoadd timing,h to noinst_HEADERS so that it gets included in the sources for rpm builds
John Ellson [Thu, 15 Jun 2017 23:32:03 +0000 (19:32 -0400)]
add timing,h to noinst_HEADERS so that it gets included in the sources for rpm builds

7 years agoCMake: Use FeatureSummary
Kevin Funk [Wed, 14 Jun 2017 06:56:23 +0000 (08:56 +0200)]
CMake: Use FeatureSummary

Now prints information about detected/unavailable packages:

Excerpt:
```
-- The following OPTIONAL packages have been found:

 * Cairo
 * PkgConfig
 * EXPAT
 * GD
...
```

7 years agoCMake: Generate & install graphviz_version.h
Kevin Funk [Tue, 13 Jun 2017 20:28:26 +0000 (22:28 +0200)]
CMake: Generate & install graphviz_version.h

Don't encode build date stamp in it to be able to create reproducable
builds. Slightly different to the autotools version:

Here's the diff to to the autotools based version:
```
---
/home/kfunk/opt/graphviz-autotools/include/graphviz/graphviz_version.h
2017-06-13 22:16:17.447416244 +0200
+++ graphviz_version.h  2017-06-13 22:27:29.343298754 +0200
@@ -2,7 +2,7 @@
 #define GVPLUGIN_VERSION 6
 #define PACKAGE_BUGREPORT "http://www.graphviz.org/"
 #define PACKAGE_NAME "graphviz"
-#define PACKAGE_STRING "graphviz 2.41.20170613.1957"
+#define PACKAGE_STRING "graphviz 2.41.0"
 #define PACKAGE_TARNAME "graphviz"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "2.41.20170613.1957"
+#define PACKAGE_VERSION "2.41.0"
```

7 years agoCMake: tred: Make compile
Kevin Funk [Tue, 13 Jun 2017 19:57:40 +0000 (21:57 +0200)]
CMake: tred: Make compile

```
FAILED: cmd/tools/tred
: && cc  -fPIC -g cmd/tools/CMakeFiles/tred.dir/tred.c.o  -o cmd/tools/tred
-Wl,-rpath,/home/kfunk/devel/build/graphviz/lib/cgraph:/home/kfunk/devel/build/graphviz/lib/cdt:
-rdynamic lib/cgraph/libcgraph.so.6.0.0 lib/ingraphs/libingraphs.a
lib/cdt/libcdt.so.5.0.0 && :
/home/kfunk/devel/src/graphviz/cmd/tools/tred.c:284: error: undefined
reference to 'start_timer'
/home/kfunk/devel/src/graphviz/cmd/tools/tred.c:287: error: undefined
reference to 'elapsed_sec'
```

7 years agoMerge branch 'master' of https://github.com/ellson/graphviz
Emden R. Gansner [Sun, 11 Jun 2017 17:27:47 +0000 (13:27 -0400)]
Merge branch 'master' of https://github.com/ellson/graphviz

7 years agoddd
Emden R. Gansner [Sun, 11 Jun 2017 17:24:41 +0000 (13:24 -0400)]
ddd

7 years agoFix error messages to use CmdName rather than hard-coded and incorrect "gc".
Emden Gansner [Tue, 6 Jun 2017 17:21:58 +0000 (13:21 -0400)]
Fix error messages to use CmdName rather than hard-coded and incorrect "gc".

7 years agoUpdate tred man page to reflect added flag.
Emden Gansner [Mon, 5 Jun 2017 17:07:00 +0000 (13:07 -0400)]
Update tred man page to reflect added flag.

7 years agoForgot to add timing.h include file in common.
Emden Gansner [Mon, 5 Jun 2017 13:58:47 +0000 (09:58 -0400)]
Forgot to add timing.h include file in common.

7 years agoFix the tred algorithm for better performance, making it roughly quadratic.
Emden R. Gansner [Sun, 4 Jun 2017 20:19:51 +0000 (16:19 -0400)]
Fix the tred algorithm for better performance, making it roughly quadratic.
Also replace the recursive DFS with an explicit stack to prevent stack overflow.
The latter is probably not necessary, as real-life DAGs shouldn't have that many layers.

7 years agoMerge pull request #1243 from ErwinJanssen/cmake
John Ellson [Wed, 24 May 2017 21:23:59 +0000 (17:23 -0400)]
Merge pull request #1243 from ErwinJanssen/cmake

64bit support for the CMake build on Windows

7 years agoInstall Pango on Travis CI
Erwin Janssen [Thu, 18 May 2017 10:37:48 +0000 (12:37 +0200)]
Install Pango on Travis CI

7 years agoImprove FindPangoCairo for linux
Erwin Janssen [Thu, 18 May 2017 10:12:14 +0000 (12:12 +0200)]
Improve FindPangoCairo for linux

Add the location and suffixes of the header files, which were not yet
found by Cmake on Linux.

7 years agoAdd plugin/pango to CMake build
Erwin Janssen [Thu, 18 May 2017 09:03:10 +0000 (11:03 +0200)]
Add plugin/pango to CMake build

Enables the pango plugin for both x86 and x64.

7 years agoUpdate Cairo and Pango dependencies for Windows
Erwin Janssen [Thu, 18 May 2017 08:31:55 +0000 (10:31 +0200)]
Update Cairo and Pango dependencies for Windows

Update the libraries and dependencies for Cairo, Pango and Pangocairo to
the latest version available, both for x86 and x64. This also eliminates
the need for the pangomodules.exe to be called.

7 years agoConvert current Visual Studio build from MT to MD
Erwin Janssen [Sun, 14 May 2017 14:11:45 +0000 (16:11 +0200)]
Convert current Visual Studio build from MT to MD

The CMake build generates MD code (which required a vcredist to be bundled
with the binaries). The current Visual Studio build generated MT code
(which doesn't require a vcredist). Both types require different 3rd party
libraries, so for consistancy reasons, the current Visual Studio build is
converted to MD.

7 years agoReplace ltdl with compatibility header on Windows
Erwin Janssen [Sun, 14 May 2017 10:33:59 +0000 (12:33 +0200)]
Replace ltdl with compatibility header on Windows

Using libtool on Win64 proved to be a pain, because native Windows
binaryies for 64bit where not found. Instead, it's also possible to use
the native Windows API to load libraries. The new ltdl.h header provides
compatibility functions for this, so minimal source code changes were
required.

7 years agoDon't exports libtool symbols from gvc
Erwin Janssen [Sun, 14 May 2017 08:58:29 +0000 (10:58 +0200)]
Don't exports libtool symbols from gvc

These symbols are not part of the Graphviz source, but of libtool.

7 years agoAdd 64bit dependencies for lib/gvc
Erwin Janssen [Tue, 11 Apr 2017 20:02:12 +0000 (22:02 +0200)]
Add 64bit dependencies for lib/gvc

These dependencies had the following changes:
- rxspencer became a lib-only library
- libexpat became expat
- The 64bit version of ltdl required cygwin1.dll

7 years agoUse static zlib on Windows build
Erwin Janssen [Tue, 11 Apr 2017 18:57:07 +0000 (20:57 +0200)]
Use static zlib on Windows build

The windows dependencies submodule now includes the static version of
zlib when building Graphviz. Some third party DLLs might still require a
zlib.dll however, but this will be added when required.

7 years agoAdd Win64 CMake build to Appveyor
Erwin Janssen [Sat, 8 Apr 2017 12:32:24 +0000 (14:32 +0200)]
Add Win64 CMake build to Appveyor

7 years agoSet different dependency dir if 64bit VS generator
Erwin Janssen [Sat, 8 Apr 2017 12:17:44 +0000 (14:17 +0200)]
Set different dependency dir if 64bit VS generator

When including "Win64" in the Visual Studio generator name, a 64bit
solution is created. For this the x64 dependencies are needed, so a
different dependency directory must be specified.

7 years agoMove Windows dependencies to x86 directory
Erwin Janssen [Fri, 7 Apr 2017 14:32:36 +0000 (16:32 +0200)]
Move Windows dependencies to x86 directory

The current Windows dependencies are all 32bit. To compile a 64bit
Graphviz, 64bit dependencies are required. In order to have both the
32bit and 64bit libraries, we store the 32bit libraries in the x86
folder.

7 years agoRemove HAVE_PANGOCAIRO check from plugin/pango
Erwin Janssen [Sun, 14 May 2017 20:43:48 +0000 (22:43 +0200)]
Remove HAVE_PANGOCAIRO check from plugin/pango

The check to see if pangocairo is present should be done before including
this project in the build. Now, when pangocairo is not found, this tries
to compile when it shouldn't, resulting in strange errors.

7 years agoMerge pull request #1241 from ErwinJanssen/fix/regression-reference
emden [Sat, 13 May 2017 17:47:37 +0000 (13:47 -0400)]
Merge pull request #1241 from ErwinJanssen/fix/regression-reference

Update SVG reference output

7 years agoUpdate SVG reference output
Erwin Janssen [Sat, 13 May 2017 08:14:27 +0000 (10:14 +0200)]
Update SVG reference output

A recent change caused the SVG colors to be specified by name, rather than
by hex code. This updates the reference output accordingly.

7 years agoAdd dtclose(map) line which was accidentally removed in the previous revision.
Emden Gansner [Thu, 11 May 2017 21:39:27 +0000 (17:39 -0400)]
Add dtclose(map) line which was accidentally removed in the previous revision.

7 years agoFix bug where a node whose name starts with "cluster" gets lost in JSON output.
Emden Gansner [Thu, 11 May 2017 18:59:16 +0000 (14:59 -0400)]
Fix bug where a node whose name starts with "cluster" gets lost in JSON output.

7 years agoMerge pull request #1236 from Chiel92/expose_forgotten_cgraph_functions
John Ellson [Thu, 4 May 2017 11:41:27 +0000 (07:41 -0400)]
Merge pull request #1236 from Chiel92/expose_forgotten_cgraph_functions

Expose forgotten cgraph functions.

7 years agoExpose forgotten cgraph functions.
Chiel ten Brinke [Thu, 4 May 2017 08:49:41 +0000 (10:49 +0200)]
Expose forgotten cgraph functions.

7 years agoJust use strcmp, rather than streq.
Emden Gansner [Wed, 3 May 2017 17:15:41 +0000 (13:15 -0400)]
Just use strcmp, rather than streq.

7 years agoFix incorrect bsearch for colors. This basically rolls back the changes from
Emden Gansner [Wed, 3 May 2017 17:05:59 +0000 (13:05 -0400)]
Fix incorrect bsearch for colors. This basically rolls back the changes from
e653d8054fe3c2313944a2a88f3ad7c374bd9b21 and a155276b30da0619979d0b7d5ae22cb05b9b7d16.

7 years agoFix incorrect code that should short-circuit the analysis for colors black, white...
Emden Gansner [Wed, 3 May 2017 16:00:37 +0000 (12:00 -0400)]
Fix incorrect code that should short-circuit the analysis for colors black, white and lightgrey.
It should have been && rather than ||. Just use streq.

7 years agoAdd info on new imagepos attribute to attrs.html page.
Emden R. Gansner [Sun, 30 Apr 2017 20:08:29 +0000 (16:08 -0400)]
Add info on new imagepos attribute to attrs.html page.

7 years agoMerge pull request #1233 from apocalyptech/master
John Ellson [Thu, 27 Apr 2017 15:23:09 +0000 (11:23 -0400)]
Merge pull request #1233 from apocalyptech/master

Add 'imagepos' node attribute to control image placement

7 years agoAdding 'imagepos' node attribute to control image placement
CJ Kucera [Tue, 25 Apr 2017 21:36:09 +0000 (16:36 -0500)]
Adding 'imagepos' node attribute to control image placement

7 years agoReset flex start state if error occurs. Otherwise, the next call to the
Emden Gansner [Sun, 9 Apr 2017 17:48:41 +0000 (13:48 -0400)]
Reset flex start state if error occurs. Otherwise, the next call to the
lexer will potentially start in a state other than INITIAL.

7 years agoback off from usage of unsigned dimensions and colors not supported by libgd
John Ellson [Fri, 7 Apr 2017 14:34:11 +0000 (10:34 -0400)]
back off from usage of unsigned dimensions and colors not supported by libgd

7 years agoMerge pull request #1229 from ErwinJanssen/cmake
John Ellson [Fri, 7 Apr 2017 14:06:06 +0000 (10:06 -0400)]
Merge pull request #1229 from ErwinJanssen/cmake

Major CMake additions + Windows Installer

7 years agoInclude required system libraries on install
Erwin Janssen [Thu, 6 Apr 2017 20:22:23 +0000 (22:22 +0200)]
Include required system libraries on install

By including `InstallRequiredSystemLibraries`, the required system
libraries are included when CPack creates a packages. The main purpose is
including the required vcruntime on Windows.

7 years agoAdd tools from cmd/tools to CMake build
Erwin Janssen [Wed, 5 Apr 2017 20:35:21 +0000 (22:35 +0200)]
Add tools from cmd/tools to CMake build

The directory cmd/tools contains multiple command line tools, these are
added to the CMake build. Because most tools shared some or most of their
settings, a CMake function could be used to set most of these settings.

7 years agoCMake: build getopt if it's not available
Erwin Janssen [Sun, 2 Apr 2017 17:28:31 +0000 (19:28 +0200)]
CMake: build getopt if it's not available

Some platforms (most notably Windows) do have not getopt. For these
platforms, a seperate getopt library can be build and linked when
required.

7 years agoAdd plugin/neato_layout to CMake build
Erwin Janssen [Sat, 1 Apr 2017 09:14:34 +0000 (11:14 +0200)]
Add plugin/neato_layout to CMake build

The dynamic library 'gvplugin_neato_layout' has no dependencies outside
the libraries from `lib`.

7 years agoAdd plugin/gdiplus to CMake build
Erwin Janssen [Sat, 1 Apr 2017 07:53:42 +0000 (09:53 +0200)]
Add plugin/gdiplus to CMake build

The dynamic library 'gvplugin_gdiplus' is, besides from the libraries in
lib, also dependent on gdiplus. This is a Windows only library that is
assumed to be available on Windows systems. The only check added for this
project is `if(WIN32)`.

7 years agoAdd plugin/gd to CMake build
Erwin Janssen [Fri, 31 Mar 2017 11:35:52 +0000 (13:35 +0200)]
Add plugin/gd to CMake build

The dynamic library 'gvplugin_gd' is, besides from the libraries in lib,
also dependent on libgd. For this a check and CMake find module was added.
If libgd is not found, this pluging is not build.

7 years agoUse GRAPHVIZ_PLUGIN_VERSION=6 in CMake build
Erwin Janssen [Fri, 31 Mar 2017 10:49:00 +0000 (12:49 +0200)]
Use GRAPHVIZ_PLUGIN_VERSION=6 in CMake build

The Autotools build specifices the GVPLUGING_VERSION to 6, this doesn't
change in the CMake build.

7 years agoAdd Windows installer using NSIS and CPack
Erwin Janssen [Fri, 31 Mar 2017 07:27:56 +0000 (09:27 +0200)]
Add Windows installer using NSIS and CPack

Create a Windows Installer using CPack and the NSIS generator. The CMake
build on Appveyor now installs Graphviz using this installer and runs the
tests using ctest. The installer is added as an artifact to the Release
build.
Also switched the order of cmake and msbuild in Appveyor and added
`clone_depth: 25` for faster cloning.

7 years agoTravis + Cmake, include usr/local/lib for ldconfig
Erwin Janssen [Sat, 25 Mar 2017 16:23:37 +0000 (17:23 +0100)]
Travis + Cmake, include usr/local/lib for ldconfig

Not all platforms include this directory when running ldconfig, the
CentOS docker image for example.

7 years agoRun `ldconfig` after CMake build install on Travis
Erwin Janssen [Sat, 25 Mar 2017 15:22:47 +0000 (16:22 +0100)]
Run `ldconfig` after CMake build install on Travis

The CMake install command doesn't register the installed libraries, so
ldconfig must be called manually.

7 years agoCMake: Install plugin library to lib/graphviz
Erwin Janssen [Sat, 25 Mar 2017 15:02:38 +0000 (16:02 +0100)]
CMake: Install plugin library to lib/graphviz

Instead of installing the plugin libraries to `lib`, install them
`lib/graphviz`, just like the current Autotools build.

7 years agoExecute CMake test on Travis
Erwin Janssen [Fri, 24 Mar 2017 09:50:04 +0000 (10:50 +0100)]
Execute CMake test on Travis

Verify the build on Travis by executing the tests added by CMake.

7 years agoAdd Python based regression tests to CMake
Erwin Janssen [Fri, 24 Mar 2017 09:21:24 +0000 (10:21 +0100)]
Add Python based regression tests to CMake

This commits add the Python based regression tests to CMake, after
Graphviz has been build and installed, it can be executed by running
`ctest` in the build directory.

7 years agoAdd general CPack information
Erwin Janssen [Mon, 20 Mar 2017 13:03:16 +0000 (14:03 +0100)]
Add general CPack information

Add a seperate file containing the CPack information. This now includes
general information shared by all CPack generators, like package name,
version and description.

7 years agoAdd the `dot` executable to the CMake build
Erwin Janssen [Mon, 20 Mar 2017 12:07:01 +0000 (13:07 +0100)]
Add the `dot` executable to the CMake build

The CMake build now builds `dot` and allows graphs to be rendered. Only
the `core` outputs and `dot_layout` are included for now.

7 years agoAdd plugin/dot_layout to CMake build
Erwin Janssen [Sat, 18 Mar 2017 21:02:07 +0000 (22:02 +0100)]
Add plugin/dot_layout to CMake build

The dynamic library 'gvplugin_dot_layout' has no dependencies outside the
libraries from `lib`.

7 years agoAdd plugin/core to CMake build
Erwin Janssen [Tue, 14 Mar 2017 20:53:58 +0000 (21:53 +0100)]
Add plugin/core to CMake build

The dynamic library 'gvplugin_core' is the first library from `plugin`
added to the CMake build. It has no dependencies outside the libraries
in `lib`.

7 years agoAdd JSON functions to lib/gvc/gvc.def
Erwin Janssen [Tue, 14 Mar 2017 20:00:16 +0000 (21:00 +0100)]
Add JSON functions to lib/gvc/gvc.def

These functions are already added to lib/gvc.def (used by the Visual
Studio build), now they are also added to lib/gvc/gvc.def (used by the
CMake build).

7 years agoAdd some platform checks to CMake build
Erwin Janssen [Sat, 4 Mar 2017 15:26:07 +0000 (16:26 +0100)]
Add some platform checks to CMake build

Included the definition of the DEFAULT_FONTPATH in the platform check.
Also define DARWIN and DARWIN_DYLIB when compiling on OS X.
Both checks are also done in the Autotools build.

7 years agoAdd function checks from configure.ac to CMake
Erwin Janssen [Thu, 9 Feb 2017 07:11:01 +0000 (08:11 +0100)]
Add function checks from configure.ac to CMake

Checks for the following functions were added to the CMake build:
- _NSGetEnviron
- getenv
- lrand48
- setenv
- setmode

7 years agoAdd all header checks from configure.ac to CMake
Erwin Janssen [Wed, 8 Feb 2017 20:38:41 +0000 (21:38 +0100)]
Add all header checks from configure.ac to CMake

The CMake build now checks for the same headers as the Autotools build.
The following headers checks were added:
- crt_externs.h
- fcntl.h
- memory.h
- search.h
- sys/inotify.h
- sys/ioctl.h
- sys/mman.h
- sys/select.h
- sys/time.h
- sys/vfork.h
- termios.h
- vfork.h
- X11/Intrinsic.h
- X11/Xaw/Text.h

7 years agoAdd lib/gvc to CMake build
Erwin Janssen [Tue, 7 Feb 2017 07:02:19 +0000 (08:02 +0100)]
Add lib/gvc to CMake build

The dynamic library `gvc` is the core library of Graphviz. It has various
dependencies, of which some are third party libraries. The DLLs of these
libraries will be included in the package on Windows.

Now also generating `builddate.h` on all platforms. The Windows Visual
Studio build didn't generate this file.

Now also defines GVPLUGIN_CONFIG_FILE, set to confg6, just like the
Autotools build.

Support the "enable-ltdl" option, default value is ON.

Now passing the "-fPIC" to all compilers, except MSVC.

The following checks have been added:
- FindLTDL
- FindRxSpencer (on Windows only)

7 years agoAdd lib/common to CMake build
Erwin Janssen [Fri, 3 Feb 2017 16:50:02 +0000 (17:50 +0100)]
Add lib/common to CMake build

The static library 'common' has no dependencies.

The following checks have been added:
- FindAWK (custom CMake module added)
- FindPerl
- FindEXPAT
- FindZLIB
- HAVE_SINCOS
- HAVE_STRINGS_H
- HAVE_SYS_TYPES_H
- HAVE_STRNCASECMP_H

The steps to generate `colortbl.h` and `ps_font_equiv.h` are the same as
in the Autotools build. DEFAULT_DPI is now set in the config.h generated
by CMake.

7 years agoAdd lib/mingle to CMake build
Erwin Janssen [Sun, 29 Jan 2017 11:30:48 +0000 (12:30 +0100)]
Add lib/mingle to CMake build

The static library 'libmingle' has no dependencies, but a check for the
ANN library had to be added. For this a cmake find module was added.

7 years agoDisable warning C4996 on Windows CMake build
Erwin Janssen [Sun, 29 Jan 2017 09:51:42 +0000 (10:51 +0100)]
Disable warning C4996 on Windows CMake build

MSVC warning C4996 mostly fires on completely valid code. The changes
proposed in the warning text often seriously compromise the code
portability, while they never substantially improve the code quality.
Thus we suppress this warning.

7 years agoAdd lib/topfish to CMake build
Erwin Janssen [Sun, 29 Jan 2017 09:35:17 +0000 (10:35 +0100)]
Add lib/topfish to CMake build

The static library 'topfish' has no dependencies, but the `with_smyrna`
option had to be added.

7 years agoMerge pull request #1227 from ErwinJanssen/prune
John Ellson [Thu, 6 Apr 2017 16:21:00 +0000 (12:21 -0400)]
Merge pull request #1227 from ErwinJanssen/prune

Some cleanup

7 years agoAdd comment noting that feasible_tree() needs to return 1 if the graph is
Emden Gansner [Wed, 5 Apr 2017 21:52:56 +0000 (17:52 -0400)]
Add comment noting that feasible_tree() needs to return 1 if the graph is
disconnected; fix small type on another comment.

7 years agogmlparse.y: Each identifier in dedicated statement
Erwin Janssen [Wed, 5 Apr 2017 12:23:08 +0000 (14:23 +0200)]
gmlparse.y: Each identifier in dedicated statement

It is good practice to define each identifier in a dedicated statement,
various standard and style guides recommend this. Because where multiple
declarators appear in the same declaration, the type of an identifier
may not meet a developer's expectations.

7 years agotypes.h: Each identifier in dedicated statement
Erwin Janssen [Wed, 5 Apr 2017 12:09:47 +0000 (14:09 +0200)]
types.h: Each identifier in dedicated statement

It is good practice to define each identifier in a dedicated statement,
various standard and style guides recommend this. Because where multiple
declarators appear in the same declaration, the type of an identifier
may not meet a developer's expectations.

7 years agocgraph.h: Each identifier in dedicated statement
Erwin Janssen [Wed, 5 Apr 2017 11:23:37 +0000 (13:23 +0200)]
cgraph.h: Each identifier in dedicated statement

It is good practice to define each identifier in a dedicated statement,
various standard and style guides recommend this. Because where multiple
declarators appear in the same declaration, the type of an identifier
may not meet a developer's expectations.

7 years agoRemove unused function `allow_edits` from neatogen
Erwin Janssen [Sat, 1 Apr 2017 08:52:34 +0000 (10:52 +0200)]
Remove unused function `allow_edits` from neatogen

This function is defined but never used, it can therefore be removed.

7 years agoDon't include io.h in gvrender_gd.c
Erwin Janssen [Fri, 31 Mar 2017 11:46:20 +0000 (13:46 +0200)]
Don't include io.h in gvrender_gd.c

The header io.h is not required in this file, so remove the include.

7 years agoRemove HAVE_LIBGD check from plugin/gd
Erwin Janssen [Fri, 31 Mar 2017 11:06:41 +0000 (13:06 +0200)]
Remove HAVE_LIBGD check from plugin/gd

This check should exist only in the build configuration, if plugin/gd gets
build, then libgd should _always_ be available. Otherwise, mistakenly
building plugin/gd without defining HAVE_LIBGD, will lead to believe that
the build is succesfull, while in truth nothing gets build.

7 years agoRemove declared, not defined, function from cdt.h
Erwin Janssen [Fri, 31 Mar 2017 07:06:41 +0000 (09:06 +0200)]
Remove declared, not defined, function from cdt.h

Remove `dttreeset` function declaration from cdt.h. The function
definition was removed some time ago because it was not used in the
codebase, but the declaration wasn't removed properly.

7 years agoRemove unused declaration of type `nodesizefn_t`
Erwin Janssen [Thu, 30 Mar 2017 12:59:33 +0000 (14:59 +0200)]
Remove unused declaration of type `nodesizefn_t`

This type was declared in lib/common/render.h, but never used.

7 years agoFix issue #1225.
Emden Gansner [Wed, 5 Apr 2017 18:17:28 +0000 (14:17 -0400)]
Fix issue #1225.

7 years agoMerge pull request #1224 from ErwinJanssen/windows-fixes
John Ellson [Wed, 5 Apr 2017 16:53:19 +0000 (12:53 -0400)]
Merge pull request #1224 from ErwinJanssen/windows-fixes

Windows fixes

7 years agoAdd gvpr script to create a derived cluster graph.
Emden Gansner [Tue, 4 Apr 2017 19:20:02 +0000 (15:20 -0400)]
Add gvpr script to create a derived cluster graph.