remove build system support for 'dotty'

`dotty` is built on top of `lefty` which is deprecated and will be removed in a
future commit.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60778fc0b7792d88afc6087c39d9e909e601a398..10ce2da6e27081e70a41a541cadcfa6feeb882d8 100644 (file)
--- 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 a2d3faa26fc1858349a01d41fa98e48db6395e32..4831d62fd5efd66f6194e880e749c79030daf4e2 100644 (file)
--- 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 4c180930cc9c61b9dbe012290c65030498b8a044..fad1b941ed2224fedf801b314f1bee721609b59e 100644 (file)
--- 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 (file)
index 9084f79..0000000
--- 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 (file)
index da0495b..0000000
--- a/cmd/dotty/dotty.vcxproj
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{863A7931-DC7C-47C4-94E6-3D053BFE771A}</ProjectGuid>
-    <RootNamespace>dotty</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\Graphviz\bin\</OutDir>
-    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\Graphviz\bin\</OutDir>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <EnablePREfast>true</EnablePREfast>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention />
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader />
-      <WarningLevel>Level4</WarningLevel>
-      <EnablePREfast>true</EnablePREfast>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-      <GenerateDebugInformation>No</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention />
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="mswin32\dotty.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/cmd/dotty/dotty.vcxproj.filters b/cmd/dotty/dotty.vcxproj.filters
deleted file mode 100644 (file)
index c72f434..0000000
--- a/cmd/dotty/dotty.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="mswin32\dotty.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 267eb72dff9c4e0fe0f215bd1d1b342de9295e21..c600016d6af7c42a90fa88197d7dc7049989a864 100644 (file)
--- 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 d49aae925fd990bb5cc0780daebcddf4c839ab9f..70fd90d3c1e9231a50986ad29630e49253c1c738 100644 (file)
--- 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 02ca112a50dfbe6be13b78fe9134e0e0052b1700..f1156be56201ba0fe8a569de73b8ee101d028db3 100644 (file)
--- 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 5299521f736023e789f43af98f7fbe8c34bd0abb..a5b40da3248bafe086c811cdd462d8da88e19ab5 100644 (file)
--- 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 84aa42bd898b17b2f9c63932b8207cccdc2015ef..3f756be4a90dab5189bb3706141e30aab64c46c6 100644 (file)
--- 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",