Merge pull request #113 from data-man/ucd_17

Update to Unicode 17.0.0

Author: christianparpart

.github/workflows/checks.yml

@@ -19,7 +19,7 @@ concurrency:
 jobs:
   check_PR_TODOs:
     name: "Check PR-TODOs"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v3
     - name: "Checking for open PR-related TODO items"
@@ -29,7 +29,7 @@ jobs:
 
   check_clang_format:
     name: "Check C++ style"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: Install clang

CMakeLists.txt

@@ -70,11 +70,11 @@ if(LIBUNICODE_TESTING)
 endif()
 
 # ----------------------------------------------------------------------------
-set(LIBUNICODE_UCD_VERSION "16.0.0" CACHE STRING "libunicode: Unicode version")
+set(LIBUNICODE_UCD_VERSION "17.0.0" CACHE STRING "libunicode: Unicode version")
 set(LIBUNICODE_UCD_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_ucd" CACHE PATH "Path to directory for downloaded files & extracted directories.")
 
 set(LIBUNICODE_UCD_ZIP_DOWNLOAD_URL "https://www.unicode.org/Public/${LIBUNICODE_UCD_VERSION}/ucd/UCD.zip")
-set(LIBUNICODE_UCD_MD5 "bdd823cbd37c376633d6737a12281233")
+set(LIBUNICODE_UCD_MD5 "aa35d214bbc24b3b8d07b96bb9db7dca")
 set(LIBUNICODE_UCD_ZIP_FILE "${LIBUNICODE_UCD_BASE_DIR}/ucd-${LIBUNICODE_UCD_VERSION}.zip")
 set(LIBUNICODE_UCD_DIR "${LIBUNICODE_UCD_BASE_DIR}/ucd-${LIBUNICODE_UCD_VERSION}" CACHE PATH "Path to UCD directory.")
 

src/libunicode/CMakeLists.txt

@@ -184,6 +184,7 @@ target_link_libraries(unicode PUBLIC unicode::ucd)
 
 add_executable(unicode_tablegen tablegen.cpp)
 set_target_properties(unicode_tablegen PROPERTIES CMAKE_BUILD_TYPE Release)
+target_compile_definitions(unicode_tablegen PRIVATE LIBUNICODE_UCD_VERSION="${LIBUNICODE_UCD_VERSION}")
 target_link_libraries(unicode_tablegen PRIVATE unicode::loader)
 
 

src/libunicode/codepoint_properties_loader.cpp

@@ -47,6 +47,7 @@ namespace
             pair { "14.0"sv, Age::V14_0 },
             pair { "15.0"sv, Age::V15_0 },
             pair { "16.0"sv, Age::V16_0 },
+            pair { "17.0"sv, Age::V17_0 },
             pair { "1.1"sv, Age::V1_1 },
             pair { "2.0"sv, Age::V2_0 },
             pair { "2.1"sv, Age::V2_1 },

src/libunicode/tablegen.cpp

@@ -189,7 +189,8 @@ int main(int argc, char const* argv[])
 {
     // clang-format off
     int i = 1;
-    auto const ucdDataDirectory = consumeParamterOrDefault(i, argc, argv, "_ucd/ucd-15.0.0");
+    static const std::string ucdDataDirectoryDefault = "_ucd/ucd-"s + LIBUNICODE_UCD_VERSION;
+    auto const ucdDataDirectory = consumeParamterOrDefault(i, argc, argv, ucdDataDirectoryDefault.c_str());
     auto const cxxHeaderFileName = consumeParamterOrDefault(i, argc, argv, "codepoint_properties_data.h");
     auto const cxxImplementationFileName = consumeParamterOrDefault(i, argc, argv, "codepoint_properties_data.cpp");
     auto const cxxNamesFileName = consumeParamterOrDefault(i, argc, argv, "codepoint_names_data.cpp");