From c8c9fe0c1581e3f57616999d9ee5c62bda173574 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 14 Feb 2021 10:43:17 -0800
Subject: [PATCH] remove RxSpencer dependency

Closes #1919.
---
 .gitignore                |  4 ----
 CHANGELOG.md              |  2 ++
 CMakeLists.txt            |  1 -
 cmake/FindRxSpencer.cmake | 11 -----------
 lib/gvc.vcxproj           |  4 ++--
 lib/gvc/CMakeLists.txt    |  2 --
 6 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 cmake/FindRxSpencer.cmake

diff --git a/.gitignore b/.gitignore
index 3076343db..3eef40a21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,9 +22,6 @@ CMakeCache.txt
 /VERSION
 /COLLECTION
 
-lib/rxspencer/re
-lib/rxspencer/*.oo
-
 cmd/gvedit/moc_csettings.cpp
 cmd/gvedit/moc_imageviewer.cpp
 cmd/gvedit/moc_mainwindow.cpp
@@ -100,7 +97,6 @@ cmd/gvedit/attrs.txt
 cmd/gvedit/.qmake.stash
 cmd/gvedit/moc_predefs.h
 cmd/smyrna/gui/.dirstamp
-lib/rxspencer/regex.h
 tclpkg/**/pkgIndex.tcl
 tclpkg/gv/runtime.h
 tclpkg/gv/SWIGTYPE*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4662bfb33..3fc557de3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - The edges in JSON output are ordered now !1728
+- remove regex usage #1919
+- RxSpencer is no longer a dependency on Windows
 
 ### Fixed
 - Fix gvpr -? to actually print usage and exit non-zero
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a67cf784a..bf46cb6fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,6 @@ endif ()
 
 if (WIN32)
     # Find Windows specific dependencies
-    find_package(RxSpencer REQUIRED)
 
     # Find DLLs on Windows
     find_program(EXPAT_RUNTIME_LIBRARIES NAMES libexpat.dll expat.dll)
diff --git a/cmake/FindRxSpencer.cmake b/cmake/FindRxSpencer.cmake
deleted file mode 100644
index 20f7962a1..000000000
--- a/cmake/FindRxSpencer.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-find_path(RxSpencer_INCLUDE_DIR regex.h)
-find_library(RxSpencer_LIBRARY NAMES rxspencer)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(RxSpencer DEFAULT_MSG
-    RxSpencer_LIBRARY
-    RxSpencer_INCLUDE_DIR
-)
-
-set(RxSpencer_INCLUDE_DIRS ${RxSpencer_INCLUDE_DIR})
-set(RxSpencer_LIBRARIES ${RxSpencer_LIBRARY})
diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj
index 9620dee2d..32ebc71d2 100644
--- a/lib/gvc.vcxproj
+++ b/lib/gvc.vcxproj
@@ -69,7 +69,7 @@
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>$(SolutionDir)lib\gvc\gvc.def</ModuleDefinitionFile>
-      <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>win_bison -dy -Wno-yacc common\htmlparse.y -o common\htmlparse.c
@@ -100,7 +100,7 @@ awk -f $(SolutionDir)awk\colortbl.awk color_lib &gt; common\colortbl.h</Command>
       <DataExecutionPrevention />
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>$(SolutionDir)lib\gvc\gvc.def</ModuleDefinitionFile>
-      <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;rxspencer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cdt.lib;cgraph.lib;xml2.lib;expat.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
       <Command>win_bison -dy -Wno-yacc common\htmlparse.y -o common\htmlparse.c
diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index 138055850..da70b122c 100644
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -46,7 +46,6 @@ target_include_directories(gvc PRIVATE
     ${GRAPHVIZ_LIB_DIR}/common
     ${GRAPHVIZ_LIB_DIR}/pathplan
     ${LTDL_INCLUDE_DIRS}
-    ${RxSpencer_INCLUDE_DIRS}
 )
 
 target_link_libraries(gvc PRIVATE
@@ -62,7 +61,6 @@ target_link_libraries(gvc PUBLIC
     pathplan
     xdot
     ${EXPAT_LIBRARIES}
-    ${RxSpencer_LIBRARIES}
     ${ZLIB_LIBRARIES}
     ${MATH_LIB}
 )
-- 
2.40.0