better generation of time system archives

externals/nx_tzdb/NxTzdbCreateHeader.cmake

@@ -16,15 +16,24 @@ if (NOT FILE_LIST)
 endif()
 
 set(DIRECTORY_NAME ${HEADER_NAME})
-
 set(FILE_DATA "")
+
+string(APPEND FILE_DATA "[[nodiscard]] static std::vector<VirtualFile> CollectFiles_${DIRECTORY_NAME}() {\n")
+string(APPEND FILE_DATA [[
+    std::vector<VirtualFile> vfs_files;
+    auto const fn = [&](std::string_view name, std::span<const u8> data) {
+        vfs_files.push_back(std::make_shared<VectorVfsFile>(
+            std::vector<u8>(data.begin(), data.end()),
+            std::string{name}
+        ));
+    };
+]])
 foreach(ZONE_FILE ${FILE_LIST})
     if (ZONE_FILE STREQUAL "\n")
         continue()
     endif()
-
-    string(APPEND FILE_DATA "{\"${ZONE_FILE}\",\n{")
-
+    string(APPEND FILE_DATA "  {\n")
+    string(APPEND FILE_DATA "    constexpr uint8_t tzdb_data[] = {\n")
     file(READ ${ZONE_PATH}/${ZONE_FILE} ZONE_DATA HEX)
     string(LENGTH "${ZONE_DATA}" ZONE_DATA_LEN)
     foreach(I RANGE 0 ${ZONE_DATA_LEN} 2)
@@ -42,9 +51,12 @@ foreach(ZONE_FILE ${FILE_LIST})
             string(APPEND FILE_DATA " ")
         endif()
     endforeach()
-
-    string(APPEND FILE_DATA "}},\n")
+    string(APPEND FILE_DATA "    };\n")
+    string(APPEND FILE_DATA "    fn(\"${ZONE_FILE}\", tzdb_data);\n")
+    string(APPEND FILE_DATA "  }\n")
 endforeach()
+string(APPEND FILE_DATA "  return vfs_files;\n")
+string(APPEND FILE_DATA "}\n")
 
 file(READ ${NX_TZDB_SOURCE_DIR}/tzdb_template.h.in NX_TZDB_TEMPLATE_H_IN)
 file(CONFIGURE OUTPUT ${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h CONTENT "${NX_TZDB_TEMPLATE_H_IN}")

externals/nx_tzdb/tzdb_template.h.in

@@ -9,10 +9,10 @@
 
 namespace NxTzdb {
 
+// @DIRECTORY_NAME@
+
 // clang-format off
-const static std::map<const char*, const std::vector<uint8_t>> @DIRECTORY_NAME@ = 
-{
-@FILE_DATA@};
+@FILE_DATA@
 // clang-format on
 
 } // namespace NxTzdb