]> granicus.if.org Git - graphviz/log
graphviz
2 years agoMerge branch 'smattr/DFDACC2F-624B-4360-BC9C-9B2A116EB11C' into 'main'
Matthew Fernandez [Mon, 10 Jan 2022 16:48:16 +0000 (16:48 +0000)]
Merge branch 'smattr/DFDACC2F-624B-4360-BC9C-9B2A116EB11C' into 'main'

more boolean → modernization

See merge request graphviz/graphviz!2391

2 years agois_internal_to_cluster; return a C99 bool instead of an ambiguous int
Matthew Fernandez [Mon, 10 Jan 2022 00:49:59 +0000 (16:49 -0800)]
is_internal_to_cluster; return a C99 bool instead of an ambiguous int

2 years agois_nonconstraint: return a C99 bool instead of an ambiguous int
Matthew Fernandez [Mon, 10 Jan 2022 00:49:14 +0000 (16:49 -0800)]
is_nonconstraint: return a C99 bool instead of an ambiguous int

2 years agois_empty: return a C99 bool instead of an ambigous int
Matthew Fernandez [Mon, 10 Jan 2022 00:48:35 +0000 (16:48 -0800)]
is_empty: return a C99 bool instead of an ambigous int

2 years agois_cluster: return a C99 bool instead of an ambiguous int
Matthew Fernandez [Mon, 10 Jan 2022 00:47:26 +0000 (16:47 -0800)]
is_cluster: return a C99 bool instead of an ambiguous int

2 years agois_a_cluster: return a C99 bool instead of ambiguous int
Matthew Fernandez [Mon, 10 Jan 2022 00:46:00 +0000 (16:46 -0800)]
is_a_cluster: return a C99 bool instead of ambiguous int

This function was already morally returning a boolean value.

2 years agomapbool: take a 'const char*' parameter instead of 'char*'
Matthew Fernandez [Mon, 10 Jan 2022 00:44:32 +0000 (16:44 -0800)]
mapbool: take a 'const char*' parameter instead of 'char*'

This parameter is not modified internally.

2 years agomapbool: return a C99 bool instead of a boolean
Matthew Fernandez [Mon, 10 Jan 2022 00:43:32 +0000 (16:43 -0800)]
mapbool: return a C99 bool instead of a boolean

2 years agomapBool: take a 'const char*' parameter instead of 'char*'
Matthew Fernandez [Mon, 10 Jan 2022 00:34:27 +0000 (16:34 -0800)]
mapBool: take a 'const char*' parameter instead of 'char*'

This parameter is not modified within the function.

2 years agomapBool: use C99 bools for boolean parameters
Matthew Fernandez [Mon, 10 Jan 2022 00:32:23 +0000 (16:32 -0800)]
mapBool: use C99 bools for boolean parameters

Note that this required a somewhat awkward work around in `getAdjustMode` that
was abusing being able to fit something other than a boolean into the type used
for booleans.

2 years agolate_bool: use C99 bools for boolean parameters
Matthew Fernandez [Mon, 10 Jan 2022 00:16:21 +0000 (16:16 -0800)]
late_bool: use C99 bools for boolean parameters

2 years agoortho segment: remove unused 'flipped' member
Matthew Fernandez [Mon, 10 Jan 2022 00:08:35 +0000 (16:08 -0800)]
ortho segment: remove unused 'flipped' member

2 years agonode_distinct_coloring: take 'weightedQ' parameter as a C99 bool
Matthew Fernandez [Sun, 9 Jan 2022 16:56:53 +0000 (08:56 -0800)]
node_distinct_coloring: take 'weightedQ' parameter as a C99 bool

2 years agogvmap plot_dot_map: use a C99 bool for local 'plot_polyQ'
Matthew Fernandez [Sun, 9 Jan 2022 16:50:52 +0000 (08:50 -0800)]
gvmap plot_dot_map: use a C99 bool for local 'plot_polyQ'

2 years agogvprintpointflist: replace a boolean literal with C99 bool 'true'
Matthew Fernandez [Sun, 9 Jan 2022 16:50:20 +0000 (08:50 -0800)]
gvprintpointflist: replace a boolean literal with C99 bool 'true'

2 years agoMerge branch 'unify-storage-class-declarations-in-xdot' into 'main'
Magnus Jacobsson [Mon, 10 Jan 2022 15:05:06 +0000 (15:05 +0000)]
Merge branch 'unify-storage-class-declarations-in-xdot' into 'main'

Unify storage class declarations in xdot

See merge request graphviz/graphviz!2390

2 years agoxdot: [nfc] align storage-class declarations to Graphviz standard in xdot.h
Magnus Jacobsson [Sun, 2 Jan 2022 18:05:22 +0000 (19:05 +0100)]
xdot: [nfc] align storage-class declarations to Graphviz standard in xdot.h

2 years agoxdot: [nfc] remove useless default extern declaration of functions in xdot.h
Magnus Jacobsson [Sun, 2 Jan 2022 18:04:22 +0000 (19:04 +0100)]
xdot: [nfc] remove useless default extern declaration of functions in xdot.h

2 years agoxdot: use GVDLL instead of _WIN32 to control storage-class attributes in xdot.h
Magnus Jacobsson [Sun, 2 Jan 2022 18:01:59 +0000 (19:01 +0100)]
xdot: use GVDLL instead of _WIN32 to control storage-class attributes in xdot.h

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

2 years agoxdot: [nfc] remove whitespace in preprocessor directives in xdot.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:36:33 +0000 (18:36 +0100)]
xdot: [nfc] remove whitespace in preprocessor directives in xdot.h

2 years agoxdot: MSBuild: define GVDLL to ensure correct storage-class attributes
Magnus Jacobsson [Mon, 3 Jan 2022 06:20:54 +0000 (07:20 +0100)]
xdot: MSBuild: define GVDLL to ensure correct storage-class attributes

An upcoming commit will change the storage-class attributes in
xdot.h to be controlled by the GVDLL symbol.

Without this change, errors like this would occur in lib/gvc:

LINK : fatal error LNK1104: cannot open file 'C:\Users\magja\graphviz\Debug\Graphviz\bin\xdot.lib'
Done building project "gvc.vcxproj" -- FAILED.

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

2 years agoMerge branch 'misc-nfc-unify-storage-class-declarations' into 'main'
Magnus Jacobsson [Mon, 10 Jan 2022 14:01:54 +0000 (14:01 +0000)]
Merge branch 'misc-nfc-unify-storage-class-declarations' into 'main'

Miscellaneous non-functional changes to unify storage class declarations

See merge request graphviz/graphviz!2389

2 years agosfio: [nfc] rename EXTERN macro to SFIO_API in sfio.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:28:39 +0000 (18:28 +0100)]
sfio: [nfc] rename EXTERN macro to SFIO_API in sfio.h

2 years agoortho: [nfc] align storage-class declarations to Graphviz standard in ortho.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:07:18 +0000 (18:07 +0100)]
ortho: [nfc] align storage-class declarations to Graphviz standard in ortho.h

2 years agolib/gvpr: [nfc] remove extra _WIN32 condition to apply storage-class attributes in...
Magnus Jacobsson [Sun, 2 Jan 2022 17:05:36 +0000 (18:05 +0100)]
lib/gvpr: [nfc] remove extra _WIN32 condition to apply storage-class attributes in gvpr.h

This is a non-functional change since this code is guarded with GVDLL
which is only ever defined when _WIN32 is defined.

2 years agolib/gvpr: [nfc] remove whitespace in preprocessor directives in gvpr.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:04:19 +0000 (18:04 +0100)]
lib/gvpr: [nfc] remove whitespace in preprocessor directives in gvpr.h

2 years agogvc: [nfc] remove useless default extern declaration of functions in gvc.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:02:13 +0000 (18:02 +0100)]
gvc: [nfc] remove useless default extern declaration of functions in gvc.h

2 years agoedgepaint: [nfc] align storage-class declarations to Graphviz standard in lab_gamut.h
Magnus Jacobsson [Sun, 2 Jan 2022 16:28:35 +0000 (17:28 +0100)]
edgepaint: [nfc] align storage-class declarations to Graphviz standard in lab_gamut.h

2 years agoedgepaint: [nfc] rename EXTERN macro to LAB_GAMUT_API in lab_gamut.h
Magnus Jacobsson [Sun, 2 Jan 2022 16:26:52 +0000 (17:26 +0100)]
edgepaint: [nfc] rename EXTERN macro to LAB_GAMUT_API in lab_gamut.h

2 years agopathutil: [nfc] remove useless default extern declaration of functions in vis.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:12:32 +0000 (18:12 +0100)]
pathutil: [nfc] remove useless default extern declaration of functions in vis.h

2 years agopathplan: [nfc] remove useless comments in vis.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:11:52 +0000 (18:11 +0100)]
pathplan: [nfc] remove useless comments in vis.h

2 years agopathplan: [nfc] remove useless default extern declaration of functions in pathutil.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:10:26 +0000 (18:10 +0100)]
pathplan: [nfc] remove useless default extern declaration of functions in pathutil.h

2 years agopathplan: [nfc] remove useless comments in pathutil.h
Magnus Jacobsson [Sun, 2 Jan 2022 17:08:29 +0000 (18:08 +0100)]
pathplan: [nfc] remove useless comments in pathutil.h

2 years agopathplan: CMake: [nfc] remove useless definition of _BLD_pathplan
Magnus Jacobsson [Sun, 2 Jan 2022 16:07:13 +0000 (17:07 +0100)]
pathplan: CMake: [nfc] remove useless definition of _BLD_pathplan

This symbol is not used anywhere.

2 years agopathplan: [nfc] remove useless definition of _BLD_pathplan in pathutil.h
Magnus Jacobsson [Sun, 2 Jan 2022 16:07:13 +0000 (17:07 +0100)]
pathplan: [nfc] remove useless definition of _BLD_pathplan in pathutil.h

This symbol is not used anywhere.

2 years agoMerge branch 'fix-mingw-cmake-builds-and-add-tests' into 'main'
Magnus Jacobsson [Mon, 10 Jan 2022 13:02:24 +0000 (13:02 +0000)]
Merge branch 'fix-mingw-cmake-builds-and-add-tests' into 'main'

Fix MinGW CMake builds and add tests

Closes #2176 and #1780

See merge request graphviz/graphviz!2387

2 years agoci: add windows-mingw32-cmake-test job
Magnus Jacobsson [Tue, 4 Jan 2022 14:16:13 +0000 (15:16 +0100)]
ci: add windows-mingw32-cmake-test job

2 years agoci: add windows-mingw64-cmake-test job
Magnus Jacobsson [Tue, 4 Jan 2022 14:16:13 +0000 (15:16 +0100)]
ci: add windows-mingw64-cmake-test job

2 years agoadd ci/mingw-test.sh
Magnus Jacobsson [Thu, 6 Jan 2022 13:39:29 +0000 (14:39 +0100)]
add ci/mingw-test.sh

2 years agoci/mingw-install.sh: install python-pip
Magnus Jacobsson [Tue, 4 Jan 2022 08:01:27 +0000 (09:01 +0100)]
ci/mingw-install.sh: install python-pip

2 years agotest_1408: don't expect failure on MinGW
Magnus Jacobsson [Fri, 7 Jan 2022 14:58:35 +0000 (15:58 +0100)]
test_1408: don't expect failure on MinGW

It's unclear why this test does not fail on MinGW when if fails on
other OSes. The NDEBUG symbols is not defined in MinGW builds and
assertions have been verified to be enabled.

2 years agogvtest.py: correct compiler used on MinGW
Magnus Jacobsson [Tue, 4 Jan 2022 09:37:12 +0000 (10:37 +0100)]
gvtest.py: correct compiler used on MinGW

2 years agoCMake: ensure PangoCairo is found on MinGW
Magnus Jacobsson [Sun, 9 Jan 2022 11:28:42 +0000 (12:28 +0100)]
CMake: ensure PangoCairo is found on MinGW

This makes the PNG format available in CMake builds with MinGW.

2 years agoCMake: ensure Cairo is found on MinGW
Magnus Jacobsson [Fri, 7 Jan 2022 19:17:49 +0000 (20:17 +0100)]
CMake: ensure Cairo is found on MinGW

2 years agoplugin/pango: print font map when verbose for all platforms
Magnus Jacobsson [Fri, 7 Jan 2022 21:42:20 +0000 (22:42 +0100)]
plugin/pango: print font map when verbose for all platforms

This effectively reverts commit
2029d4bf76360aba04a0ca779058caba7682e1e9.

Fixes this error with CMake on MinGW when compiled with -Werror:

C:/Users/magja/graphviz/plugin/pango/gvgetfontlist_pango.c:477:1: error: 'printFontMap' defined but not used [-Werror=unused-function]
  477 | printFontMap (gv_font_map*gv_fmap, int sz)
      | ^~~~~~~~~~~~

2 years agoplugin/pango: include common/globals.h in gvgetfontlist_pango.c
Magnus Jacobsson [Sat, 8 Jan 2022 07:51:36 +0000 (08:51 +0100)]
plugin/pango: include common/globals.h in gvgetfontlist_pango.c

An upcoming commit which enables code that uses the Verbose global
variable would otherwise cause this error:

gvgetfontlist_pango.obj : error LNK2019: unresolved external symbol _Verbose referenced in function _get_font_mapping [C:\GitLab-Runner\builds\magjac\graphviz\build\plugin\pango\gvplugin_pango.vcxproj]
C:\GitLab-Runner\builds\magjac\graphviz\build\plugin\pango\Release\gvplugin_pango.dll : fatal error LNK1120: 1 unresolved externals [C:\GitLab-Runner\builds\magjac\graphviz\build\plugin\pango\gvplugin_pango.vcxproj]

2 years agoplugin/pango: MSBuild: define GVDLL to ensure correct storage-class attributes
Magnus Jacobsson [Sat, 8 Jan 2022 09:43:36 +0000 (10:43 +0100)]
plugin/pango: MSBuild: define GVDLL to ensure correct storage-class attributes

An upcoming commit which enables code that uses the Verbose global
variable would otherwise cause this error:

gvgetfontlist_pango.obj : error LNK2001: unresolved external symbol _Verbose

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

2 years agogvpr: correct fix for absolute paths to work also on MinGW
Magnus Jacobsson [Fri, 7 Jan 2022 13:03:00 +0000 (14:03 +0100)]
gvpr: correct fix for absolute paths to work also on MinGW

Fixes https://gitlab.com/graphviz/graphviz/-/issues/1780 on MinGW.

Without this fix, test_1780 fails:

__________________________________ test_1780 __________________________________
Traceback (most recent call last):
  File "C:/Users/magja/graphviz2/rtest/test_regression.py", line 594, in test_1780
    subprocess.check_call(["gvpr", "-f", clustg], stdin=subprocess.DEVNULL)
  File "C:/tools/msys64/mingw64/lib/python3.9/subprocess.py", line 373, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['gvpr', '-f', WindowsPath('C:/Users/magja/graphviz2/cmd/gvpr/lib/clustg')]' returned non-zero exit status 4294967295.
---------------------------- Captured stderr call -----------------------------
gvpr: gvpr
Usage: gvpr gvpr

2 years agoplugin/pango: work around CMake not generating DLLs with version numbers on MinGW
Magnus Jacobsson [Sun, 9 Jan 2022 10:14:48 +0000 (11:14 +0100)]
plugin/pango: work around CMake not generating DLLs with version numbers on MinGW

Fixes https://gitlab.com/graphviz/graphviz/-/issues/2176.

2 years agoplugin/neato_layout: work around CMake not generating DLLs with version numbers on...
Magnus Jacobsson [Sun, 9 Jan 2022 10:14:48 +0000 (11:14 +0100)]
plugin/neato_layout: work around CMake not generating DLLs with version numbers on MinGW

Towards https://gitlab.com/graphviz/graphviz/-/issues/2176.

2 years agoplugin/gdiplus: work around CMake not generating DLLs with version numbers on MinGW
Magnus Jacobsson [Sun, 9 Jan 2022 10:14:48 +0000 (11:14 +0100)]
plugin/gdiplus: work around CMake not generating DLLs with version numbers on MinGW

Towards https://gitlab.com/graphviz/graphviz/-/issues/2176.

2 years agoplugin/gd: work around CMake not generating DLLs with version numbers on MinGW
Magnus Jacobsson [Sun, 9 Jan 2022 10:14:48 +0000 (11:14 +0100)]
plugin/gd: work around CMake not generating DLLs with version numbers on MinGW

Towards https://gitlab.com/graphviz/graphviz/-/issues/2176.

2 years agoplugin/dot_layout: work around CMake not generating DLLs with version numbers on...
Magnus Jacobsson [Sun, 9 Jan 2022 10:14:48 +0000 (11:14 +0100)]
plugin/dot_layout: work around CMake not generating DLLs with version numbers on MinGW

Towards https://gitlab.com/graphviz/graphviz/-/issues/2176.

2 years agoplugin/core: work around CMake not generating DLLs with version numbers on MinGW
Magnus Jacobsson [Sun, 9 Jan 2022 10:14:48 +0000 (11:14 +0100)]
plugin/core: work around CMake not generating DLLs with version numbers on MinGW

Towards https://gitlab.com/graphviz/graphviz/-/issues/2176.

2 years agoCMake: detect "dot -c" failure when running cpack
Magnus Jacobsson [Tue, 4 Jan 2022 08:02:35 +0000 (09:02 +0100)]
CMake: detect "dot -c" failure when running cpack

This reveals this error when "dot -c" is executed when running cpack
on MinGW:

CPack: Create package using ZIP
CPack: Install projects
CPack: - Install project: Graphviz []
CMake Error at C:/Users/magja/graphviz2/cmake/configure_plugins.cmake:38 (execute_process):
  execute_process abnormal exit: Access violation
Call Stack (most recent call first):
  C:/Users/magja/graphviz2/build/cmd/dot/cmake_install.cmake:91 (include)
  C:/Users/magja/graphviz2/build/cmd/cmake_install.cmake:42 (include)
  C:/Users/magja/graphviz2/build/cmake_install.cmake:60 (include)

CPack Error: Error when generating package: Graphviz

See https://gitlab.com/graphviz/graphviz/-/issues/2176.

2 years agoMerge branch 'smattr/B7A7E3A2-8D16-48E6-A2EE-1E56CD300DF2' into 'main'
Matthew Fernandez [Mon, 10 Jan 2022 00:49:12 +0000 (00:49 +0000)]
Merge branch 'smattr/B7A7E3A2-8D16-48E6-A2EE-1E56CD300DF2' into 'main'

delete unused header constants

See merge request graphviz/graphviz!2382

2 years agoAPI BREAK: remove unused '_DUMMY_ELEM'
Matthew Fernandez [Sat, 8 Jan 2022 02:01:11 +0000 (18:01 -0800)]
API BREAK: remove unused '_DUMMY_ELEM'

ISO C99 and C++11 both permit trailing commas in enum members. Graphviz has been
compiled using C99 since fe3f9411d2c59b463ab1b64eecfd19f2db55d2fc and C++11
since a74e0e104e114bcf890eb8419a0bf02a22e01d84. This wart was not removed
previously as removing it was considered an API break not worth doing. The
upcoming release is projected to bump the major version number, making breaks
like this more acceptable.

2 years agoAPI BREAK: remove unused 'MAXSHORT' definition
Matthew Fernandez [Sat, 8 Jan 2022 01:49:56 +0000 (17:49 -0800)]
API BREAK: remove unused 'MAXSHORT' definition

The last use of this was removed in 580fa88477fa59aca01e405c986c686ceee21b5f.
But its definition was retained in this header as removing it was considered an
API break not worth causing. The upcoming release is projected to bump the major
version number, so we can now remove it.

2 years agoAPI BREAK: remove local 'INT_MAX' and 'INT_MIN' definitions
Matthew Fernandez [Sat, 8 Jan 2022 01:40:03 +0000 (17:40 -0800)]
API BREAK: remove local 'INT_MAX' and 'INT_MIN' definitions

These constants are defined in ISO C to be available in limits.h, but were
commonly available pre-ISO C too. These definitions remained here for legacy
reasons, because removing them was considered an API break and not worth doing
for this minor clean up. However the upcoming release is projected to involve a
major version number bump.

2 years agoMerge branch 'unify-storage-class-declarations-in-common' into 'main'
Magnus Jacobsson [Sun, 9 Jan 2022 20:45:26 +0000 (20:45 +0000)]
Merge branch 'unify-storage-class-declarations-in-common' into 'main'

Unify storage-class declarations in common headers with Graphviz standard

See merge request graphviz/graphviz!2386

2 years agocommon: [nfc] remove useless default extern declaration of functions in memory.h
Magnus Jacobsson [Sun, 2 Jan 2022 09:59:00 +0000 (10:59 +0100)]
common: [nfc] remove useless default extern declaration of functions in memory.h

2 years agoplugin/visio: use only the GVDLL symbol enable storage-class attributes in gvplugin_v...
Magnus Jacobsson [Sun, 2 Jan 2022 11:47:45 +0000 (12:47 +0100)]
plugin/visio: use only the GVDLL symbol enable storage-class attributes in gvplugin_visio.c

Anything that depends on storage-class attributes already define both
GVC_EXPORTS and WIN32_DLL.

2 years agoMSBuild: remove now obsolete definition of WIN32_DLL from all project files
Magnus Jacobsson [Sun, 2 Jan 2022 15:48:14 +0000 (16:48 +0100)]
MSBuild: remove now obsolete definition of WIN32_DLL from all project files

2 years agopack: autotools: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:36:20 +0000 (16:36 +0100)]
pack: autotools: remove now obsolete definition of _BLD_gvc

2 years agopack: CMake: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:36:06 +0000 (16:36 +0100)]
pack: CMake: remove now obsolete definition of _BLD_gvc

2 years agoortho: autotools: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:35:55 +0000 (16:35 +0100)]
ortho: autotools: remove now obsolete definition of _BLD_gvc

2 years agoortho: CMake: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:35:42 +0000 (16:35 +0100)]
ortho: CMake: remove now obsolete definition of _BLD_gvc

2 years agogvc: autotools: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:35:27 +0000 (16:35 +0100)]
gvc: autotools: remove now obsolete definition of _BLD_gvc

2 years agogvc: CMake: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:35:11 +0000 (16:35 +0100)]
gvc: CMake: remove now obsolete definition of _BLD_gvc

2 years agocommon: autotools: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:34:57 +0000 (16:34 +0100)]
common: autotools: remove now obsolete definition of _BLD_gvc

2 years agocommon: CMake: remove now obsolete definition of _BLD_gvc
Magnus Jacobsson [Sun, 2 Jan 2022 15:34:42 +0000 (16:34 +0100)]
common: CMake: remove now obsolete definition of _BLD_gvc

2 years agogvc: remove useless definition of _BLD_gvc in gvusershape.c
Magnus Jacobsson [Sun, 2 Jan 2022 15:31:16 +0000 (16:31 +0100)]
gvc: remove useless definition of _BLD_gvc in gvusershape.c

This symbols is already defined by all build systems that depend on
it.

2 years agocommon: use only GVC_EXPORTS to control storage-class attributes in global.h
Magnus Jacobsson [Sun, 2 Jan 2022 15:22:28 +0000 (16:22 +0100)]
common: use only GVC_EXPORTS to control storage-class attributes in global.h

Anything that depends on storage-class attributes already define both
GVC_EXPORTS and _BLD_gvc.

2 years agocommon: use only the GVDLL symbol enable storage-class attributes in global.h
Magnus Jacobsson [Sun, 2 Jan 2022 11:47:45 +0000 (12:47 +0100)]
common: use only the GVDLL symbol enable storage-class attributes in global.h

Anything that depends on storage-class attributes already define both
GVC_EXPORTS and WIN32_DLL.

2 years agoosage: MSBuild: define GVDLL to ensure correct storage-class attributes
Magnus Jacobsson [Sun, 2 Jan 2022 13:08:50 +0000 (14:08 +0100)]
osage: MSBuild: define GVDLL to ensure correct storage-class attributes

An upcoming commit will change the storage-class attributes in
globals.h to be controlled only by the GVDLL symbol, not also by the
WIN32_DLL symbol.

Without this change, errors like this would occur:

osage.lib(osageinit.obj) : error LNK2001: unresolved external symbol _Ndim

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

2 years agopatchwork: MSBuild: define GVDLL to ensure correct storage-class attributes
Magnus Jacobsson [Sun, 2 Jan 2022 13:08:50 +0000 (14:08 +0100)]
patchwork: MSBuild: define GVDLL to ensure correct storage-class attributes

An upcoming commit will change the storage-class attributes in
globals.h to be controlled only by the GVDLL symbol, not also by the
WIN32_DLL symbol.

Without this change, errors like this would occur:

patchwork.lib(patchworkinit.obj) : error LNK2001: unresolved external symbol _Ndim

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

2 years agotwopigen: MSBuild: define GVDLL to ensure correct storage-class attributes
Magnus Jacobsson [Sun, 2 Jan 2022 13:08:50 +0000 (14:08 +0100)]
twopigen: MSBuild: define GVDLL to ensure correct storage-class attributes

An upcoming commit will change the storage-class attributes in
globals.h to be controlled only by the GVDLL symbol, not also by the
WIN32_DLL symbol.

Without this change, errors like this would occur:

twopigen.lib(twopiinit.obj) : error LNK2001: unresolved external symbol _Ndim

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

2 years agosfdp: MSBuild: define GVDLL to ensure correct storage-class attributes
Magnus Jacobsson [Sun, 2 Jan 2022 10:31:27 +0000 (11:31 +0100)]
sfdp: MSBuild: define GVDLL to ensure correct storage-class attributes

An upcoming commit will change the storage-class attributes in
globals.h to be controlled only by the GVDLL symbol, not also by the
WIN32_DLL symbol.

Without this change, errors like this would occur:

sfdp.lib(spring_electrical.obj) : error LNK2001: unresolved external symbol _Verbose

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

2 years agocommon: [nfc] rename DECLSPEC macro to GLOBALS_API in globals.h
Magnus Jacobsson [Sun, 2 Jan 2022 10:02:42 +0000 (11:02 +0100)]
common: [nfc] rename DECLSPEC macro to GLOBALS_API in globals.h

2 years agocommon: [nfc] remove useless default extern declaration of functions in geomprocs.h
Magnus Jacobsson [Sun, 2 Jan 2022 09:59:00 +0000 (10:59 +0100)]
common: [nfc] remove useless default extern declaration of functions in geomprocs.h

2 years agoMerge branch 'smattr/046089E8-9134-4984-9478-E5E84A0C637F' into 'main'
Matthew Fernandez [Sun, 9 Jan 2022 18:37:48 +0000 (18:37 +0000)]
Merge branch 'smattr/046089E8-9134-4984-9478-E5E84A0C637F' into 'main'

CI: stop installing a custom Python on CentOS 7

See merge request graphviz/graphviz!2385

2 years agoCI: stop installing a custom Python on CentOS 7
Matthew Fernandez [Sun, 9 Jan 2022 01:47:14 +0000 (17:47 -0800)]
CI: stop installing a custom Python on CentOS 7

It is not clear to me why this was pulling in a custom Python 3.6 when Python
3.6 is in the default repositories on CentOS 7. It is possible it was not
packaged there at the time this Dockerfile was written.

3 years agoMerge branch 'install-msys2-from-msys2.org' into 'main'
Magnus Jacobsson [Sun, 9 Jan 2022 16:11:44 +0000 (16:11 +0000)]
Merge branch 'install-msys2-from-msys2.org' into 'main'

CI: install msys2 from msys2.org instead of with choco

See merge request graphviz/graphviz!2375

3 years agoci: install msys2 from msys2.org instead of with choco
Magnus Jacobsson [Sat, 1 Jan 2022 13:07:50 +0000 (14:07 +0100)]
ci: install msys2 from msys2.org instead of with choco

3 years agoMerge branch 'unify-storage-class-declarations-in-cgraph' into 'main'
Magnus Jacobsson [Sun, 9 Jan 2022 09:40:57 +0000 (09:40 +0000)]
Merge branch 'unify-storage-class-declarations-in-cgraph' into 'main'

Unify storage-class declarations in cgraph headers with Graphviz standard

See merge request graphviz/graphviz!2380

3 years agoadd a CHANGELOG entry for the breaking GVDLL change in cgraph.h
Magnus Jacobsson [Fri, 7 Jan 2022 11:49:45 +0000 (12:49 +0100)]
add a CHANGELOG entry for the breaking GVDLL change in cgraph.h

3 years agocgraph: [nfc] align storage-class declarations to Graphviz standard in sprint.h
Magnus Jacobsson [Sun, 2 Jan 2022 09:54:59 +0000 (10:54 +0100)]
cgraph: [nfc] align storage-class declarations to Graphviz standard in sprint.h

3 years agocgraph: [nfc] rename DECLSPEC macro to SPRINT_API
Magnus Jacobsson [Sun, 2 Jan 2022 09:54:00 +0000 (10:54 +0100)]
cgraph: [nfc] rename DECLSPEC macro to SPRINT_API

3 years agocgraph: use GVDLL instead of _WIN32 to control storage-class attributes in csprint.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:30:02 +0000 (17:30 +0100)]
cgraph: use GVDLL instead of _WIN32 to control storage-class attributes in csprint.h

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

3 years agocgraph: [nfc] align storage-class declarations to Graphviz standard in cgraph.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:30:38 +0000 (17:30 +0100)]
cgraph: [nfc] align storage-class declarations to Graphviz standard in cgraph.h

3 years agocgraph: use GVDLL instead of _WIN32 to control storage-class attributes in cgraph.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:30:02 +0000 (17:30 +0100)]
cgraph: use GVDLL instead of _WIN32 to control storage-class attributes in cgraph.h

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

3 years agocgraph: [nfc] remove whitespace in preprocessor directives in cgraph.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:29:37 +0000 (17:29 +0100)]
cgraph: [nfc] remove whitespace in preprocessor directives in cgraph.h

3 years agocgraph: [nfc] align storage-class declarations to Graphviz standard in cghdr.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:25:54 +0000 (17:25 +0100)]
cgraph: [nfc] align storage-class declarations to Graphviz standard in cghdr.h

3 years agocgraph: [nfc] remove useless default extern declaration of functions in cghdr.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:25:02 +0000 (17:25 +0100)]
cgraph: [nfc] remove useless default extern declaration of functions in cghdr.h

3 years agocgraph: use GVDLL instead of _WIN32 to control storage-class attributes in cghdr.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:23:53 +0000 (17:23 +0100)]
cgraph: use GVDLL instead of _WIN32 to control storage-class attributes in cghdr.h

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

3 years agocgraph: [nfc] remove whitespace in preprocessor directives in cghdr.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:23:08 +0000 (17:23 +0100)]
cgraph: [nfc] remove whitespace in preprocessor directives in cghdr.h

3 years agocgraph: remove useless definition of _BLD_cgraph in cghdr.h
Magnus Jacobsson [Sun, 2 Jan 2022 16:07:13 +0000 (17:07 +0100)]
cgraph: remove useless definition of _BLD_cgraph in cghdr.h

This symbol is not used anywhere.

3 years agocgraph: move include of config.h to before defining storage-class attributes in cghdr.h
Magnus Jacobsson [Sun, 2 Jan 2022 09:21:35 +0000 (10:21 +0100)]
cgraph: move include of config.h to before defining storage-class attributes in cghdr.h

The GVDLL symbol is defined in config.h for autotools builds and an
upcoming commit which changes cghdr.h to use GVDLL to control the
storage-class attribute declarations would otherwise cause errors like
this:

C:\Users\magja\graphviz\cmd\tools/gc.c:333: undefined reference to `__imp_agapply'

Towards https://gitlab.com/graphviz/graphviz/-/issues/2173.

3 years agocgraph: [nfc] align storage-class declarations to Graphviz standard in agxbuf.h
Magnus Jacobsson [Sat, 1 Jan 2022 16:00:03 +0000 (17:00 +0100)]
cgraph: [nfc] align storage-class declarations to Graphviz standard in agxbuf.h

3 years agocgraph: [nfc] remove useless default extern declaration of functions in agxbuf.h
Magnus Jacobsson [Sat, 1 Jan 2022 15:58:43 +0000 (16:58 +0100)]
cgraph: [nfc] remove useless default extern declaration of functions in agxbuf.h