]> granicus.if.org Git - graphviz/log
graphviz
8 years agomissing TCL_EXEC_PREFIX substitution untagged-8d75101f9a003883956c
John Ellson [Sat, 8 Oct 2016 18:27:48 +0000 (14:27 -0400)]
missing TCL_EXEC_PREFIX substitution

8 years agoadd spinehdr.h to source dstribution untagged-5fc0363bc76319758ff6
John Ellson [Sat, 8 Oct 2016 16:24:37 +0000 (12:24 -0400)]
add spinehdr.h to source dstribution

8 years agoMerge branch 'ErwinJanssen-various-changes'
John Ellson [Sat, 8 Oct 2016 16:00:52 +0000 (12:00 -0400)]
Merge branch 'ErwinJanssen-various-changes'

8 years agoMerge branch 'various-changes' of https://github.com/ErwinJanssen/graphviz into Erwin...
John Ellson [Sat, 8 Oct 2016 15:56:04 +0000 (11:56 -0400)]
Merge branch 'various-changes' of https://github.com/ErwinJanssen/graphviz into ErwinJanssen-various-changes

8 years ago#include<spinehdr.h> => #include "spinehdr.h" untagged-a81020c0c01db3e23629
John Ellson [Sat, 8 Oct 2016 15:53:26 +0000 (11:53 -0400)]
#include<spinehdr.h> => #include "spinehdr.h"

8 years agoAdd lib/spine to Windows build
Erwin Janssen [Tue, 4 Oct 2016 16:04:13 +0000 (18:04 +0200)]
Add lib/spine to Windows build

Create a new Visual Studio project for the new library spine and include
this in the Windows build.

8 years agoReplace `Void_t` with `void` in lib/spine
Erwin Janssen [Tue, 4 Oct 2016 15:09:29 +0000 (17:09 +0200)]
Replace `Void_t` with `void` in lib/spine

The newly added code in spine used `Void_t`, which is no longer needed.

8 years agoReplace checks for <stdint.h> and <inttypes.h>
Erwin Janssen [Tue, 27 Sep 2016 10:55:54 +0000 (12:55 +0200)]
Replace checks for <stdint.h> and <inttypes.h>

Instead of checking for the availability of stdint.h and inttypes.h with HAVE_STDINT_H and HAVE_INTTYPES_H, simply include stdint.h. The header stdint.h is part of the C99 standard, so it can be safely assumed that this header is present.
inttypes.h contains everything stdint.h includes, but in all cases here, stdint.h suffices.

8 years agoRemove usage of not set define HAVE_VMALLOC
Erwin Janssen [Mon, 26 Sep 2016 20:27:09 +0000 (22:27 +0200)]
Remove usage of not set define HAVE_VMALLOC

This define is only used three times in lib/cgraph:
- In cghdr.h to include vmalloc.h
- In main.c in a function that is never called.
- in mem.c where malloc based allocation is used instead.

8 years agoNo _BEGIN/END_EXTERNS_ in headers with extern "C"
Erwin Janssen [Mon, 26 Sep 2016 11:35:33 +0000 (13:35 +0200)]
No _BEGIN/END_EXTERNS_ in headers with extern "C"

The defines _BEGIN_EXTERNS_ and _END_EXTERNS_ define `extern "C"` based on compilation with C++. However, the header files containing this define already have this check in a more conventional way. This additional define is therefore not needed in these files.

8 years agoRemove alloca checks and definition
Erwin Janssen [Sat, 24 Sep 2016 15:34:49 +0000 (17:34 +0200)]
Remove alloca checks and definition

There are various checks for the alloca function and a definition of this function if it isn't found. However, the alloca function is never used anywhere in the code. These checks and defintions can therefore be removed.

8 years agoRemove usage of _hdr_mman define.
Erwin Janssen [Sat, 24 Sep 2016 14:25:22 +0000 (16:25 +0200)]
Remove usage of _hdr_mman define.

This define is never set as there are no checks for it.

8 years agoRemove unused code from cgraph: sfdcio
Erwin Janssen [Sat, 24 Sep 2016 12:42:16 +0000 (14:42 +0200)]
Remove unused code from cgraph: sfdcio

This function is never used somewhere. Removed the function declaration from sfdisc.h and the file containing the definition.
The define `HAVE_STRUCT_DIOATTR` was only used in this code file, so the check setting this define in `configure.ac` can also be removed.

8 years agoRemove unused file from sfio: Makefile.orig
Erwin Janssen [Sat, 24 Sep 2016 02:12:37 +0000 (04:12 +0200)]
Remove unused file from sfio: Makefile.orig

This makefile was probably the original makefile used by sfio, but another
makefile being used now.

8 years agoRemove define and usage of `_hdr_float`
Erwin Janssen [Sat, 24 Sep 2016 01:13:23 +0000 (03:13 +0200)]
Remove define and usage of `_hdr_float`

The header file float.h is part of the standard C library, so we can
assume it is always available. This header file also isn't included in the
sfio build when `_SFBINARY` is defined, resulting in a failed build.
The checks defining `_hdr_float` are removed and <float.h> is only
included were required in lib/sfio: in sfputd.c

8 years agoRemove usage of HAVE_AST define
Erwin Janssen [Wed, 21 Sep 2016 22:02:44 +0000 (00:02 +0200)]
Remove usage of HAVE_AST define

This define is never set, because there are no checks for the ast library. The checks using this define will never succeed, so they can be removed.

8 years agoRemove unused code from cgraph: vmstub.h
Erwin Janssen [Wed, 21 Sep 2016 18:47:42 +0000 (20:47 +0200)]
Remove unused code from cgraph: vmstub.h

The header file vmstub.h is never included or used.

8 years agoNo longer include ast_common.h in lib/cdt
Erwin Janssen [Wed, 21 Sep 2016 17:30:48 +0000 (19:30 +0200)]
No longer include ast_common.h in lib/cdt

The ast_common.h no longer contains anything used by cdt, so including it
is no longer needed.

8 years agoReplace _BEGIN/END_EXTERNS_ with extern "C" in cdt
Erwin Janssen [Tue, 20 Sep 2016 15:21:54 +0000 (17:21 +0200)]
Replace _BEGIN/END_EXTERNS_ with extern "C" in cdt

8 years agoReplace `Void_t` with `void`
Erwin Janssen [Tue, 20 Sep 2016 11:34:44 +0000 (13:34 +0200)]
Replace `Void_t` with `void`

There used to be a check that defined `Void_t` as `void` when standard C
was used and `char` otherwise. Since we are always compiling with standard
C and `void` is a valid type, there is no reason to keep this typedef.

8 years agoRemoved redefinitions of `offsetof`
Erwin Janssen [Tue, 20 Sep 2016 11:09:17 +0000 (13:09 +0200)]
Removed redefinitions of `offsetof`

The `offsetof` macro is part of the ANSI C standard, so redefining it is
not needed since it's always present.

8 years agoRemove all __DEFINE__ and __EXTERN__ macros
Erwin Janssen [Mon, 19 Sep 2016 18:47:43 +0000 (20:47 +0200)]
Remove all __DEFINE__ and __EXTERN__ macros

It seems that the condition where this macro is defined
(`#if !defined(_DLL_BLD) && defined(_dll_import)`) is never met. This
macro also seems to be meant for very specific scenario.
All in all, it seems safe to remove the macros by replacing them with
the value it gets when the above condition is not met.

8 years agoRemove _ARG_ macro from all files.
Erwin Janssen [Mon, 19 Sep 2016 16:08:08 +0000 (18:08 +0200)]
Remove _ARG_ macro from all files.

This macro is used to simplify function prototyping when using the old
K&R C and more modern C dialects. Only three projects use this macro:
cdt, sfio and vmalloc. K&R is obsolete, so this macro adds no benefits and
only makes the code more complicated.
Definition and usage of this macro is removed from all files.

8 years agolib/cdt/cdt.h: Remove `#if 0` block
Erwin Janssen [Mon, 19 Sep 2016 13:57:44 +0000 (15:57 +0200)]
lib/cdt/cdt.h: Remove `#if 0` block

This `#if 0` block contains the extern declaration of two function
declared in string.h (which is included). This block can safely be
removed.

8 years agolib/cdt/dthdr.h: #include <stdlib.h>
Erwin Janssen [Mon, 19 Sep 2016 13:54:17 +0000 (15:54 +0200)]
lib/cdt/dthdr.h: #include <stdlib.h>

Instead of declaring externs for the function malloc, realloc and free,
include the stdlib.h header file that includes these declarations.

8 years agoAdd library for computing Simmelian backbones of graphs. untagged-20d8043c3b4489073df9
Emden R. Gansner [Sun, 2 Oct 2016 21:49:01 +0000 (17:49 -0400)]
Add library for computing Simmelian backbones of graphs.

8 years agoMerge pull request #1164 from ErwinJanssen/update-appveyor-dependencies untagged-1db191c2a75651a2a553
John Ellson [Tue, 27 Sep 2016 13:34:24 +0000 (09:34 -0400)]
Merge pull request #1164 from ErwinJanssen/update-appveyor-dependencies

Appveyor: update libgd dependencies and build dir

8 years agoAppveyor: update libgd dependencies and build dir
Erwin Janssen [Mon, 26 Sep 2016 20:42:26 +0000 (22:42 +0200)]
Appveyor: update libgd dependencies and build dir

Change the build directory of libgd to `build` instead of `gdbuild`,
because `build` is ignored by the libgd's .gitignore file. The vcxproject
files have been updated to reflect this change.

Changed the download link for freetype because the link was changed.

8 years agoMerge branch 'ErwinJanssen-remove-unused' untagged-026b538d0dba6682fde7
John Ellson [Mon, 19 Sep 2016 18:21:06 +0000 (14:21 -0400)]
Merge branch 'ErwinJanssen-remove-unused'

(resolved conflict from reinstalled features/common)

8 years agomerge changes except to features/common
John Ellson [Mon, 19 Sep 2016 18:16:05 +0000 (14:16 -0400)]
merge changes except to features/common

8 years agoMerge pull request #1163 from ErwinJanssen/less-conditional-build untagged-4431b9bde391f1b69fe5 untagged-bc9e6eee63f1f0bce98f
John Ellson [Mon, 19 Sep 2016 17:13:24 +0000 (13:13 -0400)]
Merge pull request #1163 from ErwinJanssen/less-conditional-build

Less conditional build

8 years agoMerge pull request #1162 from ErwinJanssen/generate-exparse.c
John Ellson [Mon, 19 Sep 2016 17:12:38 +0000 (13:12 -0400)]
Merge pull request #1162 from ErwinJanssen/generate-exparse.c

Windows: generate exparse.c and exparse.h

8 years agoMerge pull request #1161 from ErwinJanssen/fix/travis-build
John Ellson [Mon, 19 Sep 2016 17:12:02 +0000 (13:12 -0400)]
Merge pull request #1161 from ErwinJanssen/fix/travis-build

Fix Travis deployment

8 years agoRemove remaining defines and usage of `__STD_C`
Erwin Janssen [Mon, 19 Sep 2016 12:56:43 +0000 (14:56 +0200)]
Remove remaining defines and usage of `__STD_C`

We are compiling with standard C99, so there is no need to define and
check for `__STD_C`, it is always true.

8 years agoRemoved old-style function defintions from vmalloc
Erwin Janssen [Wed, 14 Sep 2016 15:16:24 +0000 (17:16 +0200)]
Removed old-style function defintions from vmalloc

The functions definitions in vmalloc are all surrounded by an `#if __STD_C`, if __STD_C is not defined than the old style function definition is used. These days STD C is the standard and the old style function defintions are obsolete.
They have been removed from lib/vmalloc and its subprojects, comments have been preserved by converting them to a Doxygen style.

8 years agoRemoved old-style function defintions from sfio
Erwin Janssen [Fri, 9 Sep 2016 01:36:30 +0000 (03:36 +0200)]
Removed old-style function defintions from sfio

The functions definitions in sfio are all surrounded by an `#if __STD_C`, if __STD_C is not defined than the old style function definition is used. These days STD C is the standard and the old style function defintions are obsolete.
They have been removed from lib/sfio and its subprojects, comments have been preserved by converting time to a Doxygen style.

8 years agoRemoved old-style function defintions from lib/cdt
Erwin Janssen [Thu, 8 Sep 2016 21:06:24 +0000 (23:06 +0200)]
Removed old-style function defintions from lib/cdt

The functions definitions in cdt are all surrounded by an `#if __STD_C`, if __STD_C is not defined than the old style function definition is used. These days STD C is the standard and the old style function defintions are obsolete.
They have been removed from lib/cdt, but not from the subprojects.

8 years agoReplace `SF_MAXDOUBLE` with `DBL_MAX` in lib/sfio
Erwin Janssen [Mon, 19 Sep 2016 11:10:58 +0000 (13:10 +0200)]
Replace `SF_MAXDOUBLE` with `DBL_MAX` in lib/sfio

There are multiple checks to set SF_MAXDOUBLE, which is then only used
once. Since we are compiling with standard C and `float.h` is part of the
standard C API, we can use DBL_MAX instead and remove the define of
SF_MAXDOUBLE. This also results in some header files that are no longer
included, so checks for these could also be removed.

8 years agoRemove define and usage of `_hdr_stdint`
Erwin Janssen [Sun, 18 Sep 2016 21:16:28 +0000 (23:16 +0200)]
Remove define and usage of `_hdr_stdint`

This define is used in `lib/sfio` to determine if it is alright to include
`<stdint.h>`. Since we are compiling with standard C and stdint.h is part
of the standard, we can safely assume this check always evaluates to true
and remove it.

8 years agoWindows: same runtime library option for getopt
Erwin Janssen [Sun, 18 Sep 2016 17:42:41 +0000 (19:42 +0200)]
Windows: same runtime library option for getopt

The Release configuration of the getopt library used a different runtime
library option than the other projects. This is fixed now.

8 years agoRemove HAVE_BOOLEAN from windows\include\config.h
Erwin Janssen [Sun, 18 Sep 2016 16:43:59 +0000 (18:43 +0200)]
Remove HAVE_BOOLEAN from windows\include\config.h

This define is only defined here, and never occures anywhere else.

8 years agoRemove define and usage of HAVE_BOOL
Erwin Janssen [Sun, 18 Sep 2016 15:50:06 +0000 (17:50 +0200)]
Remove define and usage of HAVE_BOOL

This define was only used twice. Once surrounded by a `#if 0` and once
only if HAVE_STDBOOL_H wasn't defined (HAVE_STDBOOL_H is part of the C99
standard library and is always defined).

8 years agoRemove define and usage of HAVE_STRING_H
Erwin Janssen [Sun, 18 Sep 2016 14:56:26 +0000 (16:56 +0200)]
Remove define and usage of HAVE_STRING_H

The header string.h is always present since we are compiling with standard C.
There is no need for this check, since it will always evaluate to true.
In addition to this, most includes of string.h to not use this check.

8 years agoRemove define and usage of `_hdr_string`
Erwin Janssen [Sun, 18 Sep 2016 12:51:15 +0000 (14:51 +0200)]
Remove define and usage of `_hdr_string`

This define is used in `lib/sfio` to determine if it is alright to include
`<string.h>`. Since we are compiling with standard C and string.h is part
of the standard, we can safely assume this check always evaluates to true
and remove it.

8 years agoRemove check for unused `socklen_t`
Erwin Janssen [Sun, 18 Sep 2016 12:37:35 +0000 (14:37 +0200)]
Remove check for unused `socklen_t`

The presence of `socklen_t` is tested and an alternative typedef is
created when `socklen_t` is absent, but `socklen_t` is never used in the
code, this check should be removed.

8 years agoRemove define and usage of HAVE_STDLIB_H
Erwin Janssen [Sun, 18 Sep 2016 12:19:02 +0000 (14:19 +0200)]
Remove define and usage of HAVE_STDLIB_H

The header stdlib.h is always present since we are compiling with standard C.
There is no need for this check, since it will always evaluate to true.

8 years agoRemove define and usage of `_hdr_stdlib`
Erwin Janssen [Sun, 18 Sep 2016 11:38:54 +0000 (13:38 +0200)]
Remove define and usage of `_hdr_stdlib`

This define is used in `lib/sfio` and `lib/vmalloc' to determine if it is
alright to include `<stdlib.h>`. Since we are compiling with standard C
and stdlib.h is part of the standard, we can safely assume this check
always evaluates to true and remove it.

8 years agoRemoved unsed vcproj files from DIST targets.
Erwin Janssen [Sun, 18 Sep 2016 11:11:44 +0000 (13:11 +0200)]
Removed unsed vcproj files from DIST targets.

8 years agoRemove unused *.vcproj files.
Erwin Janssen [Sun, 18 Sep 2016 01:46:07 +0000 (03:46 +0200)]
Remove unused *.vcproj files.

The .vcproj files are the old Visual Studio project files. A lot of these
were upgraded and the old versions removed. These vcproj files have an
upgraded .vcxproj, but hadn't been removed yet.

8 years agoRemove checks for getopt.h
Erwin Janssen [Sun, 18 Sep 2016 01:37:04 +0000 (03:37 +0200)]
Remove checks for getopt.h

Removed the checks that define `HAVE_GETOPT_H` and `HAVE_GETOPT_DECL`.
Because getopt can be used by the Windows build, these checks are no
longer needed.

8 years agoRemove all references to getopt_compat.h
Erwin Janssen [Sun, 18 Sep 2016 01:15:34 +0000 (03:15 +0200)]
Remove all references to getopt_compat.h

This file is removed, so references to this file should be removed as well.

8 years agoWindows: link getopt library to multiple projects
Erwin Janssen [Sun, 18 Sep 2016 01:06:52 +0000 (03:06 +0200)]
Windows: link getopt library to multiple projects

The projects that required getopt were:
- acyclic
- bcomps
- ccomps
- dijkstra
- edgepaint
- gc
- gml2gv
- graphml2gv
- gv2gml
- gvcolor
- gvgen
- gvmap
- gvpack
- gvprlib
- gxl2gv
- mingle
- mm2gv
- nop
- prune
- sccmap
- smyrna
- tred
- unflatten

Also made minor changes to graphml2gv for proper linking.

8 years agoRemove old getopt.h and compat_getopt.h
Erwin Janssen [Sun, 18 Sep 2016 00:28:54 +0000 (02:28 +0200)]
Remove old getopt.h and compat_getopt.h

These two files were present because Windows doesn't have the getopt
function. With the new getopt library for Windows added, these two files
are no longer needed.

8 years agoWindows: add getopt library project.
Erwin Janssen [Sun, 18 Sep 2016 00:11:05 +0000 (02:11 +0200)]
Windows: add getopt library project.

This library should provide the ability to use `getopt` in the Windows
build. The implementatation of the `getopt` function is taken from the
ingraphs library.
Adding this project also added a x64 build configuration to the Visual
Studio solution, but this configuration isn't tested yet.

8 years agoRemove HAVE_CONFIG_H check
Erwin Janssen [Sat, 17 Sep 2016 23:34:38 +0000 (01:34 +0200)]
Remove HAVE_CONFIG_H check

config.h should always be included, a build without it never happens.
The checks on Linux always succeed, because autotools automatically
defines HAVE_CONFIG_H on all the Makefiles. On Windows this is not the
case. Removing all the checks revealed that multiple projects did not
include config.h because HAVE_CONFIG_H wasn't defined. This was the case
for at least the following projects:
- acyclic
- bcomps
- ccomps
- dijkstra
- ingraphs
- gc
- gml2gv
- graphml2gv
- gv2gml
- gvcolor
- gvgen
- mm2gv
- nop
- pathplan
- rbtree
- sccmap
- topfish
- tred

Added `windows\include` to the additional include directories and adding
some library paths solves some, but not all problems that emerged when the
check was removed and some code actually got compiled that wasn't compiled
before.

8 years agoWindows: generate exparse.c
Erwin Janssen [Sat, 17 Sep 2016 12:05:36 +0000 (14:05 +0200)]
Windows: generate exparse.c

Instead of using the static files windows/exparse.c and
windows/include/exparse.h, use Bison to generate exparse.c and exparse.h.

8 years agoUnremove cdt/features/common
Erwin Janssen [Sat, 17 Sep 2016 01:57:46 +0000 (03:57 +0200)]
Unremove cdt/features/common

8 years agoFix Travis deployment
Erwin Janssen [Wed, 14 Sep 2016 16:18:36 +0000 (18:18 +0200)]
Fix Travis deployment

Because of the use of `sudo` the created file is owned by root and the default travis user has no permission to deploy it. Using `chown` fixes this.
Also added a condition on the deploy, so only one file gets deployed.

8 years agoUnremove makefile in doc/infosrc
Erwin Janssen [Fri, 16 Sep 2016 11:08:49 +0000 (13:08 +0200)]
Unremove makefile in doc/infosrc

This Makefile was marked with the .old extension, but it's still used.
Placed the file back and removed the .old extension.

8 years agoRemove all .old files
Erwin Janssen [Fri, 9 Sep 2016 22:19:37 +0000 (00:19 +0200)]
Remove all .old files

These files are no longer used in the build. Some Makefiles included an .old file in the `dist` step. These references are removed.

8 years agoRemove features/common
Erwin Janssen [Thu, 8 Sep 2016 20:52:19 +0000 (22:52 +0200)]
Remove features/common

This file isn't used in the build. If I understand correctly, ast_common.h used to be using this file and iffe, but this is no longer the case. It seems safe to remove it.

8 years agoRemoved unused subdirectories of the cdt library.
Erwin Janssen [Thu, 8 Sep 2016 20:10:44 +0000 (22:10 +0200)]
Removed unused subdirectories of the cdt library.

The cdt library has three subfolder, none of which are included in any part of the build whatsoever. They can safely be removed.

8 years agoMerge pull request #1159 from ErwinJanssen/fix/travis-build
John Ellson [Wed, 14 Sep 2016 15:43:00 +0000 (11:43 -0400)]
Merge pull request #1159 from ErwinJanssen/fix/travis-build

Update Criterion submodule to fix Travis build

8 years agoUpdate Criterion submodule to fix Travis build
Erwin Janssen [Wed, 14 Sep 2016 15:20:33 +0000 (17:20 +0200)]
Update Criterion submodule to fix Travis build

For some reason the Travis build fails when pulling the Criterion submodule. Updating the submodule resolves this issue.

8 years agoRe-added -lstdc++ to fix build breakage
John Ellson [Wed, 14 Sep 2016 13:45:11 +0000 (09:45 -0400)]
Re-added -lstdc++ to fix build breakage

8 years agoMerge pull request #1157 from ErwinJanssen/fix-cast-warning
John Ellson [Wed, 14 Sep 2016 13:30:22 +0000 (09:30 -0400)]
Merge pull request #1157 from ErwinJanssen/fix-cast-warning

Use `strcmp` in instead of `gvrender_comparestr`.

8 years agoMerge pull request #1156 from ErwinJanssen/travis-centos
John Ellson [Wed, 14 Sep 2016 13:26:54 +0000 (09:26 -0400)]
Merge pull request #1156 from ErwinJanssen/travis-centos

Add build on CentOS 7 to Travis

8 years agoChange cast of strcmp in bsearch.
Erwin Janssen [Fri, 9 Sep 2016 22:02:58 +0000 (00:02 +0200)]
Change cast of strcmp in bsearch.

Casting `strcmp` to `__compar_fn_t` doesn't work on Windows, the build
fails. Instead, cast `strcmp` to the required function type:
`(int(*)(const void*, const void*)`

8 years agoUse `strcmp` in instead of `gvrender_comparestr`.
Erwin Janssen [Fri, 9 Sep 2016 01:19:19 +0000 (03:19 +0200)]
Use `strcmp` in instead of `gvrender_comparestr`.

`bsearch` is used in this function to find a string in a string array. It's not needed to pass the address of `tok` to the function, because `tok` is already a pointer. `gvrender_comparestr` should then cast the values to `(const char)` instead of `*(char**)`, because `s1` and `s2` are strings, not pointers to a string. With this change the function only calls `strcmp`, so passing `strcmp` to `bsearch` has the same effect and `gvrender_comparestr` can be removed.
This gets rid of all the `-Wcast-qual` warnings as well.

8 years agoTravis: Add build on CentOS 7 using Docker.
Erwin Janssen [Thu, 8 Sep 2016 17:03:57 +0000 (19:03 +0200)]
Travis: Add build on CentOS 7 using Docker.

There are now two environments, one where the variable DOCKER_BUILD is true and one where it is false. False means a normal build on the Travis build image, true means docker will be used to run a build on a CentOS 7 image. The setup of the CentOS 7 image is done in the Dockerfile in `ci/centos7`. It takes a clean CentOS 7 image and installs the required build utilities and dependencies for a minimal build.

8 years agoAdded error checking to ci/build_and_test.sh
Erwin Janssen [Thu, 8 Sep 2016 16:03:32 +0000 (18:03 +0200)]
Added error checking to ci/build_and_test.sh

Instead of executing all command even if some fail, stop when a command fails and print an error message.

8 years agoRemoved `-lstdc++` from Makefiles
Erwin Janssen [Thu, 8 Sep 2016 12:23:55 +0000 (14:23 +0200)]
Removed `-lstdc++` from Makefiles

This flag causes errors in the Docker build. Removing it still results in a succesfull build and the previous changelogs indicate that this flag should be removed.

8 years agoUse `build_and_test.sh` script in Travis build.
Erwin Janssen [Thu, 8 Sep 2016 12:00:51 +0000 (14:00 +0200)]
Use `build_and_test.sh` script in Travis build.

This script makes it easier to add multiple platforms using docker.

8 years agorevert change - not right untagged-a22228c7bd6ed4c2a8f9
John Ellson [Thu, 8 Sep 2016 04:13:48 +0000 (00:13 -0400)]
revert change - not right

8 years agodrop some strange casts to cllean up some warnings untagged-88f8affbb29485590ece
John Ellson [Wed, 7 Sep 2016 23:44:14 +0000 (19:44 -0400)]
drop some strange casts to cllean up some warnings

8 years agoMerge pull request #1155 from ErwinJanssen/windows-release untagged-897b348e31e4e52e8698
John Ellson [Wed, 7 Sep 2016 23:19:26 +0000 (19:19 -0400)]
Merge pull request #1155 from ErwinJanssen/windows-release

Various improvements to Windows build

8 years agoMerge pull request #1154 from ErwinJanssen/refactor-sign-conversion
John Ellson [Wed, 7 Sep 2016 23:18:31 +0000 (19:18 -0400)]
Merge pull request #1154 from ErwinJanssen/refactor-sign-conversion

Resolve some conversion warnings

8 years agoAppveyor: split build into two jobs.
Erwin Janssen [Tue, 6 Sep 2016 14:06:23 +0000 (16:06 +0200)]
Appveyor: split build into two jobs.

Split the build into two jobs: one for Release and one for Debug.

8 years agoWindows: added gdiplus to build.
Erwin Janssen [Tue, 6 Sep 2016 14:00:12 +0000 (16:00 +0200)]
Windows: added gdiplus to build.

The gdiplus Visual Studio project was previously removed, but now added
again and cleaned in the same way as the other projects.

8 years agoWindows: Use $(Configuration) in output directory
Erwin Janssen [Tue, 6 Sep 2016 12:33:45 +0000 (14:33 +0200)]
Windows: Use $(Configuration) in output directory

Instead of using the name of the configuration (Debug or Release), use the
variable that contains this value.

8 years agoRemoved `QCoreApplication::UnicodeUTF8` arguments
Erwin Janssen [Tue, 6 Sep 2016 11:01:51 +0000 (13:01 +0200)]
Removed `QCoreApplication::UnicodeUTF8` arguments

From the Qt documentation (http://wiki.qt.io/Transition_from_Qt_4.x_to_Qt5#QCoreApplication::UnicodeUTF8_is_deprecated):

QCoreApplication::UnicodeUTF8 is deprecated

This enum type used to define the 8-bit encoding of character string arguments to translate(). This enum is now obsolete and UTF-8 will be used in all cases. So remove all instances of QCoreApplication::UnicodeUTF8.

8 years agoIn gvedit, replaced `toAscii()` with `toLatin()`
Erwin Janssen [Tue, 6 Sep 2016 10:54:33 +0000 (12:54 +0200)]
In gvedit, replaced `toAscii()` with `toLatin()`

From the Qt documentation
(http://wiki.qt.io/Transition_from_Qt_4.x_to_Qt5#toAscii.28.29_and_fromAscii.28.29_Methods_are_deprecated):

toAscii() and fromAscii() Methods are deprecated

Replace all instances of

```
fromAscii()
toAscii()
```

to

```
fromLatin1()
toLatin1()
```

8 years agoWindows: added ccomps to build
Erwin Janssen [Tue, 30 Aug 2016 18:26:19 +0000 (20:26 +0200)]
Windows: added ccomps to build

The ccomps Visual Studio project was previously removed, but now added
again and cleaned in the same way as the other projects.

8 years agoRemoved windows/libann
Erwin Janssen [Mon, 29 Aug 2016 21:24:45 +0000 (23:24 +0200)]
Removed windows/libann

This folder only contained a project file, no code. Also, lib ANN is
included in windows\dependencies\ANN.

8 years agoResolved "macro redefinition" warnings.
Erwin Janssen [Mon, 29 Aug 2016 20:16:59 +0000 (22:16 +0200)]
Resolved "macro redefinition" warnings.

On Windows, the Linux build does not throw this warning, the warning C4005
"macro redefinition" is thrown several hundered times. Most of these could
be prepended by an `#undef`, this resolves the warning.

8 years agoWindows: Generate no debug information for Release.
Erwin Janssen [Mon, 29 Aug 2016 12:17:13 +0000 (14:17 +0200)]
Windows: Generate no debug information for Release.

The Release configuration doesn't shouldn't contain debug information,
because this is going to be released to the general public.

8 years agoWindows: set <DebugInformationFormat> to default.
Erwin Janssen [Mon, 29 Aug 2016 11:54:08 +0000 (13:54 +0200)]
Windows: set <DebugInformationFormat> to default.

Set the <DebugInformationFormat> to default for the release configuration.
The value it had (Zi) is the same as the default value, so the
<DebugInformationFormat> can be safely removed.

8 years agoAppveyor: Add Debug build and artifact.
Erwin Janssen [Mon, 29 Aug 2016 11:14:50 +0000 (13:14 +0200)]
Appveyor: Add Debug build and artifact.

Run both a Release and a Debug build create artifacts for both
configurations.

8 years agoWindows: Change release output directory
Erwin Janssen [Mon, 29 Aug 2016 11:11:51 +0000 (13:11 +0200)]
Windows: Change release output directory

Use $(SolutionDir)Release\Graphviz\bin\ instead of
$(SolutionDir)Graphviz\bin\. This is more consistent and allows for an
easier artifact selection on Appveyor.

8 years agoshapes.c: Initialize `pointf p` variable.
Erwin Janssen [Mon, 29 Aug 2016 10:22:09 +0000 (12:22 +0200)]
shapes.c: Initialize `pointf p` variable.

Because this variable was used uninitialized, it caused a runtime error on
Windows.

8 years agoWindows: enabled Debug build for all projects.
Erwin Janssen [Mon, 29 Aug 2016 10:00:52 +0000 (12:00 +0200)]
Windows: enabled Debug build for all projects.

Not all project would build when using the Debug configuration, and some
projects had conflicting settings that didn't allow a Debug build. Both
are fixed.

8 years agoAppveyor: produce two artifacts
Erwin Janssen [Thu, 25 Aug 2016 18:01:16 +0000 (20:01 +0200)]
Appveyor: produce two artifacts

Produce two artifacts: one with all the files that are generated during
the build (PDB files for debug, etc.) and one without. The last one is
most suited as a release.

8 years agoAppveyor: Fix typo in appveyor.yml.
Erwin Janssen [Thu, 25 Aug 2016 17:57:18 +0000 (19:57 +0200)]
Appveyor: Fix typo in appveyor.yml.

Added a missing 'p' to .zip file.

8 years agoWindows: Remove <LinkIncremental> from vmalloc.
Erwin Janssen [Thu, 25 Aug 2016 14:03:24 +0000 (16:03 +0200)]
Windows: Remove <LinkIncremental> from vmalloc.

The Debug configuration still had the <LinkIncremental> property.

8 years agoWindows: Removed false <RandomizedBaseAddress>
Erwin Janssen [Thu, 25 Aug 2016 13:25:31 +0000 (15:25 +0200)]
Windows: Removed false <RandomizedBaseAddress>

Some project had <RandomizedBaseAddress> set to false. Setting this to
false disables ASLR which is a nice security feature. These options are
removed because the default value for <RandomizedBaseAddress> is true.

8 years agoAppveyor: Reduce empty lines appveyor.yml
Erwin Janssen [Thu, 25 Aug 2016 12:13:01 +0000 (14:13 +0200)]
Appveyor: Reduce empty lines appveyor.yml

8 years agoWindows: dependencies copied on post-build step.
Erwin Janssen [Thu, 25 Aug 2016 11:24:05 +0000 (13:24 +0200)]
Windows: dependencies copied on post-build step.

Dependencies (DLLs from 3rd parties) are copied on the post-build step to
the Graphviz\bin folder.

8 years agoWindows: clean additional library directories
Erwin Janssen [Wed, 24 Aug 2016 19:33:19 +0000 (21:33 +0200)]
Windows: clean additional library directories

Removed unused and used `$(OutDir)` instead of
`$(SolutionDir)Graphviz\bin\` for release and
`$(SolutionDir)Debug\Graphviz\bin\` for debug.

8 years agoWindows: clean additional include directories.
Erwin Janssen [Tue, 23 Aug 2016 13:45:42 +0000 (15:45 +0200)]
Windows: clean additional include directories.

Removed unused include directories and reordered the remaining.

8 years agoWindows: Removed <LinkIncremental> property
Erwin Janssen [Tue, 23 Aug 2016 11:42:57 +0000 (13:42 +0200)]
Windows: Removed <LinkIncremental> property

With the current configuration, this property is ignored, so using the
default value is fine.