diff --git a/.gitmodules b/.gitmodules index 3935b01019..99ef5f0943 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,3 +29,6 @@ [submodule "components/log-viewer-webui/yscope-log-viewer"] path = components/log-viewer-webui/yscope-log-viewer url = https://github.com/y-scope/yscope-log-viewer.git +[submodule "components/core/submodules/utfcpp"] + path = components/core/submodules/utfcpp + url = https://github.com/nemtrif/utfcpp.git diff --git a/components/core/submodules/utfcpp b/components/core/submodules/utfcpp new file mode 160000 index 0000000000..b26a5f718f --- /dev/null +++ b/components/core/submodules/utfcpp @@ -0,0 +1 @@ +Subproject commit b26a5f718f4f370af1852a0d5c6ae8fa031ba7d0 diff --git a/deps-tasks.yml b/deps-tasks.yml index 3c60af0017..4d3d7e06e5 100644 --- a/deps-tasks.yml +++ b/deps-tasks.yml @@ -17,6 +17,7 @@ vars: G_OUTCOME_CHECKSUM_FILE: "{{.G_BUILD_DIR}}/deps#outcome.md5" G_SIMDJSON_CHECKSUM_FILE: "{{.G_BUILD_DIR}}/deps#simdjson.md5" G_SQLITE3_CHECKSUM_FILE: "{{.G_BUILD_DIR}}/deps#sqlite3.md5" + G_UTFCPP_CHECKSUM_FILE: "{{.G_BUILD_DIR}}/deps#utfcpp.md5" G_YAML_CPP_CHECKSUM_FILE: "{{.G_BUILD_DIR}}/deps#yaml-cpp.md5" G_YSCOPE_LOG_VIEWER_CHECKSUM_FILE: "{{.G_BUILD_DIR}}/deps#yscope-log-viewer.md5" @@ -38,6 +39,7 @@ tasks: - "{{.G_OUTCOME_CHECKSUM_FILE}}" - "{{.G_SIMDJSON_CHECKSUM_FILE}}" - "{{.G_SQLITE3_CHECKSUM_FILE}}" + - "{{.G_UTFCPP_CHECKSUM_FILE}}" - "{{.G_YAML_CPP_CHECKSUM_FILE}}" generates: ["{{.G_DEPS_CORE_CHECKSUM_FILE}}"] deps: ["all-internal-deps"] @@ -53,6 +55,7 @@ tasks: "{{.G_OUTCOME_CHECKSUM_FILE}}" "{{.G_SIMDJSON_CHECKSUM_FILE}}" "{{.G_SQLITE3_CHECKSUM_FILE}}" + "{{.G_UTFCPP_CHECKSUM_FILE}}" "{{.G_YAML_CPP_CHECKSUM_FILE}}" >> "{{.G_DEPS_CORE_CHECKSUM_FILE}}" @@ -93,6 +96,7 @@ tasks: - task: "outcome" - task: "simdjson" - task: "sqlite3" + - task: "utfcpp" - task: "yaml-cpp" - task: "yscope-log-viewer" @@ -369,6 +373,36 @@ tasks: DATA_DIR: "{{.DEST}}" OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + utfcpp: + internal: true + vars: + CHECKSUM_FILE: "{{.G_UTFCPP_CHECKSUM_FILE}}" + DEST: "{{.G_CORE_COMPONENT_SUBMODULES_DIR}}/utfcpp" + sources: + - "{{.G_DEP_DOWNLOAD_SCRIPT}}" + - "{{.G_UTILS_TASKFILE}}" + - "{{.ROOT_DIR}}/Taskfile.yml" + - "{{.TASKFILE}}" + generates: ["{{.CHECKSUM_FILE}}"] + deps: + - ":init" + - task: ":utils:validate-checksum" + vars: + CHECKSUM_FILE: "{{.CHECKSUM_FILE}}" + DATA_DIR: "{{.DEST}}" + cmds: + - task: "download-dependency" + vars: + DEST: "{{.DEST}}" + FLAGS: "--extract" + SRC_NAME: "utfcpp-4.0.6" + SRC_URL: "https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.6.zip" + # This command must be last + - task: ":utils:compute-checksum" + vars: + DATA_DIR: "{{.DEST}}" + OUTPUT_FILE: "{{.CHECKSUM_FILE}}" + yaml-cpp: internal: true vars: