version 0.1.58

- recognise ICANN's .internal
- various CMake improvements
- underlying work

Author: devongarde

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.19)
 cmake_policy (SET CMP0074 NEW)
-project (ssc VERSION 0.1.57 DESCRIPTION "static site checker" LANGUAGES CXX HOMEPAGE_URL "https://ssc.lu")
+project (ssc VERSION 0.1.58 DESCRIPTION "static site checker" LANGUAGES CXX HOMEPAGE_URL "https://ssc.lu")
 
 set (CMAKE_CXX_STANDARD 17)
 
@@ -11,22 +11,18 @@ set (S ${R}/sauce)
 set (T ${R}/toast)
 set (TT ${T}/ssc-test)
 set (TEA ${R}/tea)
-
-if (NOT DEFINED prefix)
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        set (prefix "/opt/local")
-    elseif ()
-        set (prefix "/usr/local")
-    endif ()
-endif ()
-
+set (DD "${DESTDIR}${CMAKE_INSTALL_PREFIX}")
+set (INCS "${DD}/include" "${CMAKE_INSTALL_PREFIX}/include")
+set (LIBS "${DD}/lib" "${CMAKE_INSTALL_PREFIX}/lib")
 set (BV "1.75")
+set (HV "1.7")
+set (CFT "Debug;Release")
 
 # if using a non-thread safe version of SSL, add this compiler definition
 # CURL_SSL_NOT_THREADSAFE
 
 # Debug / Release (https://riptutorial.com/cmake/example/26702/setting-a-release-debug-configuration)
-set (CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
+set (CMAKE_CONFIGURATION_TYPES ${CFT} CACHE STRING "Configs" FORCE)
 
 if (DEFINED CMAKE_BUILD_TYPE)
   set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES})
@@ -46,22 +42,17 @@ set (BREGEX "regex")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
     message (FATAL_ERROR "Use the included Visual Studio solutions to build under Windows (https://visualstudio.microsoft.com/downloads/)")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    set (DOCU "${prefix}/share/doc/ssc")
-    set (D "${prefix}/bin")
-    set (INC "${prefix}/include/" "${prefix}/include/hunspell")
-    set (LD "${prefix}/lib")
+    set (DOCU "${DD}/share/doc/ssc")
+    set (D "${DD}/bin")
+    set (INC ${INCS})
+    set (LD ${LIBS})
     target_compile_definitions (ssc-test PRIVATE UNIX NO_PCF_STR)
     set (BUILD_OS ${CMAKE_SYSTEM})
     if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER_EQUAL "7.0")
-        if (DEFINED ${HUNSPELL_USE_STATIC_LIBS})
-        set (LIB "${prefix}/lib/libhunspell-1.7.a")
-        else ()
-        set (LIB "${prefix}/lib/libhunspell-1.7.so.1.0")
-        endif ()
         target_compile_definitions (ssc PRIVATE UNIX OS_VER="${BUILD_OS}" OBSD NO_PCF_STR HUNSPELL)
     elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.8")
-        set (LIB "${prefix}/lib/libhunspell-1.6.a")
         set (BV "1.67")
+        set (HV "1.6")
         set (NJ "1")
         target_compile_definitions (ssc PRIVATE UNIX OS_VER="${BUILD_OS}" OBSD NO_PCF_STR NO_JSONIC HUNSPELL)
     elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.9")
@@ -71,15 +62,14 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
     else ()
         message (WARNING "untested version of OpenBSD")
         set (BUILD_OS ${CMAKE_SYSTEM_NAME})
-        target_compile_definitions (ssc PRIVATE UNIX OS_VER="${BUILD_OS}" OBSD OMG NO_PCF_STR NO_JSONIC)
+        target_compile_definitions (ssc PRIVATE UNIX OS_VER="${BUILD_OS}" OBSD OMG NO_PCF_STR NO_JSONIC NOSPELL)
         set (NJ "1")
     endif ()
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    set (DOCU "${prefix}/share/doc/ssc")
-    set (D "${prefix}/bin")
-    set (INC "${prefix}/include/" "${prefix}/include/hunspell")
-    set (LD "${prefix}/lib")
-    set (LIB "${prefix}/lib/libhunspell-1.7.so.0")
+    set (DOCU "${DD}/share/doc/ssc")
+    set (D "${DD}/bin")
+    set (INC ${INC})
+    set (LD ${LIBS})
     set (BUILD_OS ${CMAKE_SYSTEM})
     target_compile_definitions (ssc-test PRIVATE UNIX NO_PCF_STR)
     set (NO_CURL "1")
@@ -94,7 +84,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
     else ()
         set (BUILD_OS "FreeBSD?")
         message (WARNING "untested version of FreeBSD")
-        target_compile_definitions (ssc PRIVATE UNIX OS_VER="${BUILD_OS}" FBSD OMG NO_PCF_STR NO_JSONIC HUNSPELL NOCURL)
+        target_compile_definitions (ssc PRIVATE UNIX OS_VER="${BUILD_OS}" FBSD OMG NO_PCF_STR NO_JSONIC NOSPELL NOCURL)
         set (NJ "1")
     endif ()
     elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -129,46 +119,39 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
         set (NJ "1")
     endif ()
     set (BV "1.67")
-    set (D "${prefix}/bin")
-    set (DOCU "${prefix}/../share/doc/ssc")
-    set (INC "/usr/include/" "/usr/local/include/" "/usr/include/hunspell" "/usr/include/x86_64-linux-gnu/")
-    set (LD "/usr/lib64/")
-    set (LIB "/usr/lib64/libhunspell-1.7.so")
+    set (D "${DD}/bin")
+    set (DOCU "${DD}/../share/doc/ssc")
+    set (INC ${INC} "/usr/include/" "/usr/local/include/" "/usr/include/hunspell" "/usr/include/x86_64-linux-gnu/")
+    set (LD ${LIBS} "/usr/lib64/")
     set (Boost_USE_STATIC_LIBS OFF)
     if (${LSB_RELEASE_ID_SHORT} MATCHES "Ubuntu")
-        set (LD "/usr/lib/x86_64-linux-gnu/")
-        set (LIB "/usr/lib/x86_64-linux-gnu/libhunspell-1.7.so")
-        elseif (${LSB_RELEASE_ID_SHORT} MATCHES "CentOSStream")
+        set (LD ${LIBS} "/usr/lib64/" "/usr/lib/x86_64-linux-gnu/")
+    elseif (${LSB_RELEASE_ID_SHORT} MATCHES "CentOSStream")
         if (${LSB_RELEASE_VER_SHORT} MATCHES "8")
         set (BV "1.66")
-        set (LIB "/usr/lib64/libhunspell-1.6.so")
+        set (HV "1.6")
         endif ()
     endif ()
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set (D "${prefix}/bin")
-    set (DOCU "${prefix}/share/doc/ssc")
-    set (INC "/usr/local/include/" "${prefix}/include/" "${prefix}/include/hunspell")
-    set (LD "/usr/local/lib" "${prefix}/lib")
+    set (D "${DD}/bin")
+    set (DOCU "${DD}/share/doc/ssc")
+    set (INC ${INC} "/usr/local/include/")
+    set (LD ${LIBS} "/usr/local/lib")
     set (Boost_USE_STATIC_LIBS OFF)
     target_compile_definitions (ssc-test PRIVATE UNIX)
     if (${CMAKE_SYSTEM} MATCHES "Darwin-23")
         set (BUILD_OS "Sonoma")
-        set (LIB "${prefix}/lib/libhunspell-1.7.a")
         target_compile_definitions (ssc PRIVATE OS_VER="${BUILD_OS}" UNIX DARWIN HUNSPELL CLEAN_SHAREDPTR_ARRAY ORDERED)
     elseif (${CMAKE_SYSTEM} MATCHES "Darwin-22")
         set (BUILD_OS "Ventura")
-        set (LIB "${prefix}/lib/libhunspell-1.7.a")
         target_compile_definitions (ssc PRIVATE OS_VER="${BUILD_OS}" UNIX DARWIN HUNSPELL CLEAN_SHAREDPTR_ARRAY ORDERED)
     elseif (${CMAKE_SYSTEM} MATCHES "Darwin-21")
         set (BUILD_OS "Monterey")
-        set (LIB "${prefix}/lib/libhunspell-1.7.a")
         target_compile_definitions (ssc PRIVATE OS_VER="${BUILD_OS}" UNIX DARWIN HUNSPELL CLEAN_SHAREDPTR_ARRAY)
     elseif (${CMAKE_SYSTEM} MATCHES "Darwin-20")
         set (BUILD_OS "Big Sur")
-        set (LIB "${prefix}/lib/libhunspell-1.7.a")
         target_compile_definitions (ssc PRIVATE OS_VER="${BUILD_OS}" UNIX DARWIN HUNSPELL)
     elseif (${CMAKE_SYSTEM} MATCHES "Darwin-19")
-        set (LIB "${prefix}/lib/libhunspell-1.7.a")
         set (BUILD_OS "Catalina")
         target_compile_definitions (ssc PRIVATE OS_VER="${BUILD_OS}" UNIX DARWIN NO_JSONIC HUNSPELL)
         set (NJ "1")
@@ -202,22 +185,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
         set (BREGEX "")
         target_compile_definitions (ssc PRIVATE OS_VER="${BUILD_OS}" UNIX DARWIN FUDDYDUDDY NO_JSONIC NOSPELL NOMERGE NO_GSL NO_FALLTHROUGH NO_BOOST_REGEX ELDERLY_CPP)
         set (NJ "1")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-13")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Mavericks")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-12")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Mountain Lion")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-11")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Lion")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-10")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Snow Leopard")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-9")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Leopard")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-8")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Tiger")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-7")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Panther")
-    elseif (${CMAKE_SYSTEM} MATCHES "Darwin-6")
-        message (FATAL_ERROR "ssc requires a more recent C++ dialect than that available in Jaguar")
+    elseif (${CMAKE_SYSTEM_VERSION} VERSION_LESS_EQUAL "13")
+        message (FATAL_ERROR "apologies, but ssc needs a less ancient operating system")
     else ()
         message (WARNING "unknown, untested MacOS")
         set (BUILD_OS "Darwin?")
@@ -241,39 +210,33 @@ else ()
     set (NJ "1")
 endif ()
 
-target_link_libraries (ssc PRIVATE ${LIB})
-
 message (${BUILD_OS})
 
 set (Boost_USE_STATIC_LIBS OFF)
 set (Boost_USE_MULTI_THREADED ON)
 if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
-set (ICU_DEBUG ON)
-set (Boost_USE_DEBUG_LIBS ON)
-set (Boost_USE_DEBUG_RUNTIME ON)
+    set (ICU_DEBUG ON)
+    set (Boost_USE_DEBUG_LIBS ON)
+    set (Boost_USE_DEBUG_RUNTIME ON)
 else ()
-set (ICU_DEBUG ON)
-set (Boost_USE_DEBUG_LIBS OFF)
-set (Boost_USE_DEBUG_RUNTIME OFF)
+    set (ICU_DEBUG ON)
+    set (Boost_USE_DEBUG_LIBS OFF)
+    set (Boost_USE_DEBUG_RUNTIME OFF)
 endif ()
 
 if (${NJ})
-  find_package (Boost ${BV} REQUIRED COMPONENTS system chrono date_time filesystem locale program_options thread ${BREGEX})
+    find_package (Boost ${BV} REQUIRED COMPONENTS system chrono date_time filesystem locale program_options thread ${BREGEX})
 else ()
-  find_package (Boost ${BV} REQUIRED COMPONENTS system chrono date_time filesystem json locale program_options thread ${BREGEX})
+    find_package (Boost ${BV} REQUIRED COMPONENTS system chrono date_time filesystem json locale program_options thread ${BREGEX})
 endif ()
 
 find_package (ICU 60.0 REQUIRED COMPONENTS dt in io tu uc)
 find_package (Iconv REQUIRED)
 
-if (${NO_CURL} MATCHES "1")
-# be nice is NOT worked for me, but ...
-message ("-- straight")
-else ()
-# https://cmake.org/cmake/help/latest/module/FindCURL.html
-message ("-- CuRLy")
-set (CURL_USE_STATIC_LIBS OFF)
-find_package (CURL REQUIRED FILE HTTP HTTPS SSL)
+if (NOT DEFINED ${NO_CURL})
+    # https://cmake.org/cmake/help/latest/module/FindCURL.html
+    set (CURL_USE_STATIC_LIBS OFF)
+    find_package (CURL REQUIRED FILE HTTP HTTPS SSL)
 endif ()
 
 # better to list the build files in one place (here) rather than litter all the source directories with a gadzillion untidy wee files
@@ -417,6 +380,7 @@ if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
       target_compile_options (ssc PRIVATE "-g;-O0;-fvisibility=hidden;-fvisibility-inlines-hidden;-Wall;-Wextra;-Wno-dangling-else;-Wno-write-strings;-Wno-deprecated-declarations" ${IMPLICITFALL} ${NOINDENTLIE} ${TEMPLATEDEPTH})
   endif ()
 else ()
+  message ("-- release")
   target_compile_definitions (ssc-test PRIVATE NDEBUG)
   target_compile_definitions (ssc PRIVATE NDEBUG)
   target_compile_options (ssc-test PRIVATE "-fvisibility=hidden;-fvisibility-inlines-hidden;-Wall;-Wextra;-Wno-dangling-else;-Wno-write-strings;-Wno-unused-result;-Wno-unused-parameter;-Wno-deprecated-declarations" ${IMPLICITFALL} ${NOINDENTLIE})
@@ -430,9 +394,7 @@ target_link_libraries (ssc PRIVATE Boost::system)
 target_link_libraries (ssc PRIVATE Boost::chrono)
 target_link_libraries (ssc PRIVATE Boost::date_time)
 target_link_libraries (ssc PRIVATE Boost::filesystem)
-if (${NJ})
-# it'd be nice is NOT worked for me, but ...
-else ()
+if (NOT DEFINED ${NJ})
   message ("-- jsonic")
   target_link_libraries (ssc PRIVATE Boost::json)
 endif ()
@@ -442,24 +404,27 @@ target_link_libraries (ssc PRIVATE Boost::thread)
 target_link_libraries (ssc PRIVATE pthread)
 target_link_libraries (ssc PRIVATE ${ICU_LIBRARIES})
 
-if (${NO_CURL} MATCHES "1")
-# it'd be nice if NOT worked for me, but ...
-else ()
-target_link_libraries (ssc PRIVATE ${CURL_LIBRARIES})
+if (NOT DEFINED ${NO_CURL})
+  target_link_libraries (ssc PRIVATE ${CURL_LIBRARIES})
 endif ()
 
-install (TARGETS ssc DESTINATION ${D})
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt ${CMAKE_CURRENT_SOURCE_DIR}/gen.txt ${CMAKE_CURRENT_SOURCE_DIR}/LICENCE.txt ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt DESTINATION ${DOCU})
+if (NOT DEFINED NOSPELL)
+  find_library (HUN NAMES "libhunspell-${HV}" "hunspell-${HV}" "libhunspell" "hunspell-${HV}" HINTS ${LB} PATH_SUFFIXES "/hunspell" DOC "hunspell-${HV}" REQUIRED)
+  message ("-- hunspell: " ${HUN})
+  target_link_libraries (ssc PRIVATE ${HUN})
+endif ()
+
+install (TARGETS ssc DESTINATION ${D} CONFIGURATIONS ${CFT})
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt ${CMAKE_CURRENT_SOURCE_DIR}/gen.txt ${CMAKE_CURRENT_SOURCE_DIR}/LICENCE.txt ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt DESTINATION ${DOCU} CONFIGURATIONS ${CFT})
 
 # uninstall target ( https://gitlab.kitware.com/cmake/community/-/wikis/FAQ#can-i-do-make-uninstall-with-cmake )
 if (NOT TARGET uninstall)
   configure_file (
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    "${TEA}/cmake_uninstall.cmake.in"
+    "${TEA}/cmake_uninstall.cmake"
     IMMEDIATE @ONLY)
-
   add_custom_target (uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+    COMMAND ${CMAKE_COMMAND} -P ${TEA}/cmake_uninstall.cmake)
 endif()
 
 enable_testing ()

README.txt

@@ -1,6 +1,6 @@
 Static Site Checker
 (an opinionated HTML nitpicker)
-version 0.1.57
+version 0.1.58
 (c) 2020-2024 dylan harris
 see LICENCE.txt and LICENSE.txt for copyright & licence notice
 https://ssc.lu/

install_manifest.txt

@@ -1,6 +0,0 @@
-/opt/local/bin/ssc
-/opt/local/share/doc/ssc/README.txt
-/opt/local/share/doc/ssc/gen.txt
-/opt/local/share/doc/ssc/LICENCE.txt
-/opt/local/share/doc/ssc/LICENSE.txt
-/opt/local/share/doc/ssc/usage.txt

recipe/heater/main/enum.h

@@ -5524,8 +5524,8 @@ typedef enum
         tld_hyundai,
     tld_ibm, tld_ice, tld_icu, tld_id, tld_ie, tld_ieee, tld_ifm, tld_ikano, tld_il, tld_im, tld_imdb, tld_immo, tld_immobilien, tld_in,
         tld_inc, tld_industries, tld_indy, tld_infiniti, tld_info, tld_ing, tld_ink, tld_institute, tld_insurance, tld_insure, tld_int, tld_intel,
-        tld_international, tld_internet, tld_intuit, tld_intranet, tld_invalid, tld_investments, tld_io, tld_ipiranga, tld_iq, tld_ir, tld_irish, tld_is, tld_iselect,
-        tld_ist, tld_istanbul, tld_it, tld_itau, tld_itv, tld_iveco,
+        tld_internal, tld_international, tld_internet, tld_intuit, tld_intranet, tld_invalid, tld_investments, tld_io, tld_ipiranga, tld_iq, tld_ir,
+        tld_irish, tld_is, tld_iselect, tld_ist, tld_istanbul, tld_it, tld_itau, tld_itv, tld_iveco,
     tld_jaguar, tld_java, tld_jcb, tld_jcp, tld_je, tld_jeep, tld_jetzt, tld_jewelry, tld_jm, tld_jo, tld_jobs, tld_joburg, tld_joy, tld_jp,
         tld_jpmorgan, tld_juegos, tld_juniper,
     tld_kaufen, tld_kddi, tld_ke, tld_kerryhotels, tld_kerrylogistics, tld_kerryproperties, tld_kfh, tld_kg, tld_kh, tld_ki, tld_kia,

recipe/heater/main/include.h

@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 1
-#define VERSION_RELEASE 57
-#define VERSION_STRING "0.1.57"
+#define VERSION_RELEASE 58
+#define VERSION_STRING "0.1.58"
 
 #define NBSP " "
 #define COPYRIGHT_SYMBOL "(c)"
@@ -396,6 +396,14 @@ BOOST_STATIC_ASSERT (BOOST_MAJOR == 1);
 #define GSL_OWNER(TYPE) TYPE
 #endif // NO_GSL
 
+#ifdef HUNSPELL
+#ifdef NOHUNSUB
+#include <hunspell.hxx>
+#else // NOHUNSUB
+#include <hunspell/hunspell.hxx>
+#endif // NOHUNSUB
+#endif // HUNSPELL
+
 #ifndef NO_FALLTHROUGH
 #define FALLTHROUGH [[fallthrough]]
 #else // NO_FALLTHROUGH

recipe/httpd/htdocs/index.html

@@ -70,7 +70,7 @@ <h2>introduction</h2>
 
 <P>
 If you want to try it,
-<a href="src/ssc-v0.1.57.tgz" type="application/gzip">here&rsquo;s the current source</a>. The build instructions follow.
+<a href="src/ssc-v0.1.58.tgz" type="application/gzip">here&rsquo;s the current source</a>. The build instructions follow.
 </P>
 
 <P>
@@ -2285,14 +2285,31 @@ <h3>notes</h3>
 <section id="sauce">
 <h2>source</h2>
 
-<h3>0.1.57</h3>
+<h3>0.1.58</h3>
 
 <ul>
 <li>
-add CMake uninstall target
+recognise ICANN's .internal
+</li>
+<li>
+various CMake improvements
+</li>
+<li>
+underlying work
+</li>
+<li>
+<A href="src/ssc-v0.1.58.tgz" type="application/gzip">download source</a>
 </li>
 <li>
-have CMake respect &dollar;&lbrace;prefix&rbrace;
+released <time itemprop="datePublished" class="dt-published" datetime="2024-02-29">24 2 29</time>
+</li>
+</ul>
+
+<h3>0.1.57</h3>
+
+<ul>
+<li>
+add CMake uninstall target
 </li>
 <li>
 <A href="src/ssc-v0.1.57.tgz" type="application/gzip">download source</a>
@@ -2302,7 +2319,6 @@ <h3>0.1.57</h3>
 </li>
 </ul>
 
-
 <h3>0.1.56</h3>
 
 <ul>