remove build system support for 'lneato'

`lneato` 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 8ea800479bf7d0157e7e95e94978edf02463a40e..60778fc0b7792d88afc6087c39d9e909e601a398 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +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
 
 ### Fixed
 

diff --git a/ci/tests.py b/ci/tests.py
index b097773b25fe78e57197afbf8ec1f10f22abe113..a2d3faa26fc1858349a01d41fa98e48db6395e32 100644 (file)
--- a/ci/tests.py
+++ b/ci/tests.py
@@ -78,7 +78,6 @@ def is_win64() -> bool:
   "gvpr",
   "gxl2dot",
   "gxl2gv",
-  "lneato",
   "mingle",
   "mm2gv",
   "neato",
@@ -108,7 +107,6 @@ def test_existence(binary: str):
     "gvmap",
     "gvmap.sh",
     "gxl2dot",
-    "lneato",
     "prune",
     "vimdot",
   ]

diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 2e7b7aaf7d86499f29f5a2228c2a63d66f6907ff..4c180930cc9c61b9dbe012290c65030498b8a044 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 lneato dotty gvmap gvedit mingle edgepaint
+SUBDIRS = dot tools gvpr dotty gvmap gvedit mingle edgepaint
 
 if WITH_LEFTY
 SUBDIRS += lefty

diff --git a/cmd/lneato/Makefile.am b/cmd/lneato/Makefile.am
deleted file mode 100644 (file)
index fdd66e9..0000000
--- a/cmd/lneato/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-pdfdir = $(pkgdatadir)/doc/pdf
-
-if WITH_X
-if WITH_WIN32
-bin_PROGRAMS = lneato
-else
-bin_SCRIPTS = lneato
-endif
-endif
-
-man_MANS = lneato.1
-if ENABLE_MAN_PDFS
-pdf_DATA = lneato.1.pdf
-
-if HAVE_PS2PDF
-pdf = $(pdf_DATA)
-else
-pdf = ERROR_NO_PS2PDF
-endif
-else
-pdf =
-endif
-
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/lib
-
-AM_CFLAGS = -DLNEATO
-if WITH_WIN32
-lneato_SOURCES = ${top_srcdir}/cmd/dotty/mswin32/dotty.c
-lneato_LDADD = -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32
-else
-lneato: ${top_srcdir}/cmd/lneato/lneato.sh
-       cp ${top_srcdir}/cmd/lneato/lneato.sh lneato
-       chmod +x lneato
-endif
-
-if ENABLE_MAN_PDFS
-if HAVE_PS2PDF
-lneato.1.pdf: lneato.1.ps
-       @PS2PDF@ $<
-
-lneato.1.ps: $(srcdir)/lneato.1
-       @GROFF@ -Tps -man $< >$@
-endif
-endif
-
-EXTRA_DIST = $(man_MANS) $(pdf) lneato.bsh lneato.ksh lneato.sh \
-       mswin32 lneato.vcxproj*
-
-DISTCLEANFILES = lneato $(pdf) lneato.1.ps

diff --git a/cmd/lneato/lneato.vcxproj b/cmd/lneato/lneato.vcxproj
deleted file mode 100644 (file)
index 3456b37..0000000
--- a/cmd/lneato/lneato.vcxproj
+++ /dev/null
@@ -1,97 +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>{23D7A1F0-621B-474A-A45F-2490C9935C1E}</ProjectGuid>
-    <RootNamespace>lneato</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>$(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>$(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\lneato.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/cmd/lneato/lneato.vcxproj.filters b/cmd/lneato/lneato.vcxproj.filters
deleted file mode 100644 (file)
index ace087a..0000000
--- a/cmd/lneato/lneato.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\lneato.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 02e15c65741d88faa7dafece59efd44acd8f31a7..267eb72dff9c4e0fe0f215bd1d1b342de9295e21 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/lneato/Makefile
        cmd/dotty/Makefile
        cmd/smyrna/Makefile
        cmd/gvmap/Makefile

diff --git a/graphviz.sln b/graphviz.sln
index 564a5fef2f10f2c10d8fd970966a76a16690ad2e..02ca112a50dfbe6be13b78fe9134e0e0052b1700 100644 (file)
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -121,8 +121,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tred", "cmd\tools\tred.vcxp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotty", "cmd\dotty\dotty.vcxproj", "{863A7931-DC7C-47C4-94E6-3D053BFE771A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lneato", "cmd\lneato\lneato.vcxproj", "{23D7A1F0-621B-474A-A45F-2490C9935C1E}"
-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 c614c59ef1e31aeb85554ee5bdfc847cc28aa0ef..5299521f736023e789f43af98f7fbe8c34bd0abb 100644 (file)
--- a/redhat/graphviz.spec.fedora.in
+++ b/redhat/graphviz.spec.fedora.in
@@ -320,10 +320,8 @@ Graphviz commands with X11 dependencies
 %license COPYING
 %endif
 %doc COPYING AUTHORS CHANGELOG.md NEWS README
-%{_bindir}/lneato
 %{_bindir}/dotty
 %{_bindir}/vimdot
-%{_mandir}/man1/lneato.1*
 %{_mandir}/man1/dotty.1*
 %{_mandir}/man1/vimdot.1*
 %if %{GTK}

diff --git a/rtest/test_tools.py b/rtest/test_tools.py
index efc402fd1d155917b7db49e441208b1ec0c93eea..84aa42bd898b17b2f9c63932b8207cccdc2015ef 100644 (file)
--- a/rtest/test_tools.py
+++ b/rtest/test_tools.py
@@ -45,7 +45,6 @@ from gvtest import is_cmake, remove_xtype_warnings #pylint: disable=C0413
     "gvpr",
     "gxl2dot",
     "gxl2gv",
-    "lneato",
     "mingle",
     "mm2gv",
     "neato",