]> granicus.if.org Git - graphviz/log
graphviz
3 years agoremove remaining Vim modeline comments
Matthew Fernandez [Wed, 17 Feb 2021 01:06:33 +0000 (17:06 -0800)]
remove remaining Vim modeline comments

These have no effect in non-Vim editors or for Vim users that have modeline
disabled. A more modern way to achieve this is clang-format. This commit was
achieved with

  $ find . -type f \( -iname "*.cs" -or -iname "*.y" -or -iname "*.l" -or \
    -iname "*.m" -or -iname "*.c" -or -iname Makeile.am -or -iname "*.cpp" -or \
    -iname "*.h" \) -exec sed -i '' -e ':a' -e 'N' -e '$!ba' -e \
    's/\/\* vim:set [^\n]*\n\n//g' "{}" \;

and then manually collecting some further ones that were missing by this filter.

3 years agoMerge branch 'jarrodmillman:changelog-typo'
Matthew Fernandez [Tue, 23 Feb 2021 01:01:45 +0000 (17:01 -0800)]
Merge branch 'jarrodmillman:changelog-typo'

3 years agoFix release typo
Jarrod Millman [Mon, 22 Feb 2021 18:56:39 +0000 (10:56 -0800)]
Fix release typo

3 years agoMerge branch 'ci5' into 'master'
Mark Hansen [Mon, 22 Feb 2021 21:14:09 +0000 (21:14 +0000)]
Merge branch 'ci5' into 'master'

Revert "Revert "Only run macOS CI on graphviz/graphviz repo""

See merge request graphviz/graphviz!1792

3 years agoRevert "Revert "Only run macOS CI on graphviz/graphviz repo""
Mark Hansen [Mon, 22 Feb 2021 09:33:10 +0000 (20:33 +1100)]
Revert "Revert "Only run macOS CI on graphviz/graphviz repo""

This reverts commit 77c3b048f198798791193a028a77bf903a5b325e.

And replaces the variable with something that doesn't sound like a
GitLab predefined environment variable, to avoid surprise.

Towards #1951

https://docs.gitlab.com/ee/ci/variables/predefined_variables.html

3 years agoMerge branch 'smattr/37F06C45-6BC7-4617-AA19-99B187958B1C' into 'master'
Matthew Fernandez [Sun, 21 Feb 2021 18:06:42 +0000 (18:06 +0000)]
Merge branch 'smattr/37F06C45-6BC7-4617-AA19-99B187958B1C' into 'master'

remove a useless conditional #include block

See merge request graphviz/graphviz!1759

3 years agoremove a useless conditional #include block
Matthew Fernandez [Fri, 12 Feb 2021 01:17:39 +0000 (17:17 -0800)]
remove a useless conditional #include block

3 years agoMerge branch 'smattr/c92aba1c-f53c-429e-acfd-8c323bdc0654' into 'master'
Matthew Fernandez [Sun, 21 Feb 2021 00:55:32 +0000 (00:55 +0000)]
Merge branch 'smattr/c92aba1c-f53c-429e-acfd-8c323bdc0654' into 'master'

some clean up of JSON back end

See merge request graphviz/graphviz!1756

3 years agosquash some -Wunused-parameter warnings
Matthew Fernandez [Sun, 14 Feb 2021 19:50:08 +0000 (11:50 -0800)]
squash some -Wunused-parameter warnings

3 years agoabbreviate some code for comma-separated JSON
Matthew Fernandez [Sun, 14 Feb 2021 19:48:44 +0000 (11:48 -0800)]
abbreviate some code for comma-separated JSON

3 years agoremove some unnecessary bracketing
Matthew Fernandez [Sun, 14 Feb 2021 19:48:19 +0000 (11:48 -0800)]
remove some unnecessary bracketing

3 years agoremove commented out alternate write_subgs implementation
Matthew Fernandez [Sun, 14 Feb 2021 19:30:59 +0000 (11:30 -0800)]
remove commented out alternate write_subgs implementation

3 years agoMerge branch 'smattr/65a6d0ab-fc93-4d90-8a02-286d0922e43f' into 'master'
Matthew Fernandez [Sun, 21 Feb 2021 00:19:04 +0000 (00:19 +0000)]
Merge branch 'smattr/65a6d0ab-fc93-4d90-8a02-286d0922e43f' into 'master'

remove regex usage and associated RxSpencer dependency

Closes #1919

See merge request graphviz/graphviz!1757

3 years agoremove RxSpencer dependency
Matthew Fernandez [Sun, 14 Feb 2021 18:43:17 +0000 (10:43 -0800)]
remove RxSpencer dependency

Closes #1919.

3 years agoremove use of regex in smyrna
Matthew Fernandez [Sun, 14 Feb 2021 18:40:12 +0000 (10:40 -0800)]
remove use of regex in smyrna

This "regex" was only ever used to match literals like "R" and the empty string.
Related to #1919.

3 years agoremove unused smyrna file
Matthew Fernandez [Sun, 14 Feb 2021 18:31:14 +0000 (10:31 -0800)]
remove unused smyrna file

3 years agoremove use of regex for parsing SVG attributes
Matthew Fernandez [Sun, 14 Feb 2021 18:27:02 +0000 (10:27 -0800)]
remove use of regex for parsing SVG attributes

Related to #1919.

3 years agoadd a test of user shapes
Matthew Fernandez [Sun, 14 Feb 2021 17:43:25 +0000 (09:43 -0800)]
add a test of user shapes

3 years agoMerge branch 'smattr/005D38E6-E842-4522-B368-616652003649' into 'master'
Matthew Fernandez [Sat, 20 Feb 2021 23:41:55 +0000 (23:41 +0000)]
Merge branch 'smattr/005D38E6-E842-4522-B368-616652003649' into 'master'

fix HTML validation errors

Closes #1861

See merge request graphviz/graphviz!1758

3 years agofix HTML validation errors in graphviz.html
Matthew Fernandez [Sun, 14 Feb 2021 22:05:19 +0000 (14:05 -0800)]
fix HTML validation errors in graphviz.html

Fixes #1861.

3 years agofix HTML validation errors in types.html
Matthew Fernandez [Sun, 14 Feb 2021 22:02:41 +0000 (14:02 -0800)]
fix HTML validation errors in types.html

Related to #1861.

3 years agofit HTML validation errors in internal_todo.html
Matthew Fernandez [Sun, 14 Feb 2021 21:38:47 +0000 (13:38 -0800)]
fit HTML validation errors in internal_todo.html

Related to #1861.

3 years agofix validation error in shapes.html
Matthew Fernandez [Sun, 14 Feb 2021 21:37:06 +0000 (13:37 -0800)]
fix validation error in shapes.html

Related to #1861.

3 years agoremove use of XMP tags in HTML
Matthew Fernandez [Sun, 14 Feb 2021 21:26:49 +0000 (13:26 -0800)]
remove use of XMP tags in HTML

The XMP tag was deprecated for PRE [0]. Related to #1861.

  [0]: https://html.spec.whatwg.org/multipage/obsolete.html#non-conforming-features

3 years agofix invalid HTML in colors.html
Matthew Fernandez [Sun, 14 Feb 2021 21:14:08 +0000 (13:14 -0800)]
fix invalid HTML in colors.html

Related to #1861.

3 years agoMerge branch 'smattr/def8873c-a3d8-4ea5-bf26-094a7b2f1f5c' into 'master'
Matthew Fernandez [Sat, 20 Feb 2021 23:05:50 +0000 (23:05 +0000)]
Merge branch 'smattr/def8873c-a3d8-4ea5-bf26-094a7b2f1f5c' into 'master'

remove use of NiL in favor of NULL, and some other clean up

See merge request graphviz/graphviz!1755

3 years agosilence some -Wimplicit-fallthrough warnings
Matthew Fernandez [Sun, 14 Feb 2021 17:03:17 +0000 (09:03 -0800)]
silence some -Wimplicit-fallthrough warnings

3 years agoremove NiL and use the standard library's NULL
Matthew Fernandez [Sun, 14 Feb 2021 16:56:05 +0000 (08:56 -0800)]
remove NiL and use the standard library's NULL

There's no need for us to roll our own NULL substitute.

3 years agoremove commented out exconvert()
Matthew Fernandez [Sun, 14 Feb 2021 16:51:20 +0000 (08:51 -0800)]
remove commented out exconvert()

3 years agoMerge branch 'ci5' into 'master'
Mark Hansen [Sat, 20 Feb 2021 22:28:41 +0000 (22:28 +0000)]
Merge branch 'ci5' into 'master'

Revert "Only run macOS CI on graphviz/graphviz repo"

See merge request graphviz/graphviz!1785

3 years agoRevert "Only run macOS CI on graphviz/graphviz repo"
Mark Hansen [Sat, 20 Feb 2021 22:07:19 +0000 (09:07 +1100)]
Revert "Only run macOS CI on graphviz/graphviz repo"

This reverts commit 5052447d34a37421282b8eb5a9677097518b86b7.

3 years agoMerge branch 'smattr/08168fc6-58f9-44ca-845e-9d35bd3b7699' into 'master'
Matthew Fernandez [Sat, 20 Feb 2021 16:29:21 +0000 (16:29 +0000)]
Merge branch 'smattr/08168fc6-58f9-44ca-845e-9d35bd3b7699' into 'master'

clean up and bug fixes in libmingle

Closes #1938

See merge request graphviz/graphviz!1754

3 years agoremove useless comment
Matthew Fernandez [Sun, 14 Feb 2021 06:24:06 +0000 (22:24 -0800)]
remove useless comment

3 years agoreplace header guards in mingle with more modern #pragma once
Matthew Fernandez [Sun, 14 Feb 2021 06:14:12 +0000 (22:14 -0800)]
replace header guards in mingle with more modern #pragma once

3 years agofix memory leak in ANN bridge
Matthew Fernandez [Sun, 14 Feb 2021 06:08:22 +0000 (22:08 -0800)]
fix memory leak in ANN bridge

3 years agopush some definitions closer to where they are used
Matthew Fernandez [Sun, 14 Feb 2021 06:02:54 +0000 (22:02 -0800)]
push some definitions closer to where they are used

3 years agocondense and simplify sorting code in ANN bridge
Matthew Fernandez [Sun, 14 Feb 2021 05:56:05 +0000 (21:56 -0800)]
condense and simplify sorting code in ANN bridge

Related to #1938.

3 years agoremove useless inner loop in ANN bridge
Matthew Fernandez [Sun, 14 Feb 2021 05:38:09 +0000 (21:38 -0800)]
remove useless inner loop in ANN bridge

Iterations after the first pass were no-ops. Closes #1938.

3 years agomark dimension as a constant in ANN bridge
Matthew Fernandez [Sun, 14 Feb 2021 05:36:37 +0000 (21:36 -0800)]
mark dimension as a constant in ANN bridge

Related to #1938.

3 years agoremove unnecessary cast
Matthew Fernandez [Sun, 14 Feb 2021 05:33:19 +0000 (21:33 -0800)]
remove unnecessary cast

3 years agoremove the ability to pass a dimension to ANN code
Matthew Fernandez [Sun, 14 Feb 2021 05:32:00 +0000 (21:32 -0800)]
remove the ability to pass a dimension to ANN code

Internally this assumed dim == 4, so passing in a different value would result
in incorrect answers. Related to #1938.

3 years ago#include nearest_neighbor_graph_ann.h to avoid duplicating a prototype
Matthew Fernandez [Sun, 14 Feb 2021 05:24:09 +0000 (21:24 -0800)]
#include nearest_neighbor_graph_ann.h to avoid duplicating a prototype

3 years agomake nearest_neighbor_graph_ann.h #includable from C++
Matthew Fernandez [Sun, 14 Feb 2021 05:20:25 +0000 (21:20 -0800)]
make nearest_neighbor_graph_ann.h #includable from C++

3 years agoMerge branch 'ci5' into 'master'
Mark Hansen [Sat, 20 Feb 2021 07:59:25 +0000 (07:59 +0000)]
Merge branch 'ci5' into 'master'

Only run macOS CI on graphviz/graphviz repo

Closes #1951

See merge request graphviz/graphviz!1783

3 years agoOnly run macOS CI on graphviz/graphviz repo
Mark Hansen [Sat, 20 Feb 2021 07:35:19 +0000 (18:35 +1100)]
Only run macOS CI on graphviz/graphviz repo

Don't run on forks, which generally don't have access to macOS runners.

Fixes #1951

3 years agoMerge branch 'smoosh4' into 'master'
Mark Hansen [Sat, 20 Feb 2021 07:22:18 +0000 (07:22 +0000)]
Merge branch 'smoosh4' into 'master'

Don't checkout the source code for docker push

See merge request graphviz/graphviz!1782

3 years agoMerge branch 'smoosh3' into 'master'
Mark Hansen [Sat, 20 Feb 2021 07:08:40 +0000 (07:08 +0000)]
Merge branch 'smoosh3' into 'master'

Start building portable source ASAP

See merge request graphviz/graphviz!1781

3 years agoDon't checkout the source code for docker push
Mark Hansen [Sat, 20 Feb 2021 07:07:12 +0000 (18:07 +1100)]
Don't checkout the source code for docker push

It's not used and not needed.

This might speed up the CI a little.

Based off
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/

3 years agoMerge branch 'master' into 'master'
Mark Hansen [Sat, 20 Feb 2021 06:41:26 +0000 (06:41 +0000)]
Merge branch 'master' into 'master'

Fix docker push live step

See merge request graphviz/graphviz!1780

3 years agoStart building portable source ASAP
Mark Hansen [Sat, 20 Feb 2021 06:36:30 +0000 (17:36 +1100)]
Start building portable source ASAP

portable source doesn't need to depend on all previous stages, just the
building of ubuntu 18.04 image

3 years agoMerge branch 'master' into 'master'
Mark Hansen [Sat, 20 Feb 2021 06:18:40 +0000 (06:18 +0000)]
Merge branch 'master' into 'master'

Allow testing docker_push step in my own repo

See merge request graphviz/graphviz!1778

3 years agoFix docker push live step
Mark Hansen [Sat, 20 Feb 2021 06:17:34 +0000 (17:17 +1100)]
Fix docker push live step

Was getting error

```
/bin/bash: line 118: docker: command not found
```

3 years agoAllow testing docker_push step in my own repo
Mark Hansen [Sat, 20 Feb 2021 06:05:37 +0000 (17:05 +1100)]
Allow testing docker_push step in my own repo

With my own container registry

Before, I mistakenly thought that merge requests ran with the
credentials of graphviz/graphviz, now I see they only run with the
credentials of the source repo (markhnsn/graphviz). So it's safe to run
this on any master branch, even forks.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 06:04:45 +0000 (06:04 +0000)]
Merge branch 'smoosh' into 'master'

docker: Split building SHA and pushing to :latest

See merge request graphviz/graphviz!1776

3 years agodocker: Split building SHA and pushing to :latest
Mark Hansen [Sat, 20 Feb 2021 05:29:12 +0000 (16:29 +1100)]
docker: Split building SHA and pushing to :latest

Previously, we guarded the :latest tag by limiting it to master only,
not merge requests.

Now we need to split this:
- it's safe for merge requests to push to their own SHA, nobody else is
  using that SHA
- the merge request tests assume that a docker image is tagged with a
  SHA, so the merge request tests require the docker_build step to run.

I'm a bit disappointed I couldn't get this to work in a single step
(hence the undesirable duplication) -- perhaps there's a way to lock
down :latest within a single CI job that I'm missing?

This commit is loosely based off
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 04:45:37 +0000 (04:45 +0000)]
Merge branch 'smoosh' into 'master'

Bugfix: invalid spec

See merge request graphviz/graphviz!1775

3 years agoBugfix: invalid spec
Mark Hansen [Sat, 20 Feb 2021 04:44:37 +0000 (15:44 +1100)]
Bugfix: invalid spec

Forgot to capitalize this

Caused:
ERROR: Preparation failed: failed to pull image
"registry.gitlab.com/graphviz/graphviz/:8437020a9de5bbd812cdc4cb09c94c349366631c"
with specified policies [always]: invalid reference format
(manager.go:205:0s)

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 04:34:28 +0000 (04:34 +0000)]
Merge branch 'smoosh' into 'master'

Stop pushing to deprecated per-image tags

See merge request graphviz/graphviz!1774

3 years agoStop pushing to deprecated per-image tags
Mark Hansen [Sat, 20 Feb 2021 04:33:13 +0000 (15:33 +1100)]
Stop pushing to deprecated per-image tags

The tests are now all using separate images rather than tags on the one
image.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 04:25:33 +0000 (04:25 +0000)]
Merge branch 'smoosh' into 'master'

Use Git SHAs fetching build and test docker images

See merge request graphviz/graphviz!1773

3 years agoUse Git SHAs fetching build and test docker images
Mark Hansen [Sat, 20 Feb 2021 04:24:02 +0000 (15:24 +1100)]
Use Git SHAs fetching build and test docker images

Should fix a race condition on the :latest label

Took the chance to do a bit of deduplication. Not sure if I love the
result, but it does mean there's one place to edit for the schema of the
docker label to use.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 04:12:20 +0000 (04:12 +0000)]
Merge branch 'smoosh' into 'master'

Bugfix: should have been /$IMAGE:latest

See merge request graphviz/graphviz!1772

3 years agoBugfix: should have been /$IMAGE:latest
Mark Hansen [Sat, 20 Feb 2021 04:11:37 +0000 (15:11 +1100)]
Bugfix: should have been /$IMAGE:latest

This was pushing all the different OS images to the top-level
graphviz/graphviz:latest package before.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 04:11:08 +0000 (04:11 +0000)]
Merge branch 'smoosh' into 'master'

No-op: Use CI_IMAGE_REGISTRY variable

See merge request graphviz/graphviz!1771

3 years agoNo-op: Use CI_IMAGE_REGISTRY variable
Mark Hansen [Sat, 20 Feb 2021 04:10:32 +0000 (15:10 +1100)]
No-op: Use CI_IMAGE_REGISTRY variable

Reduces some typing. Expands to the same thing.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 04:03:25 +0000 (04:03 +0000)]
Merge branch 'smoosh' into 'master'

Reuse docker images where possible

See merge request graphviz/graphviz!1770

3 years agoReuse docker images where possible
Mark Hansen [Sat, 20 Feb 2021 04:01:25 +0000 (15:01 +1100)]
Reuse docker images where possible

Should speed up CI docker image building.

Inspiration from
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 03:58:05 +0000 (03:58 +0000)]
Merge branch 'smoosh' into 'master'

Push Docker images to 'latest' tag too

See merge request graphviz/graphviz!1769

3 years agoPush Docker images to 'latest' tag too
Mark Hansen [Sat, 20 Feb 2021 03:57:16 +0000 (14:57 +1100)]
Push Docker images to 'latest' tag too

We'll use this for caching soon

Inspired by
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 03:51:49 +0000 (03:51 +0000)]
Merge branch 'smoosh' into 'master'

Stop docker complaining about password argument

See merge request graphviz/graphviz!1768

3 years agoStop docker complaining about password argument
Mark Hansen [Sat, 20 Feb 2021 03:50:14 +0000 (14:50 +1100)]
Stop docker complaining about password argument

Fixes this warning:

```
WARNING! Using --password via the CLI is insecure. Use --password-stdin.
```

With thanks to
https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
for the inspiration.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 03:49:50 +0000 (03:49 +0000)]
Merge branch 'smoosh' into 'master'

Fix error: "docker build" requires exactly 1 argument.

See merge request graphviz/graphviz!1767

3 years agoFix error: "docker build" requires exactly 1 argument.
Mark Hansen [Sat, 20 Feb 2021 03:49:13 +0000 (14:49 +1100)]
Fix error: "docker build" requires exactly 1 argument.

Oops, forgot the dot last commit.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 03:45:51 +0000 (03:45 +0000)]
Merge branch 'smoosh' into 'master'

Push to git-SHA Docker image label

See merge request graphviz/graphviz!1766

3 years agoPush to git-SHA Docker image label
Mark Hansen [Sat, 20 Feb 2021 03:44:31 +0000 (14:44 +1100)]
Push to git-SHA Docker image label

Keep the old image labels for backwards compatibility, just for now

Remove the filename scope: I want this to run every time we push, just
for now. We'll make this faster with caching soon.

3 years agoMerge branch 'smoosh' into 'master'
Mark Hansen [Sat, 20 Feb 2021 03:39:12 +0000 (03:39 +0000)]
Merge branch 'smoosh' into 'master'

No-op: consolidate Docker Image building YAML

See merge request graphviz/graphviz!1765

3 years agoNo-op: consolidate Docker Image building YAML
Mark Hansen [Sat, 20 Feb 2021 03:36:11 +0000 (14:36 +1100)]
No-op: consolidate Docker Image building YAML

This should have the same effect while making it easier to change the
common docker image building code.

3 years agoMerge branch 'smattr/faedcca5-e012-4920-8e45-5457d2ff984b' into 'master'
Matthew Fernandez [Wed, 17 Feb 2021 16:09:48 +0000 (16:09 +0000)]
Merge branch 'smattr/faedcca5-e012-4920-8e45-5457d2ff984b' into 'master'

misc clean up

See merge request graphviz/graphviz!1740

3 years agosquash some -Wimplicit-fallthrough compiler warnings
Matthew Fernandez [Thu, 11 Feb 2021 05:33:35 +0000 (21:33 -0800)]
squash some -Wimplicit-fallthrough compiler warnings

3 years agoremove some unnecessary void* casts
Matthew Fernandez [Thu, 11 Feb 2021 04:55:55 +0000 (20:55 -0800)]
remove some unnecessary void* casts

3 years agoremove our own CHAR_BIT definitions
Matthew Fernandez [Thu, 11 Feb 2021 04:39:38 +0000 (20:39 -0800)]
remove our own CHAR_BIT definitions

We can just use those in the C standard library.

3 years agoMerge branch 'smattr/150C537B-D311-4C5E-B421-A4874CE8C5F4'
Matthew Fernandez [Wed, 17 Feb 2021 03:56:37 +0000 (19:56 -0800)]
Merge branch 'smattr/150C537B-D311-4C5E-B421-A4874CE8C5F4'

3 years agoadd Fedora to the noted list of downstream consumers
Matthew Fernandez [Fri, 12 Feb 2021 02:53:57 +0000 (18:53 -0800)]
add Fedora to the noted list of downstream consumers

Related to #1941.

3 years agoMerge branch 'smattr/E488F2BC-9394-4031-AB3D-A8E6BC313197' into 'master'
Matthew Fernandez [Wed, 17 Feb 2021 03:41:19 +0000 (03:41 +0000)]
Merge branch 'smattr/E488F2BC-9394-4031-AB3D-A8E6BC313197' into 'master'

remove some unnecessary sfstropen use

See merge request graphviz/graphviz!1738

3 years agoremove another use of sfstropen in GVPR
Matthew Fernandez [Sun, 3 Jan 2021 17:27:19 +0000 (09:27 -0800)]
remove another use of sfstropen in GVPR

Related to #1873.

3 years agoremove an unnecessary use of sfstropen in GVPR
Matthew Fernandez [Sun, 3 Jan 2021 01:54:57 +0000 (17:54 -0800)]
remove an unnecessary use of sfstropen in GVPR

Related to #1873.

3 years agoMerge branch 'smattr/25B6AB1C-1F36-4CEE-87BD-F608C7459480' into 'master'
Matthew Fernandez [Wed, 17 Feb 2021 01:44:34 +0000 (01:44 +0000)]
Merge branch 'smattr/25B6AB1C-1F36-4CEE-87BD-F608C7459480' into 'master'

remove recapitulated prototypes of strcasecmp

See merge request graphviz/graphviz!1741

3 years agoremove recapitulated prototypes of strcasecmp
Matthew Fernandez [Thu, 11 Feb 2021 15:34:43 +0000 (07:34 -0800)]
remove recapitulated prototypes of strcasecmp

These actually cause warnings in CMake Windows builds:

  …\lib\cgraph/strcasecmp.h(15,47): warning C4273: '_stricmp': inconsistent
    dll linkage […\graphviz\build\plugin\gd\gvplugin_gd.vcxproj]
  C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt\string.h(193,22):
    message : see previous definition of '_stricmp'
    […\build\plugin\gd\gvplugin_gd.vcxproj]

and MSBuild Windows builds:

  …\lib\cgraph\strcasecmp.h(23,64): warning C4211: nonstandard extension used:
    redefined extern to static […\graphviz\lib\cgraph\cgraph.vcxproj]
  …\lib\cgraph\strcasecmp.h(27,75): warning C4211: nonstandard extension used:
    redefined extern to static […\lib\cgraph\cgraph.vcxproj]

and Cygwin MinGW builds:

  …/lib/cgraph/strcasecmp.h:15:5: warning: '_stricmp' redeclared without
    dllimport attribute: previous dllimport ignored [-Wattributes]
     15 | int strcasecmp(const char *s1, const char *s2);
        |     ^~~~~~~~~~
  …/lib/cgraph/strcasecmp.h:16:5: warning: '_strnicmp' redeclared without
    dllimport attribute: previous dllimport ignored [-Wattributes]
     16 | int strncasecmp(const char *s1, const char *s2, size_t n);
        |     ^~~~~~~~~~~

Related to #1940.

3 years agoMerge branch 'add-gvpr-to-cmake-builds' into 'master'
Matthew Fernandez [Tue, 16 Feb 2021 16:01:17 +0000 (16:01 +0000)]
Merge branch 'add-gvpr-to-cmake-builds' into 'master'

Add gvpr to CMake builds

Closes #1878

See merge request graphviz/graphviz!1684

3 years agoRemove unnecessary declaration of libc time function
Magnus Jacobsson [Tue, 24 Nov 2020 23:13:28 +0000 (00:13 +0100)]
Remove unnecessary declaration of libc time function

Is available through '#include <time.h>'.

3 years agoRemove unused sfexit.c and replace waitpid declaration with std
Magnus Jacobsson [Tue, 24 Nov 2020 21:40:45 +0000 (22:40 +0100)]
Remove unused sfexit.c and replace waitpid declaration with std

3 years agoRemove gvpr from tools not built with CMake in ci/tests.py
Magnus Jacobsson [Sun, 22 Nov 2020 07:13:00 +0000 (08:13 +0100)]
Remove gvpr from tools not built with CMake in ci/tests.py

3 years agoAdd skip of test_gvpr_example for 64-bit Windows builds
Magnus Jacobsson [Sun, 22 Nov 2020 16:18:14 +0000 (17:18 +0100)]
Add skip of test_gvpr_example for 64-bit Windows builds

Fails because of https://gitlab.com/graphviz/graphviz/-/issues/1882.

3 years agoAdd skip of gvpr bbox & col test also for Windows CMake builds
Magnus Jacobsson [Sun, 22 Nov 2020 12:51:25 +0000 (13:51 +0100)]
Add skip of gvpr bbox & col test also for Windows CMake builds

Fails because of https://gitlab.com/graphviz/graphviz/-/issues/1784.

3 years agoFix gvpr -? to actually print usage and exit non-zero
Magnus Jacobsson [Sun, 22 Nov 2020 10:55:53 +0000 (11:55 +0100)]
Fix gvpr -? to actually print usage and exit non-zero

3 years agoAdd build of cmd/gvpr using CMake
Magnus Jacobsson [Sat, 21 Nov 2020 19:46:17 +0000 (20:46 +0100)]
Add build of cmd/gvpr using CMake

Resolves https://gitlab.com/graphviz/graphviz/-/issues/1878.

3 years agoAdd build of lib/gvpr using CMake
Magnus Jacobsson [Sat, 21 Nov 2020 11:48:55 +0000 (12:48 +0100)]
Add build of lib/gvpr using CMake

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

3 years agoAdd build of lib/expr using CMake
Magnus Jacobsson [Sat, 21 Nov 2020 16:17:52 +0000 (17:17 +0100)]
Add build of lib/expr using CMake

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

3 years agoAdd build of lib/ast using CMake
Magnus Jacobsson [Sat, 21 Nov 2020 19:34:48 +0000 (20:34 +0100)]
Add build of lib/ast using CMake

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

3 years agoAdd build of lib/sfio using CMake
Magnus Jacobsson [Sat, 21 Nov 2020 17:31:57 +0000 (18:31 +0100)]
Add build of lib/sfio using CMake

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