From 1e0276f541a4261183a9d169787086523d1e4bff Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 2 Sep 2022 11:04:53 -0400 Subject: [PATCH] LibLocale+LibUnicode: Move generated CLDR data files to LibLocale folder They are still included into LibUnicode, but this moves their generated location to be under LibLocale. --- Meta/CMake/locale_data.cmake | 24 +++++++++---------- .../LibLocale/GenerateDateTimeFormatData.cpp | 4 ++-- .../LibLocale/GenerateLocaleData.cpp | 2 +- .../LibLocale/GenerateNumberFormatData.cpp | 4 ++-- .../LibLocale/GeneratePluralRulesData.cpp | 4 ++-- .../GenerateRelativeTimeFormatData.cpp | 2 +- .../LibUnicode/GenerateUnicodeData.cpp | 2 +- Userland/Libraries/CMakeLists.txt | 1 + Userland/Libraries/LibLocale/CMakeLists.txt | 8 +++++++ Userland/Libraries/LibUnicode/CMakeLists.txt | 12 ---------- 10 files changed, 30 insertions(+), 33 deletions(-) create mode 100644 Userland/Libraries/LibLocale/CMakeLists.txt diff --git a/Meta/CMake/locale_data.cmake b/Meta/CMake/locale_data.cmake index 2bd1210d2a..376691807f 100644 --- a/Meta/CMake/locale_data.cmake +++ b/Meta/CMake/locale_data.cmake @@ -40,24 +40,24 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) extract_path("${CLDR_PATH}" "${CLDR_ZIP_PATH}" "${CLDR_NUMBERS_SOURCE}/**" "${CLDR_NUMBERS_PATH}") extract_path("${CLDR_PATH}" "${CLDR_ZIP_PATH}" "${CLDR_UNITS_SOURCE}/**" "${CLDR_UNITS_PATH}") - set(DATE_TIME_FORMAT_DATA_HEADER LibUnicode/DateTimeFormatData.h) - set(DATE_TIME_FORMAT_DATA_IMPLEMENTATION LibUnicode/DateTimeFormatData.cpp) + set(DATE_TIME_FORMAT_DATA_HEADER LibLocale/DateTimeFormatData.h) + set(DATE_TIME_FORMAT_DATA_IMPLEMENTATION LibLocale/DateTimeFormatData.cpp) - set(LOCALE_DATA_HEADER LibUnicode/LocaleData.h) - set(LOCALE_DATA_IMPLEMENTATION LibUnicode/LocaleData.cpp) + set(LOCALE_DATA_HEADER LibLocale/LocaleData.h) + set(LOCALE_DATA_IMPLEMENTATION LibLocale/LocaleData.cpp) - set(NUMBER_FORMAT_DATA_HEADER LibUnicode/NumberFormatData.h) - set(NUMBER_FORMAT_DATA_IMPLEMENTATION LibUnicode/NumberFormatData.cpp) + set(NUMBER_FORMAT_DATA_HEADER LibLocale/NumberFormatData.h) + set(NUMBER_FORMAT_DATA_IMPLEMENTATION LibLocale/NumberFormatData.cpp) - set(PLURAL_RULES_DATA_HEADER LibUnicode/PluralRulesData.h) - set(PLURAL_RULES_DATA_IMPLEMENTATION LibUnicode/PluralRulesData.cpp) + set(PLURAL_RULES_DATA_HEADER LibLocale/PluralRulesData.h) + set(PLURAL_RULES_DATA_IMPLEMENTATION LibLocale/PluralRulesData.cpp) - set(RELATIVE_TIME_FORMAT_DATA_HEADER LibUnicode/RelativeTimeFormatData.h) - set(RELATIVE_TIME_FORMAT_DATA_IMPLEMENTATION LibUnicode/RelativeTimeFormatData.cpp) + set(RELATIVE_TIME_FORMAT_DATA_HEADER LibLocale/RelativeTimeFormatData.h) + set(RELATIVE_TIME_FORMAT_DATA_IMPLEMENTATION LibLocale/RelativeTimeFormatData.cpp) - set(LOCALE_META_TARGET_PREFIX LibUnicode_) + set(LOCALE_META_TARGET_PREFIX LibLocale_) - if (CMAKE_CURRENT_BINARY_DIR MATCHES ".*/LibUnicode") # Serenity build. + if (CMAKE_CURRENT_BINARY_DIR MATCHES ".*/LibLocale") # Serenity build. set(DATE_TIME_FORMAT_DATA_HEADER DateTimeFormatData.h) set(DATE_TIME_FORMAT_DATA_IMPLEMENTATION DateTimeFormatData.cpp) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp index ef502ec154..ec6fa40df5 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateDateTimeFormatData.cpp @@ -1768,11 +1768,11 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include +#include +#include #include #include -#include #include -#include namespace Unicode { )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp index 38f061ea86..8f3a12aca5 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp @@ -1102,10 +1102,10 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include +#include #include #include #include -#include namespace Unicode { )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp index 154d652999..d757295f7d 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateNumberFormatData.cpp @@ -806,10 +806,10 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include +#include +#include #include -#include #include -#include #include namespace Unicode { diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp index 9d55c2d63e..91bc18894b 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GeneratePluralRulesData.cpp @@ -460,10 +460,10 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer generator.append(R"~~~( #include +#include +#include #include -#include #include -#include #include namespace Unicode { diff --git a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp index 1cbb70061b..8bd858d20c 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateRelativeTimeFormatData.cpp @@ -202,10 +202,10 @@ static ErrorOr generate_unicode_locale_implementation(Core::Stream::Buffer #include #include #include +#include #include #include #include -#include namespace Unicode { )~~~"); diff --git a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp index 3bd8088476..0813b2e205 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp @@ -686,8 +686,8 @@ enum class @name@ : @underlying@ {)~~~"); #pragma once #include +#include #include -#include namespace Unicode { )~~~"); diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt index 56722c680c..df93ec9130 100644 --- a/Userland/Libraries/CMakeLists.txt +++ b/Userland/Libraries/CMakeLists.txt @@ -32,6 +32,7 @@ add_subdirectory(LibIPC) add_subdirectory(LibJS) add_subdirectory(LibKeyboard) add_subdirectory(LibLine) +add_subdirectory(LibLocale) add_subdirectory(LibM) add_subdirectory(LibMain) add_subdirectory(LibMarkdown) diff --git a/Userland/Libraries/LibLocale/CMakeLists.txt b/Userland/Libraries/LibLocale/CMakeLists.txt new file mode 100644 index 0000000000..4630c2fe45 --- /dev/null +++ b/Userland/Libraries/LibLocale/CMakeLists.txt @@ -0,0 +1,8 @@ +include(${SerenityOS_SOURCE_DIR}/Meta/CMake/locale_data.cmake) + +if (DEFINED LOCALE_DATA_SOURCES) + set(SOURCES ${LOCALE_DATA_SOURCES}) + serenity_lib(LibLocaleData localedata) + target_compile_options(LibLocaleData PRIVATE -g0 -Os -Wno-parentheses-equality) + target_link_libraries(LibLocaleData LibCore LibTimeZone) +endif() diff --git a/Userland/Libraries/LibUnicode/CMakeLists.txt b/Userland/Libraries/LibUnicode/CMakeLists.txt index 5cee8bf451..8bafca34ab 100644 --- a/Userland/Libraries/LibUnicode/CMakeLists.txt +++ b/Userland/Libraries/LibUnicode/CMakeLists.txt @@ -1,12 +1,4 @@ include(${SerenityOS_SOURCE_DIR}/Meta/CMake/unicode_data.cmake) -include(${SerenityOS_SOURCE_DIR}/Meta/CMake/locale_data.cmake) - -if (DEFINED LOCALE_DATA_SOURCES) - set(SOURCES ${LOCALE_DATA_SOURCES}) - serenity_lib(LibLocaleData localedata) - target_compile_options(LibLocaleData PRIVATE -g0 -Os -Wno-parentheses-equality) - target_link_libraries(LibLocaleData LibCore LibTimeZone) -endif() set(SOURCES CharacterTypes.cpp @@ -22,7 +14,3 @@ set(SOURCES serenity_lib(LibUnicode unicode) target_link_libraries(LibUnicode LibCore) target_compile_definitions(LibUnicode PRIVATE ENABLE_UNICODE_DATA=$) - -if (DEFINED LOCALE_DATA_SOURCES) - add_dependencies(LibUnicode LibLocaleData) -endif()