remove RxSpencer dependency

Closes #1919.

diff --git a/.gitignore b/.gitignore
index 3076343db27707ee6c61d3e0a79d2c8b1009304f..3eef40a217a86783862d17b649b7681b2242ce66 100644 (file)
--- 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 4662bfb33652e43baeedbe02fb95e7e20eeaf105..3fc557de36b516df1e26f23215433265ae56ce70 100644 (file)
--- 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 a67cf784a08b57636ba1a807588a0b0157a78462..bf46cb6fbbeab9defef1af9bd0da1ee44da12ac6 100644 (file)
--- 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 (file)
index 20f7962..0000000
--- 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 9620dee2dbd9c5d5c5c2d86649497d1d2fedf427..32ebc71d2e1aaa2edced92c644e6fb2340fdc905 100644 (file)
--- 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 1380558503fe9b0bb4e6f253ce60a50bfdda6ab4..da70b122cbbbdd542dba7af34f1c6c5b03cda494 100644 (file)
--- 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}
 )