diff --git a/.nanvix/nanvix.lock b/.nanvix/nanvix.lock index ac7a89142..87f4bb717 100644 --- a/.nanvix/nanvix.lock +++ b/.nanvix/nanvix.lock @@ -1,29 +1,29 @@ # nanvix.lock - auto-generated by nanvix_zutil. DO NOT EDIT. [metadata] -manifest-hash = "sha256:b6588c9709933fde624700a04a317f68e2d8fa5b15f176c552da0b60e82f966f" -nanvix-zutil-version = "0.16.3" +manifest-hash = "sha256:f33ae95b7f5cb60f24297a89bd73d0720353e48d94db1dc6c87773a2be2517f3" +nanvix-zutil-version = "0.17.0" [metadata.sdk] schema-version = 1 -sdk-version = "v0.20.2-sdk.1" +sdk-version = "v0.20.9-sdk.1" provider-id = "c-clang" provider = "clang" role = "c" image-name = "ghcr.io/nanvix/nanvix-sdk-c-clang" -image-digest = "sha256:65d18dfbe2774e37c1dfe1253374c8fcd548c1a0f0ccd888ab3f80983f5da096" -image-ref = "ghcr.io/nanvix/nanvix-sdk-c-clang@sha256:65d18dfbe2774e37c1dfe1253374c8fcd548c1a0f0ccd888ab3f80983f5da096" -nanvix-tag = "v0.20.2" -nanvix-version = "0.20.2" -nanvix-commit = "e41cef2fb035b2742d2c97bb6350b452ccb024a2" -sysroot-sha256 = "a9c9d3e46f7a07489273919661841fa11c461533ef8f86e5f678bfeb1781dfd2" +image-digest = "sha256:37c6a9fcffc60b997e1fe2707bd0cadf91dbf98ecb0348863dbeab4b5c47905c" +image-ref = "ghcr.io/nanvix/nanvix-sdk-c-clang@sha256:37c6a9fcffc60b997e1fe2707bd0cadf91dbf98ecb0348863dbeab4b5c47905c" +nanvix-tag = "v0.20.9" +nanvix-version = "0.20.9" +nanvix-commit = "94041cca08aea72fff1b4df4c57ab47047e6f294" +sysroot-sha256 = "5b2a1446c4df3172598173349042e591ce181235b3c4e20664aeb9b83c022a25" [metadata.sdk.target] alias = "i686-nanvix" triple = "i686-unknown-nanvix" [metadata.sdk.toolchain] -llvm_commit = "f1bc2eabca705ef7217f7f77199425e6e63de7ef" +llvm_commit = "6bf96f19abaa3e03fa51fad601a4b26238ef4fbe" llvm_version = "22.1.8" port_branch = "nanvix/v22.1.8" @@ -46,44 +46,44 @@ name = "nanvix" repo = "nanvix/nanvix" kind = "sysroot" ref-kind = "tag" -ref-value = "0.20.2" -resolved-tag = "v0.20.2" -resolved-commitish = "e41cef2fb035b2742d2c97bb6350b452ccb024a2" -release-id = 352665943 +ref-value = "0.20.9" +resolved-tag = "v0.20.9" +resolved-commitish = "94041cca08aea72fff1b4df4c57ab47047e6f294" +release-id = 354183166 dependencies = [] [[package.assets]] -name = "nanvix-windows-x86-microvm-standalone-release-256mb-e41cef2fb035b2742d2c97bb6350b452ccb024a2.zip" -url = "https://github.com/nanvix/nanvix/releases/download/v0.20.2/nanvix-windows-x86-microvm-standalone-release-256mb-e41cef2fb035b2742d2c97bb6350b452ccb024a2.zip" -id = 474058621 +name = "nanvix-windows-x86-microvm-standalone-release-256mb-94041cca08aea72fff1b4df4c57ab47047e6f294.zip" +url = "https://github.com/nanvix/nanvix/releases/download/v0.20.9/nanvix-windows-x86-microvm-standalone-release-256mb-94041cca08aea72fff1b4df4c57ab47047e6f294.zip" +id = 477456800 [[package.assets]] -name = "nanvix-x86-microvm-single-process-release-256mb-e41cef2fb035b2742d2c97bb6350b452ccb024a2.tar.bz2" -url = "https://github.com/nanvix/nanvix/releases/download/v0.20.2/nanvix-x86-microvm-single-process-release-256mb-e41cef2fb035b2742d2c97bb6350b452ccb024a2.tar.bz2" -id = 474058672 +name = "nanvix-x86-microvm-single-process-release-256mb-94041cca08aea72fff1b4df4c57ab47047e6f294.tar.bz2" +url = "https://github.com/nanvix/nanvix/releases/download/v0.20.9/nanvix-x86-microvm-single-process-release-256mb-94041cca08aea72fff1b4df4c57ab47047e6f294.tar.bz2" +id = 477456850 [[package.assets]] -name = "nanvix-x86-microvm-standalone-release-256mb-e41cef2fb035b2742d2c97bb6350b452ccb024a2.tar.bz2" -url = "https://github.com/nanvix/nanvix/releases/download/v0.20.2/nanvix-x86-microvm-standalone-release-256mb-e41cef2fb035b2742d2c97bb6350b452ccb024a2.tar.bz2" -id = 474058687 +name = "nanvix-x86-microvm-standalone-release-256mb-94041cca08aea72fff1b4df4c57ab47047e6f294.tar.bz2" +url = "https://github.com/nanvix/nanvix/releases/download/v0.20.9/nanvix-x86-microvm-standalone-release-256mb-94041cca08aea72fff1b4df4c57ab47047e6f294.tar.bz2" +id = 477456865 [[package]] name = "zlib" repo = "nanvix/zlib" kind = "dependency" ref-kind = "version" -ref-value = "1.3.1-nanvix-0.20.2-sdk.1" -resolved-tag = "1.3.1-nanvix-0.20.2-sdk.1" +ref-value = "1.3.1-nanvix-0.20.9-sdk.1" +resolved-tag = "1.3.1-nanvix-0.20.9-sdk.1" resolved-commitish = "nanvix/v1.3.1" -release-id = 353940934 +release-id = 354630018 dependencies = [] [[package.assets]] -name = "zlib-microvm-standalone-256mb.tar.gz" -url = "https://github.com/nanvix/zlib/releases/download/1.3.1-nanvix-0.20.2-sdk.1/zlib-microvm-standalone-256mb.tar.gz" -id = 476929632 +name = "zlib-linux-x86-microvm-standalone-256mb-dev.tar.gz" +url = "https://github.com/nanvix/zlib/releases/download/1.3.1-nanvix-0.20.9-sdk.1/zlib-linux-x86-microvm-standalone-256mb-dev.tar.gz" +id = 478242455 [[package.assets]] -name = "zlib-microvm-standalone-256mb.zip" -url = "https://github.com/nanvix/zlib/releases/download/1.3.1-nanvix-0.20.2-sdk.1/zlib-microvm-standalone-256mb.zip" -id = 476929631 +name = "zlib-windows-x86-microvm-standalone-256mb-dev.zip" +url = "https://github.com/nanvix/zlib/releases/download/1.3.1-nanvix-0.20.9-sdk.1/zlib-windows-x86-microvm-standalone-256mb-dev.zip" +id = 478242457 diff --git a/.nanvix/nanvix.toml b/.nanvix/nanvix.toml index fa5f3afba..e604aa286 100644 --- a/.nanvix/nanvix.toml +++ b/.nanvix/nanvix.toml @@ -1,7 +1,7 @@ [package] name = "libxml2" version = "2.12.9" -nanvix-version = "0.20.2" +nanvix-version = "0.20.9" [builds] [builds.matrix] @@ -15,6 +15,6 @@ zlib = "1.3.1" [toolchain] kind = "nanvix-sdk" provider = "c-clang" -sdk-version = "v0.20.2-sdk.1" +sdk-version = "v0.20.9-sdk.1" sdk-image = "ghcr.io/nanvix/nanvix-sdk-c-clang" -sdk-digest = "sha256:65d18dfbe2774e37c1dfe1253374c8fcd548c1a0f0ccd888ab3f80983f5da096" +sdk-digest = "sha256:37c6a9fcffc60b997e1fe2707bd0cadf91dbf98ecb0348863dbeab4b5c47905c" diff --git a/.nanvix/z.py b/.nanvix/z.py index a437c8642..34f4b60eb 100644 --- a/.nanvix/z.py +++ b/.nanvix/z.py @@ -26,13 +26,12 @@ run, ) from nanvix_zutil.paths import ( - bin_out, buildroot, + dev_out, dist_dir, - include_out, - lib_out, nanvix_root, out_dir, + regular_out, repo_root, test_out, ) @@ -80,14 +79,14 @@ def _staged_output_files(self) -> list[str]: """ root = repo_root() return [ - str((lib_out() / "libxml2.a").relative_to(root)), + str((dev_out() / "lib" / "libxml2.a").relative_to(root)), str( - (include_out() / "libxml2" / "libxml" / "xmlversion.h").relative_to( - root - ) + ( + dev_out() / "include" / "libxml2" / "libxml" / "xmlversion.h" + ).relative_to(root) ), - str((bin_out() / "xml2-config").relative_to(root)), - str((lib_out() / "pkgconfig" / "libxml-2.0.pc").relative_to(root)), + str((regular_out() / "bin" / "xml2-config").relative_to(root)), + str((dev_out() / "lib" / "pkgconfig" / "libxml-2.0.pc").relative_to(root)), str((test_out() / "test_libxml2.elf").relative_to(root)), ] @@ -140,9 +139,9 @@ def translate(p: Path): f"NANVIX_ROOT={translate(nanvix_root())}", f"OUT_DIR={translate(out_dir())}", f"DIST_DIR={translate(dist_dir())}", - f"LIB_OUT={translate(lib_out())}", - f"INCLUDE_OUT={translate(include_out())}", - f"BIN_OUT={translate(bin_out())}", + f"LIB_OUT={translate(dev_out() / 'lib')}", + f"INCLUDE_OUT={translate(dev_out() / 'include')}", + f"BIN_OUT={translate(regular_out() / 'bin')}", f"TEST_OUT={translate(test_out())}", ] ) diff --git a/.zutils-version b/.zutils-version index 29bb612d7..6b60281ad 100644 --- a/.zutils-version +++ b/.zutils-version @@ -1 +1 @@ -v0.16.3 +v0.17.0