RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:47:35 +00:00
Code Issues Activity Actions

Meta: Move UCD/CLDR/TZDB downloaded artifacts to Build/caches

Browse source 
They currently reside under Build/<arch>, meaning that they would be
redownloaded for each architecture/toolchain build combo. Move them to a
location that can be re-used for all builds.
This commit is contained in:
Timothy Flynn 2022-11-25 21:03:42 -05:00 • committed by Tim Flynn
parent 186accb81d
commit 2334b4cebd
13 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Meta/CMake/Superbuild/CMakeLists.txt
View file

@ -44,6 +44,9 @@ if(NOT SERENITY_TOOLCHAIN STREQUAL "GNU")
endif()
set(SERENITY_BUILD_DIR "${PROJECT_BINARY_DIR}/../${SERENITY_ARCH}${SERENITY_BUILD_DIR_SUFFIX}")
# Location to cache artifacts downloaded during the build.
file(REAL_PATH "${PROJECT_BINARY_DIR}/../caches" SERENITY_CACHE_DIR)
# Pkgconf incorrectly discards a sysroot if it doesn't match the start of the path to the
# library file. To avoid that, resolve our sysroot into an absolute and canonical path
# that matches pkgconf's result for resolving the library file.
@ -97,9 +100,7 @@ ExternalProject_Add(
EXCLUDE_FROM_ALL YES
CMAKE_CACHE_ARGS
"-DCMAKE_INSTALL_PREFIX:STRING=<INSTALL_DIR>"
"-DTZDB_PATH:STRING=${SERENITY_BUILD_DIR}/TZDB"
"-DUCD_PATH:STRING=${SERENITY_BUILD_DIR}/UCD"
"-DCLDR_PATH:STRING=${SERENITY_BUILD_DIR}/CLDR"
"-DSERENITY_CACHE_DIR:STRING=${SERENITY_CACHE_DIR}"
${lagom_options}
# Always call the build step of tools, so keeping things up-to-date is easy
BUILD_ALWAYS YES
@ -126,9 +127,7 @@ ExternalProject_Add(
# Tell the find_package(Lagom REQUIRED) command call where to find
# the CMake package
"-DCMAKE_PREFIX_PATH:STRING=${PROJECT_BINARY_DIR}/../lagom-install"
"-DTZDB_PATH:STRING=${SERENITY_BUILD_DIR}/TZDB"
"-DUCD_PATH:STRING=${SERENITY_BUILD_DIR}/UCD"
"-DCLDR_PATH:STRING=${SERENITY_BUILD_DIR}/CLDR"
"-DSERENITY_CACHE_DIR:STRING=${SERENITY_CACHE_DIR}"
"-DSERENITY_ARCH:STRING=${SERENITY_ARCH}"
"${SERENITY_TOOLCHAIN_FILE_ARG}"
${serenity_options}

2
Meta/CMake/locale_data.cmake
View file

@ -1,7 +1,7 @@
include(${CMAKE_CURRENT_LIST_DIR}/utils.cmake)
set(CLDR_VERSION 42.0.0)
set(CLDR_PATH "${CMAKE_BINARY_DIR}/CLDR" CACHE PATH "Download location for CLDR files")
set(CLDR_PATH "${SERENITY_CACHE_DIR}/CLDR" CACHE PATH "Download location for CLDR files")
set(CLDR_VERSION_FILE "${CLDR_PATH}/version.txt")
set(CLDR_ZIP_URL "https://github.com/unicode-org/cldr-json/releases/download/${CLDR_VERSION}/cldr-${CLDR_VERSION}-json-modern.zip")

2
Meta/CMake/time_zone_data.cmake
View file

@ -1,6 +1,6 @@
include(${CMAKE_CURRENT_LIST_DIR}/utils.cmake)
set(TZDB_PATH "${CMAKE_BINARY_DIR}/TZDB" CACHE PATH "Download location for TZDB files")
set(TZDB_PATH "${SERENITY_CACHE_DIR}/TZDB" CACHE PATH "Download location for TZDB files")
set(TZDB_VERSION 2022g)
set(TZDB_VERSION_FILE "${TZDB_PATH}/version.txt")

2
Meta/CMake/unicode_data.cmake
View file

@ -1,7 +1,7 @@
include(${CMAKE_CURRENT_LIST_DIR}/utils.cmake)
set(UCD_VERSION 15.0.0)
set(UCD_PATH "${CMAKE_BINARY_DIR}/UCD" CACHE PATH "Download location for UCD files")
set(UCD_PATH "${SERENITY_CACHE_DIR}/UCD" CACHE PATH "Download location for UCD files")
set(UCD_VERSION_FILE "${UCD_PATH}/version.txt")
set(UCD_ZIP_URL "https://www.unicode.org/Public/${UCD_VERSION}/ucd/UCD.zip")