]> granicus.if.org Git - graphviz/log
graphviz
3 years agoMerge branch 'smattr/065AF9DF-1978-4495-B168-76EF5C1C3D39' into 'main'
Matthew Fernandez [Sun, 14 Nov 2021 17:51:59 +0000 (17:51 +0000)]
Merge branch 'smattr/065AF9DF-1978-4495-B168-76EF5C1C3D39' into 'main'

consolidate release artifacts, reducing count to below 50

Closes #2147

See merge request graphviz/graphviz!2279

3 years agostop producing MD5 checksums of release artifacts
Matthew Fernandez [Thu, 11 Nov 2021 16:09:12 +0000 (08:09 -0800)]
stop producing MD5 checksums of release artifacts

This is part of a goal to reduce release artifacts to ≤50 files so the list of
files is not truncated in Gitlab pages. MD5 is an obsolete checksum format that
has been deprecated for many years. This commit removes these checksums from
being produced in the deployment flow, leaving SHA256 checksums as the only
option. This is consistent with Gitlab’s Generic Package Registry that provides
an alternative way of seeing file checksums and also only offers SHA256.

This change reduces the number of release artifacts from 56 to 46.

Closes #2147.

3 years agoremove 'os' directory from packaging hierarchy
Matthew Fernandez [Thu, 11 Nov 2021 04:44:30 +0000 (20:44 -0800)]
remove 'os' directory from packaging hierarchy

Now that nothing is written to the sibling `debug` and `source` directories,
there does not seem to be an advantage to retaining this level in the hierarchy.

3 years agostop exporting tarballs of static builds as artifacts
Matthew Fernandez [Tue, 9 Nov 2021 05:45:37 +0000 (21:45 -0800)]
stop exporting tarballs of static builds as artifacts

These are not consumed by any dependent job. This drops the total number of
Graphviz release artifacts from 58 to 56.

Related to #2147.

3 years agoremove DEB exporting from CI static build tasks
Matthew Fernandez [Tue, 9 Nov 2021 05:44:38 +0000 (21:44 -0800)]
remove DEB exporting from CI static build tasks

Neither of these tasks produce any DEB files.

3 years agorename CMake-produced DEB t *-cmake to disambiguate
Matthew Fernandez [Thu, 11 Nov 2021 01:28:39 +0000 (17:28 -0800)]
rename CMake-produced DEB t *-cmake to disambiguate

Now that the Autotools-produced DEBs are consolidated into tarballs, someone
looking at a flat list of all the release artifacts could incorrectly conclude
that Graphviz-${GV_VERSION}-Linux.deb is an alternative complete package to the
tarballs. Renaming this makes it clearer that it originates from the CMake build
system and is incomplete.

Note that this also removes the `os` hierarchy in the packaging directories for
these artifacts. All DEB artifacts are now produced without any
`os`/`debug`/`source` subdirectory.

Related to #2147.

3 years agofurther consolidate DEBs into a single tarball per OS
Matthew Fernandez [Wed, 10 Nov 2021 01:01:19 +0000 (17:01 -0800)]
further consolidate DEBs into a single tarball per OS

Taking the previous approach further, this results in the following release
artifacts being combined:

  * Ubuntu 18.04
    * 13 DEBs, 10 debug DEBs → 1 tarball
  * Ubuntu 20.04
    * 13 DEBs, 10 debug DEBs → 1 tarball
  * Ubuntu 20.04 debug
    * 13 DEBs, 10 debug DEBs → 1 tarball
  * Ubuntu 21.04
    * 13 DEBs, 10 debug DEBs → 1 tarball
  * Ubuntu 21.10
    * 13 DEBs, 10 debug DEBs → 1 tarball

This drops the total number of Graphviz release artifacts from 63 to 58. This is
still not below the 50 artifact ceiling we need to hit, but this is progress.

Note that this removes the `os`/`debug`/`source` hierarchy in the packaging
directories for these artifacts, now that all three of these are packaged into a
single tarball. The `os` hierarchy remains for the CMake-produced DEB for these
platforms.

Related to #2147.

3 years agopackage DEBs as consolidated tarballs
Matthew Fernandez [Tue, 9 Nov 2021 04:39:13 +0000 (20:39 -0800)]
package DEBs as consolidated tarballs

This results in the following release artifacts being combined:

  * Ubuntu 18.04
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 20.04
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 20.04 debug
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 21.04
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball
  * Ubuntu 21.10
    * 13 DEBs → 1 tarball
    * 10 debug DEBs → 1 tarball

This drops the total number of Graphviz release artifacts from 168 to 63. This
is still not below the 50 artifact ceiling we need to hit, but this is
significant progress.

Related to #2147.

3 years agorename CMake-produced RPM to *-cmake to disambiguate
Matthew Fernandez [Sun, 7 Nov 2021 00:15:28 +0000 (17:15 -0700)]
rename CMake-produced RPM to *-cmake to disambiguate

Now that the Autotools-produced RPMs are consolidated into tarballs, someone
looking at a flat list of all the release artifacts could incorrectly conclude
that Graphviz-${GV_VERSION}-Linux.rpm is an alternative complete package to the
tarballs. Renaming this makes it clearer that it originates from the CMake build
system and is incomplete.

Note that this also removes the `os` hierarchy in the packaging directories for
these artifacts. All RPM artifacts are now produced without any
`os`/`debug`/`source` subdirectory.

Related to #2147.

3 years agofurther consolidate RPMs into a single tarball per OS
Matthew Fernandez [Tue, 9 Nov 2021 15:25:09 +0000 (07:25 -0800)]
further consolidate RPMs into a single tarball per OS

Taking the previous approach further, this results in the following release
artifacts being combined:

  * CentOS 7
    * 1 source RPM, 2 tarballs → 1 tarball
  * CentOS 8
    * 1 source RPM, 2 tarballs → 1 tarball
  * Fedora 33
    * 1 source RPM, 2 tarballs → 1 tarball
  * Fedora 34
    * 1 source RPM, 2 tarballs → 1 tarball

This drops the total number of Graphviz release artifacts from 176 to 168. This
is still not below the 50 artifact ceiling we need to hit, but this is progress.

Note that this removes the `os`/`debug`/`source` hierarchy in the packaging
directories for these artifacts, now that all three of these are packaged into a
single tarball. The `os` hierarchy remains for the CMake-produced RPM for these
platforms.

Related to #2147.

3 years agopackage RPMs as consolidated tarballs
Matthew Fernandez [Sat, 6 Nov 2021 17:28:00 +0000 (10:28 -0700)]
package RPMs as consolidated tarballs

This results in the following release artifacts being combined:

  * CentOS 7
    * 1 debug RPMs → 1 tarball
    * 22 other RPMs → 1 tarball
  * CentOS 8
    * 20 debug RPMs → 1 tarball
    * 23 other RPMs → 1 tarball
  * Fedora 33
    * 25 debug RPMs → 1 tarball
    * 28 other RPMs → 1 tarball
  * Fedora 34
    * 25 debug RPMs → 1 tarball
    * 28 other RPMs → 1 tarball

This drops the total number of Graphviz release artifacts from 340 to 176. This
is still not below the 50 artifact ceiling we need to hit, but this is
significant progress.

Related to #2147.

3 years agoremove configure.log artifact export from CI tasks that do not produce a log
Matthew Fernandez [Wed, 10 Nov 2021 01:01:41 +0000 (17:01 -0800)]
remove configure.log artifact export from CI tasks that do not produce a log

3 years agoMerge branch 'smattr/F13008F4-0953-4C2A-8080-DCDF139C824E' into 'main'
Matthew Fernandez [Wed, 10 Nov 2021 15:45:28 +0000 (15:45 +0000)]
Merge branch 'smattr/F13008F4-0953-4C2A-8080-DCDF139C824E' into 'main'

some clean up of `free` usage

See merge request graphviz/graphviz!2267

3 years agoLinkedList.c: remove commented out code
Matthew Fernandez [Sat, 6 Nov 2021 00:28:52 +0000 (17:28 -0700)]
LinkedList.c: remove commented out code

3 years agoNodePrint: remove an unnecessary cast
Matthew Fernandez [Sat, 6 Nov 2021 00:28:42 +0000 (17:28 -0700)]
NodePrint: remove an unnecessary cast

3 years agocomp_scan_points: remove unnecessary casts
Matthew Fernandez [Sat, 6 Nov 2021 00:28:25 +0000 (17:28 -0700)]
comp_scan_points: remove unnecessary casts

3 years agoremove 'FREE' abstraction
Matthew Fernandez [Sat, 6 Nov 2021 00:26:48 +0000 (17:26 -0700)]
remove 'FREE' abstraction

This #define was not conditional (it was always set to `free`) and was not used
consistently (there were still direct calls to `free` in some places that should
have used this macro), incorrectly giving the impression that it could be safely
swapped for another function.

3 years agoremove guards on calls to 'free'
Matthew Fernandez [Sat, 6 Nov 2021 00:09:15 +0000 (17:09 -0700)]
remove guards on calls to 'free'

It is a no-op to call `free(NULL)`, so we can rephrase this code into something
more concise and simple.

3 years agodtclose: remove an unnecessary cast
Matthew Fernandez [Sat, 6 Nov 2021 00:05:19 +0000 (17:05 -0700)]
dtclose: remove an unnecessary cast

3 years agoMerge branch 'smattr/47a39b74-0b69-45f8-b85f-a74a3971ec93' into 'main'
Matthew Fernandez [Wed, 10 Nov 2021 07:00:27 +0000 (07:00 +0000)]
Merge branch 'smattr/47a39b74-0b69-45f8-b85f-a74a3971ec93' into 'main'

more warning squashing

See merge request graphviz/graphviz!2269

3 years agonodeIntersect: remove unused 'itarget' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:37:03 +0000 (18:37 -0700)]
nodeIntersect: remove unused 'itarget' parameter

3 years agonodeIntersect: remove unused 'explicit_itarget' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:35:57 +0000 (18:35 -0700)]
nodeIntersect: remove unused 'explicit_itarget' parameter

3 years agonodeIntersect: remove unused 'itooltip' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:34:54 +0000 (18:34 -0700)]
nodeIntersect: remove unused 'itooltip' parameter

3 years agononefunc: squash -Wunused-parameter warnings
Matthew Fernandez [Sun, 7 Nov 2021 01:32:25 +0000 (18:32 -0700)]
nonefunc: squash -Wunused-parameter warnings

3 years agoedge_in_layer: remove unused 'g' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:31:21 +0000 (18:31 -0700)]
edge_in_layer: remove unused 'g' parameter

3 years agosetup_page: remove unused 'g' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:30:38 +0000 (18:30 -0700)]
setup_page: remove unused 'g' parameter

3 years agoremove prototypes for unimplemented render.h functions
Matthew Fernandez [Sun, 7 Nov 2021 01:25:35 +0000 (18:25 -0700)]
remove prototypes for unimplemented render.h functions

3 years agoparse_layerselect: remove unused 'g' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:23:05 +0000 (18:23 -0700)]
parse_layerselect: remove unused 'g' parameter

3 years agocharacterData: squash -Wunused-parameter warning
Matthew Fernandez [Sun, 7 Nov 2021 01:21:04 +0000 (18:21 -0700)]
characterData: squash -Wunused-parameter warning

3 years agoendElement: squash -Wunused-parameter warning
Matthew Fernandez [Sun, 7 Nov 2021 01:20:14 +0000 (18:20 -0700)]
endElement: squash -Wunused-parameter warning

3 years agomkFont: remove unused 'ul' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:19:38 +0000 (18:19 -0700)]
mkFont: remove unused 'ul' parameter

3 years agofdp_extra_args: remove unused 'gvc' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:05:47 +0000 (18:05 -0700)]
fdp_extra_args: remove unused 'gvc' parameter

3 years agoneato_extra_args: remove unused 'gvc' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:04:46 +0000 (18:04 -0700)]
neato_extra_args: remove unused 'gvc' parameter

3 years agomemtest_extra_args: remove unused 'gvc' parameter
Matthew Fernandez [Sun, 7 Nov 2021 01:03:40 +0000 (18:03 -0700)]
memtest_extra_args: remove unused 'gvc' parameter

3 years agoMerge branch 'smattr/2A44CEC9-C5B1-46E0-96F1-3174C9BE6A68' into 'main'
Matthew Fernandez [Wed, 10 Nov 2021 05:57:42 +0000 (05:57 +0000)]
Merge branch 'smattr/2A44CEC9-C5B1-46E0-96F1-3174C9BE6A68' into 'main'

smyrna: more dead code removal

See merge request graphviz/graphviz!2268

3 years agosmyrna: remove unused 'visibility' refresh filter field
Matthew Fernandez [Sun, 7 Nov 2021 00:06:49 +0000 (17:06 -0700)]
smyrna: remove unused 'visibility' refresh filter field

3 years agosmyrna: remove unused camera 'index' field
Matthew Fernandez [Sun, 7 Nov 2021 00:03:21 +0000 (17:03 -0700)]
smyrna: remove unused camera 'index' field

3 years agosmyrna: remove unused 'type' camera field
Matthew Fernandez [Sun, 7 Nov 2021 00:01:50 +0000 (17:01 -0700)]
smyrna: remove unused 'type' camera field

3 years agosmyrna: remove unused 'temp'
Matthew Fernandez [Sat, 6 Nov 2021 23:59:10 +0000 (16:59 -0700)]
smyrna: remove unused 'temp'

3 years agosmyrna: remove unused graph data 'Modified' field
Matthew Fernandez [Sat, 6 Nov 2021 23:54:44 +0000 (16:54 -0700)]
smyrna: remove unused graph data 'Modified' field

3 years agosmyrna: remove unused graph data offset fields
Matthew Fernandez [Sat, 6 Nov 2021 23:54:01 +0000 (16:54 -0700)]
smyrna: remove unused graph data offset fields

3 years agosmyrna: remove unused edge 'printLabel' field
Matthew Fernandez [Sat, 6 Nov 2021 23:50:41 +0000 (16:50 -0700)]
smyrna: remove unused edge 'printLabel' field

3 years agosmyrna: remove unused edge 'visible' fields
Matthew Fernandez [Sat, 6 Nov 2021 23:49:25 +0000 (16:49 -0700)]
smyrna: remove unused edge 'visible' fields

3 years agosmyrna: remove unused OD macros
Matthew Fernandez [Sat, 6 Nov 2021 23:46:10 +0000 (16:46 -0700)]
smyrna: remove unused OD macros

3 years agosmyrna: remove unused 'xdot_set'
Matthew Fernandez [Sat, 6 Nov 2021 23:45:12 +0000 (16:45 -0700)]
smyrna: remove unused 'xdot_set'

3 years agoMerge branch 'smattr/76717b9c-884a-4d8e-bd93-d9386982d2ae' into 'main'
Matthew Fernandez [Wed, 10 Nov 2021 03:40:58 +0000 (03:40 +0000)]
Merge branch 'smattr/76717b9c-884a-4d8e-bd93-d9386982d2ae' into 'main'

fix mismatch of calling conventions in delaunay.c

See merge request graphviz/graphviz!2271

3 years agodelaunay.c: remove unnecessary parens
Matthew Fernandez [Sun, 7 Nov 2021 20:23:18 +0000 (12:23 -0800)]
delaunay.c: remove unnecessary parens

3 years agomkSurface: fix mismatch of calling convention in 'addFace'
Matthew Fernandez [Sun, 7 Nov 2021 20:12:53 +0000 (12:12 -0800)]
mkSurface: fix mismatch of calling convention in 'addFace'

The compiler said about this code:

  delaunay.c:484:34: warning: cast between incompatible function types from
    ‘void (*)(GFace *, fstate *)’ {aka ‘void (*)(struct <anonymous> *, struct
    <anonymous> *)’} to ‘gint (*)(void *, void *)’ {aka ‘int (*)(void *,
    void *)’} [-Wcast-function-type]
       gts_surface_foreach_face (s, (GtsFunc) addFace, &statf);
                                    ^

Similar to the prior commit, this was relying on a coincident return value of 0
from the callback function.

3 years agoget_triangles: fix mismatch of calling convention in 'addTri'
Matthew Fernandez [Sun, 7 Nov 2021 20:07:00 +0000 (12:07 -0800)]
get_triangles: fix mismatch of calling convention in 'addTri'

The compiler said about this code:

  delaunay.c:518:34: warning: cast between incompatible function types from
    ‘void (*)(GFace *, fstate *)’ {aka ‘void (*)(struct <anonymous> *, struct
    <anonymous> *)’} to ‘gint (*)(void *, void *)’ {aka
    ‘int (*)(void *, void *)’} [-Wcast-function-type]
       gts_surface_foreach_face (s, (GtsFunc) addTri, &statf);
                                    ^

Similar to the prior commit, this was relying on a coincident return value of 0
from the callback function.

3 years agomkSurface/get_triangles: fix mismatch of calling convention in 'cntFace'
Matthew Fernandez [Sun, 7 Nov 2021 20:01:23 +0000 (12:01 -0800)]
mkSurface/get_triangles: fix mismatch of calling convention in 'cntFace'

The compiler said about this code:

  delaunay.c:477:34: warning: cast between incompatible function types from
    ‘void (*)(GFace *, int *)’ {aka ‘void (*)(struct <anonymous> *, int *)’} to
    ‘gint (*)(void *, void *)’ {aka ‘int (*)(void *, void *)’}
    [-Wcast-function-type]
       gts_surface_foreach_face (s, (GtsFunc) cntFace, &nfaces);
                                    ^

Similar to the prior commit, this was relying on a coincident return value of 0
from the callback function.

3 years agodelaunay_tri/mkSurface: fix mismatch of calling convention in 'addEdge'
Matthew Fernandez [Sun, 7 Nov 2021 19:55:50 +0000 (11:55 -0800)]
delaunay_tri/mkSurface: fix mismatch of calling convention in 'addEdge'

The compiler said about this code:

  delaunay.c:355:31: warning: cast between incompatible function types from
    ‘void (*)(GtsSegment *, estate *)’ {aka ‘void (*)(struct _GtsSegment *,
    struct <anonymous> *)’} to ‘gint (*)(void *, void *)’ {aka
    ‘int (*)(void *, void *)’} [-Wcast-function-type]
    gts_surface_foreach_edge (s, (GtsFunc) addEdge, &state);
                                 ^

Similar to the prior commit, this was relying on a coincident return value of 0
from the callback function.

3 years agoaddFace: fix mismatch of calling convention in callback
Matthew Fernandez [Sun, 7 Nov 2021 19:40:52 +0000 (11:40 -0800)]
addFace: fix mismatch of calling convention in callback

The compiler said about this code:

  delaunay.c: In function ‘addFace’:
  delaunay.c:428:48: warning: cast between incompatible function types from
    ‘void (*)(GFace *, ninfo *)’ {aka ‘void (*)(struct <anonymous> *, struct
    <anonymous> *)’} to ‘gint (*)(void *, void *)’ {aka ‘int (*)(void *,
    void *)’} [-Wcast-function-type]
       gts_face_foreach_neighbor ((GtsFace*)f, 0, (GtsFunc) addNeighbor, &ni);
                                                  ^

Similar to the prior commit, this was relying on a coincident return value of 0
from the callback function.

3 years agodelaunay_triangulation: fix mismatch of calling convention in callback
Matthew Fernandez [Sun, 7 Nov 2021 19:25:21 +0000 (11:25 -0800)]
delaunay_triangulation: fix mismatch of calling convention in callback

The compiler said about this code:

  delaunay.c:286:34: warning: cast between incompatible function types from
    ‘void (*)(GtsSegment *, v_data *)’ {aka ‘void (*)(struct _GtsSegment *,
    struct <anonymous> *)’} to ‘gint (*)(void *, void *)’ {aka
    ‘int (*)(void *, void *)’} [-Wcast-function-type]
       gts_surface_foreach_edge (s, (GtsFunc) add_edge, delaunay);
                                    ^

Similar to the prior commit, this was relying on a coincident return value of 0
from the callback function.

3 years agogts_surface_foreach_edge: fix mismatch of calling convention in callback
Matthew Fernandez [Sun, 7 Nov 2021 19:20:08 +0000 (11:20 -0800)]
gts_surface_foreach_edge: fix mismatch of calling convention in callback

The compiler said about this code:

  delaunay.c: In function ‘edgeStats’:
  delaunay.c:245:34: warning: cast between incompatible function types from
    ‘void (*)(GtsSegment *, estats *)’ {aka ‘void (*)(struct _GtsSegment *,
    struct <anonymous> *)’} to ‘gint (*)(void *, void *)’ {aka
    ‘int (*)(void *, void *)’} [-Wcast-function-type]
       gts_surface_foreach_edge (s, (GtsFunc) cnt_edge, sp);
                                    ^

This is not quite as bad as the previous instance of this fixed. However, it
seems to have been relying on a coincident return value. E.g. on x86-64 this
code relies on 0 ending up in `RAX` at the end of the callback to indicate
iteration should continue, despite `cnt_edge` having no declared return value.

3 years agotri: remove shadowing of 'v1'
Matthew Fernandez [Sun, 7 Nov 2021 19:12:53 +0000 (11:12 -0800)]
tri: remove shadowing of 'v1'

3 years agodelaunay_triangulation: make static
Matthew Fernandez [Sun, 7 Nov 2021 19:05:41 +0000 (11:05 -0800)]
delaunay_triangulation: make static

This function is not used outside of its containing file.

3 years agodelaunay_remove_holes: fix mismatch of calling convention in callback
Matthew Fernandez [Sun, 7 Nov 2021 18:54:58 +0000 (10:54 -0800)]
delaunay_remove_holes: fix mismatch of calling convention in callback

The compiler said about this code:

  delaunay.c: In function ‘delaunay_remove_holes’:
  delaunay.c:45:9: warning: cast between incompatible function types from
    ‘gboolean (*)(GtsTriangle *)’ {aka ‘int (*)(struct _GtsTriangle *)’}
    to ‘gint (*)(void *, void *)’ {aka ‘int (*)(void *, void *)’}
    [-Wcast-function-type]
         (GtsFunc) triangle_is_hole, NULL);

This warning is not spurious. In particular, the mismatch in the number of
arguments passed to the callback means the callback function has a different
calling convention than expected by the code calling it. The result of this can
be stack corruption or incorrect interpretation of function arguments.

In practice, all major native calling conventions use registers for both
function types, so this is somewhat benign. However, this likely caused problems
on stack-based environments like WASM and JITs.

3 years agoMerge branch 'smattr/08BD9B6E-60A9-44CE-A4F8-7AFA9DBF563C' into 'main'
Matthew Fernandez [Wed, 10 Nov 2021 02:16:14 +0000 (02:16 +0000)]
Merge branch 'smattr/08BD9B6E-60A9-44CE-A4F8-7AFA9DBF563C' into 'main'

remove 'COLLECTION' from the packaging hierarchy

Closes #2148

See merge request graphviz/graphviz!2270

3 years agogenerate_configuration_table.py: standardize on string with double quoting
Matthew Fernandez [Sun, 7 Nov 2021 04:11:20 +0000 (21:11 -0700)]
generate_configuration_table.py: standardize on string with double quoting

3 years agoremove 'COLLECTION' from the packaging hierarchy
Matthew Fernandez [Sun, 7 Nov 2021 00:26:48 +0000 (17:26 -0700)]
remove 'COLLECTION' from the packaging hierarchy

Each Graphviz version has a notion of “collection,” which traditionally could be
the values “stable” or “development.” The semantically versioned releases that
are published to the website are considered stable. The inter-release packages
that the deploy.py script still uploads to the Gitlab package repository are
considered development. gen_version.py knows how to determine the collection of
a version during build.

Additionally .gitlab-ci.yml knew of another collection value, “experimental,” of
which gen_version.py was unaware. It would manually tweak the collection to this
for certain non-mainstream builds.

deploy.py knows nothing of this notion of collections.

The combined effect of the above has led to some negative outcomes:

  1. Published releases include a mixture of files labelled “stable” and files
     labelled “experimental.” It is not clear to the general public what either
     of these labels mean or how they differ.

  2. In recent times, “development” versions are no more or less stable than
     “stable” versions. The terminology here unfortunately has become
     inaccurate.

  3. The directory hierarchy for published releases has included an extra level
     for collection. If deployment worked as intended, this would be redundant
     as every release artifact would be “stable.” However, as discussed above,
     the deployment script actually publishes “experimental” artifacts as well.

To reduce confusion and simplify build and packaging going forwards, this change
removes the notion of collection. The generated COLLECTION file is no longer
produced and users should have no need to be aware of this concept.
gen_version.py still internally knows the idea of collections to distinguish
published release version numbers from inter-release version numbers. But this
is no longer exposed to the rest of the build system and packaging.

The notion of “experimental” as a collection value is completely removed.

Closes #2148.

3 years agoMerge branch 'smattr/208872FD-6BD8-41F6-9998-65B8BB0DE5DF' into 'main'
Matthew Fernandez [Tue, 9 Nov 2021 17:14:23 +0000 (17:14 +0000)]
Merge branch 'smattr/208872FD-6BD8-41F6-9998-65B8BB0DE5DF' into 'main'

some cleanup of CI scripts

See merge request graphviz/graphviz!2266

3 years agostandardize on '/usr/bin/env bash' shebang for CI scripts
Matthew Fernandez [Tue, 2 Nov 2021 14:56:05 +0000 (07:56 -0700)]
standardize on '/usr/bin/env bash' shebang for CI scripts

This is slightly more portable (e.g. on FreeBSD Bash does not live at
/bin/bash). The previous shebang was fine on all the operating systems we
currently support, but this adds robustness as we expand CI coverage.

3 years agouse specific Bash shebang on CI package install script
Matthew Fernandez [Tue, 2 Nov 2021 14:54:36 +0000 (07:54 -0700)]
use specific Bash shebang on CI package install script

This script does not use any Bashisms as far as I can tell, but we rely on Bash
elsewhere for shell scripts so may as well standardize on this here.

3 years agoenable Lefty in out-of-source build CI job
Matthew Fernandez [Tue, 2 Nov 2021 14:51:52 +0000 (07:51 -0700)]
enable Lefty in out-of-source build CI job

Commit d64b75d2704bd3ed47b3f74c0686e19ca74e65fc explicitly enabled Lefty in
several places in preparation for it becoming disabled by default. However, it
accidentally missed the out-of-source build.

3 years agoMerge branch 'smattr/e8ff6515-8dc2-4cb1-8362-3a9cb35d0b4e' into 'main'
Matthew Fernandez [Tue, 9 Nov 2021 16:11:15 +0000 (16:11 +0000)]
Merge branch 'smattr/e8ff6515-8dc2-4cb1-8362-3a9cb35d0b4e' into 'main'

gvconfig.c: remove remaining compiler warnings

See merge request graphviz/graphviz!2265

3 years agogvconfig.c: remove shadowing of 'path'
Matthew Fernandez [Wed, 3 Nov 2021 04:28:44 +0000 (21:28 -0700)]
gvconfig.c: remove shadowing of 'path'

3 years agogvconfig: squash some further -Wsign-conversion warnings
Matthew Fernandez [Wed, 3 Nov 2021 04:15:54 +0000 (21:15 -0700)]
gvconfig: squash some further -Wsign-conversion warnings

3 years agogvconfig: more precise error messages about config file reading
Matthew Fernandez [Wed, 3 Nov 2021 03:53:02 +0000 (20:53 -0700)]
gvconfig: more precise error messages about config file reading

3 years agogvconfig: squash a -Wsign-conversion warning
Matthew Fernandez [Wed, 3 Nov 2021 03:48:25 +0000 (20:48 -0700)]
gvconfig: squash a -Wsign-conversion warning

3 years agoremove file size limit on GVC config
Matthew Fernandez [Wed, 3 Nov 2021 03:44:51 +0000 (20:44 -0700)]
remove file size limit on GVC config

While it is probably not a good idea to have a GVC config that is 100000 bytes,
I see no reason it should be arbitrarily rejected. In future, it might be a good
idea to make `gvconfig_plugin_install_from_config` accept a file pointer instead
of a string and read/parse the config file incrementally. If this were done,
then there would probably be no issue at all with large configs.

3 years agogvconfig.c: remove commented out code
Matthew Fernandez [Wed, 3 Nov 2021 03:30:56 +0000 (20:30 -0700)]
gvconfig.c: remove commented out code

3 years agogvconfig.c: realign alternative for 'glob' with POSIX
Matthew Fernandez [Wed, 3 Nov 2021 03:27:11 +0000 (20:27 -0700)]
gvconfig.c: realign alternative for 'glob' with POSIX

If the `glob` system function¹ is available, it is used in this code. If not (on
Windows), an alternative static function is provided. The POSIX spec mandates
only three members of the `glob_t` struct, `gl_pathc`, `gl_pathv`, and
`gl_offs`. This commit realigns the members with their types in the POSIX spec.
This squashes some -Wsign-compare warnings on POSIX platforms.

¹ https://pubs.opengroup.org/onlinepubs/007908799/xsh/glob.html

3 years agoglob_t: remove unused struct members
Matthew Fernandez [Tue, 9 Nov 2021 15:07:08 +0000 (07:07 -0800)]
glob_t: remove unused struct members

3 years agoMerge branch 'smattr/A523AC37-482C-4A41-A93E-12ED3514F173' into 'main'
Matthew Fernandez [Mon, 8 Nov 2021 05:04:37 +0000 (05:04 +0000)]
Merge branch 'smattr/A523AC37-482C-4A41-A93E-12ED3514F173' into 'main'

more header guard modernization

See merge request graphviz/graphviz!2263

3 years agolib/dotgen: replace header guards with more modern #pragma once
Matthew Fernandez [Tue, 2 Nov 2021 03:59:57 +0000 (20:59 -0700)]
lib/dotgen: replace header guards with more modern #pragma once

3 years agolib/topfish: replace header guards with more modern #pragma once
Matthew Fernandez [Tue, 2 Nov 2021 03:57:10 +0000 (20:57 -0700)]
lib/topfish: replace header guards with more modern #pragma once

3 years agolib/rbtree: replace header guards with more modern #pragma once
Matthew Fernandez [Tue, 2 Nov 2021 03:56:06 +0000 (20:56 -0700)]
lib/rbtree: replace header guards with more modern #pragma once

3 years agoMerge branch 'smattr/gitlab-2153' into 'main'
Matthew Fernandez [Mon, 8 Nov 2021 03:58:22 +0000 (03:58 +0000)]
Merge branch 'smattr/gitlab-2153' into 'main'

fix: exclude cmd/smyrna when Smyrna is disabled during build, and cmd/lefty when Lefty is disabled during build

Closes #2153

See merge request graphviz/graphviz!2262

3 years agofix: exclude cmd/smyrna when Smyrna is disabled during build
Matthew Fernandez [Tue, 2 Nov 2021 00:04:42 +0000 (17:04 -0700)]
fix: exclude cmd/smyrna when Smyrna is disabled during build

Similar to the situation just fixed with Lefty, when Smyrna was disabled
(`--with-smyrna=no` passed to the build system), several Smyrna related
artifacts would still be built and installed. We now exclude the entire Smyrna
subdirectory, which should be less error prone.

Related to #2153.

3 years agofix: do not ship smyrna.pdf when Smyrna is not being built
Matthew Fernandez [Tue, 2 Nov 2021 00:04:41 +0000 (17:04 -0700)]
fix: do not ship smyrna.pdf when Smyrna is not being built

Similar to prior fixes for Lefty, Smyrna artifacts were not adequately guarded
to prevent them being built and installed when Smyrna is disabled.

Related to #2153.

3 years agofix: exclude cmd/lefty when Lefty is disabled during build
Matthew Fernandez [Tue, 2 Nov 2021 00:04:39 +0000 (17:04 -0700)]
fix: exclude cmd/lefty when Lefty is disabled during build

When Lefty was disabled (`--enable-lefty` not passed to the build system),
several Lefty related artifacts would still be built and installed. E.g. the man
page. We now exclude the entire Lefty subdirectory, which should be less error
prone.

Fixes #2153.

Suggested-by: Daniel Macks
3 years agoremove unused tred2
Matthew Fernandez [Tue, 2 Nov 2021 00:04:38 +0000 (17:04 -0700)]
remove unused tred2

3 years agofix: do not ship leftyguide.pdf when Lefty is not being built
Matthew Fernandez [Tue, 2 Nov 2021 00:04:37 +0000 (17:04 -0700)]
fix: do not ship leftyguide.pdf when Lefty is not being built

Related to #2153.

3 years agoremove commented out Makefile line
Matthew Fernandez [Tue, 2 Nov 2021 00:04:36 +0000 (17:04 -0700)]
remove commented out Makefile line

3 years agofix: do not ship Dotty’s Lefty examples when Lefty is not being built
Matthew Fernandez [Tue, 2 Nov 2021 00:04:33 +0000 (17:04 -0700)]
fix: do not ship Dotty’s Lefty examples when Lefty is not being built

Related to #2153.

3 years agoMerge branch 'smattr/gitlab-2143' into 'main'
Matthew Fernandez [Mon, 8 Nov 2021 01:09:36 +0000 (01:09 +0000)]
Merge branch 'smattr/gitlab-2143' into 'main'

enable persistent Chocolatey cache in Windows CI jobs

Closes #2143

See merge request graphviz/graphviz!2261

3 years agoenable persistent Chocolatey cache in Windows CI jobs
Matthew Fernandez [Tue, 2 Nov 2021 00:06:14 +0000 (17:06 -0700)]
enable persistent Chocolatey cache in Windows CI jobs

The intention of this change is to accelerate Windows CI jobs, currently one of
the limiting factors on our CI throughput. This change takes a conservative
approach, giving each relevant job its own cache. In theory these jobs could all
share a cache, but the Gitlab docs¹ imply this is only safe if only a single job
has a `push` policy. To do this effectively, we would probably have to create a
new preliminary CI job that only built the cache. Then all other jobs would
become `pull` consumers of this cache. Perhaps an improvement to make in future.

Closes #2143.

¹ https://docs.gitlab.com/ee/ci/yaml/index.html#cachepolicy

3 years agoMerge branch 'smattr/B88D27C7-7361-4A49-B653-D44870A5BACC' into 'main'
Matthew Fernandez [Sat, 6 Nov 2021 23:41:56 +0000 (23:41 +0000)]
Merge branch 'smattr/B88D27C7-7361-4A49-B653-D44870A5BACC' into 'main'

smyrna: more dead code removal

See merge request graphviz/graphviz!2260

3 years agosmyrna: remove unused 'ApplyTo'
Matthew Fernandez [Sun, 31 Oct 2021 16:48:49 +0000 (09:48 -0700)]
smyrna: remove unused 'ApplyTo'

3 years agoremove unused 'Edgecount'
Matthew Fernandez [Sat, 6 Nov 2021 22:34:24 +0000 (15:34 -0700)]
remove unused 'Edgecount'

3 years agosmyrna: remove unused 'Edges'
Matthew Fernandez [Sun, 31 Oct 2021 16:43:07 +0000 (09:43 -0700)]
smyrna: remove unused 'Edges'

3 years agosmyrna: remove unused 'Nodes'
Matthew Fernandez [Sun, 31 Oct 2021 16:42:14 +0000 (09:42 -0700)]
smyrna: remove unused 'Nodes'

3 years agosmyrna: remove unused 'customptr'
Matthew Fernandez [Sun, 31 Oct 2021 16:40:15 +0000 (09:40 -0700)]
smyrna: remove unused 'customptr'

3 years agosmyrna: remove unused 'picked_nodes'
Matthew Fernandez [Sun, 31 Oct 2021 16:39:25 +0000 (09:39 -0700)]
smyrna: remove unused 'picked_nodes'

3 years agosmyrna: remove unused 'picked_edges'
Matthew Fernandez [Sun, 31 Oct 2021 16:38:47 +0000 (09:38 -0700)]
smyrna: remove unused 'picked_edges'

3 years agosmyrna: remove unused 'maxnodedegree'
Matthew Fernandez [Sun, 31 Oct 2021 16:37:56 +0000 (09:37 -0700)]
smyrna: remove unused 'maxnodedegree'

3 years agosmyrna: remove unused 'avgedgelength'
Matthew Fernandez [Sun, 31 Oct 2021 16:36:49 +0000 (09:36 -0700)]
smyrna: remove unused 'avgedgelength'

3 years agosmyrna: remove unused 'init_zoom'
Matthew Fernandez [Sun, 31 Oct 2021 16:36:10 +0000 (09:36 -0700)]
smyrna: remove unused 'init_zoom'

3 years agosmyrna: remove unused 'xdotId'
Matthew Fernandez [Sun, 31 Oct 2021 16:35:12 +0000 (09:35 -0700)]
smyrna: remove unused 'xdotId'

3 years agoMerge branch 'smattr/fff5b118-1554-42de-9e8a-2fd20c431ad4' into 'main'
Matthew Fernandez [Sat, 6 Nov 2021 21:16:01 +0000 (21:16 +0000)]
Merge branch 'smattr/fff5b118-1554-42de-9e8a-2fd20c431ad4' into 'main'

rewrite strps.awk in Python and inline it

See merge request graphviz/graphviz!2254