From d5c9110eb3cedb3ca69c271f70e2793f3c16784c Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Tue, 29 Mar 2022 08:05:33 -0700 Subject: [PATCH] remove build system support for 'dotty' `dotty` is built on top of `lefty` which is deprecated and will be removed in a future commit. --- CHANGELOG.md | 2 +- ci/tests.py | 2 - cmd/Makefile.am | 2 +- cmd/dotty/Makefile.am | 59 ------------------- cmd/dotty/dotty.vcxproj | 101 -------------------------------- cmd/dotty/dotty.vcxproj.filters | 22 ------- configure.ac | 1 - doc/Makefile.am | 2 +- graphviz.sln | 2 - redhat/graphviz.spec.fedora.in | 2 - rtest/test_tools.py | 1 - 11 files changed, 3 insertions(+), 193 deletions(-) delete mode 100644 cmd/dotty/Makefile.am delete mode 100644 cmd/dotty/dotty.vcxproj delete mode 100644 cmd/dotty/dotty.vcxproj.filters diff --git a/CHANGELOG.md b/CHANGELOG.md index 60778fc0b..10ce2da6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 CMake build system - a brief note about the (previously undocumented) behavior of Graphviz when sent `SIGUSR1` is now mentioned in the man page -- build system support for `lneato` has been removed +- build system support for `dotty` and `lneato` has been removed ### Fixed diff --git a/ci/tests.py b/ci/tests.py index a2d3faa26..4831d62fd 100644 --- a/ci/tests.py +++ b/ci/tests.py @@ -61,7 +61,6 @@ def is_win64() -> bool: "dot", "dot2gxl", "dot_builtins", - "dotty", "edgepaint", "fdp", "gc", @@ -101,7 +100,6 @@ def test_existence(binary: str): tools_not_built_with_cmake = [ "cluster", "dot_builtins", - "dotty", "gv2gxl", "gvedit", "gvmap", diff --git a/cmd/Makefile.am b/cmd/Makefile.am index 4c180930c..fad1b941e 100644 --- a/cmd/Makefile.am +++ b/cmd/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = dot tools gvpr dotty gvmap gvedit mingle edgepaint +SUBDIRS = dot tools gvpr gvmap gvedit mingle edgepaint if WITH_LEFTY SUBDIRS += lefty diff --git a/cmd/dotty/Makefile.am b/cmd/dotty/Makefile.am deleted file mode 100644 index 9084f7955..000000000 --- a/cmd/dotty/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to produce Makefile.in - -leftydir = $(pkgdatadir)/lefty -pdfdir = $(pkgdatadir)/doc/pdf - -AM_CPPFLAGS = \ - -I$(top_srcdir)/lib - -if WITH_X -if WITH_WIN32 -bin_PROGRAMS = dotty -else -bin_SCRIPTS = dotty -endif -if WITH_LEFTY -lefty_DATA = dotty.lefty dotty_draw.lefty dotty_edit.lefty \ - dotty_layout.lefty dotty_ui.lefty -else -lefty_DATA = -endif -endif - -man_MANS = dotty.1 -if ENABLE_MAN_PDFS -pdf_DATA = dotty.1.pdf - -if HAVE_PS2PDF -pdf = $(pdf_DATA) -else -pdf = ERROR_NO_PS2PDF -endif -else -pdf = -endif - -if WITH_WIN32 -dotty_SOURCES = mswin32/dotty.c -dotty_LDADD = -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -else -dotty: $(top_srcdir)/cmd/dotty/dotty.sh - cp $(top_srcdir)/cmd/dotty/dotty.sh dotty - chmod +x dotty -endif - -if ENABLE_MAN_PDFS -if HAVE_PS2PDF -dotty.1.pdf: dotty.1.ps - @PS2PDF@ $< - -dotty.1.ps: $(srcdir)/dotty.1 - @GROFF@ -Tps -man $< >$@ -endif -endif - -EXTRA_DIST = $(lefty_DATA) $(man_MANS) $(pdf) \ - dotty.bsh dotty.ksh dotty.sh \ - notes mswin32 dotty.vcxproj* - -DISTCLEANFILES = $(pdf) dotty dotty.1.ps diff --git a/cmd/dotty/dotty.vcxproj b/cmd/dotty/dotty.vcxproj deleted file mode 100644 index da0495bc4..000000000 --- a/cmd/dotty/dotty.vcxproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {863A7931-DC7C-47C4-94E6-3D053BFE771A} - dotty - Win32Proj - 10.0 - - - - Application - v142 - - - Application - v142 - - - - - - - - - - - - - <_ProjectFileVersion>14.0.25123.0 - - - $(SolutionDir)$(Configuration)\Graphviz\bin\ - NativeRecommendedRules.ruleset - true - - - $(SolutionDir)$(Configuration)\Graphviz\bin\ - AllRules.ruleset - true - - - - Disabled - - - $(SolutionDir)lib;%(AdditionalIncludeDirectories) - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - Level4 - EditAndContinue - true - 4996 - - - true - Windows - - MachineX86 - - - - - - - $(SolutionDir)lib;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - Level4 - true - 4996 - - - - - No - Windows - true - true - - MachineX86 - - - - - - - - - \ No newline at end of file diff --git a/cmd/dotty/dotty.vcxproj.filters b/cmd/dotty/dotty.vcxproj.filters deleted file mode 100644 index c72f434bf..000000000 --- a/cmd/dotty/dotty.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - \ No newline at end of file diff --git a/configure.ac b/configure.ac index 267eb72df..c600016d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2715,7 +2715,6 @@ AC_CONFIG_FILES(Makefile cmd/lefty/dot2l/Makefile cmd/lefty/examples/Makefile cmd/lefty/Makefile - cmd/dotty/Makefile cmd/smyrna/Makefile cmd/gvmap/Makefile cmd/mingle/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index d49aae925..70fd90d3c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = info schema -pdf = dotguide.pdf dottyguide.pdf neatoguide.pdf libgraph/Agraph.pdf libguide/libguide.pdf +pdf = dotguide.pdf neatoguide.pdf libgraph/Agraph.pdf libguide/libguide.pdf html = build.html FAQ.html index.html winbuild.html pspdf.png char.html gdtclft.entities.example.png todo.html internal_todo.html txt = Dot.ref latex_suggestions.txt fontfaq.txt addingLayout.txt diff --git a/graphviz.sln b/graphviz.sln index 02ca112a5..f1156be56 100644 --- a/graphviz.sln +++ b/graphviz.sln @@ -119,8 +119,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tred", "cmd\tools\tred.vcxp {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotty", "cmd\dotty\dotty.vcxproj", "{863A7931-DC7C-47C4-94E6-3D053BFE771A}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unflatten", "cmd\tools\unflatten.vcxproj", "{0062B64B-88F1-4104-A063-3823925A7A34}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} diff --git a/redhat/graphviz.spec.fedora.in b/redhat/graphviz.spec.fedora.in index 5299521f7..a5b40da32 100644 --- a/redhat/graphviz.spec.fedora.in +++ b/redhat/graphviz.spec.fedora.in @@ -320,9 +320,7 @@ Graphviz commands with X11 dependencies %license COPYING %endif %doc COPYING AUTHORS CHANGELOG.md NEWS README -%{_bindir}/dotty %{_bindir}/vimdot -%{_mandir}/man1/dotty.1* %{_mandir}/man1/vimdot.1* %if %{GTK} %{_bindir}/smyrna diff --git a/rtest/test_tools.py b/rtest/test_tools.py index 84aa42bd8..3f756be4a 100644 --- a/rtest/test_tools.py +++ b/rtest/test_tools.py @@ -28,7 +28,6 @@ from gvtest import is_cmake, remove_xtype_warnings #pylint: disable=C0413 "dot", "dot2gxl", "dot_builtins", - "dotty", "edgepaint", "fdp", "gc", -- 2.40.0