build all artifacts to .nanvix/out#233
Draft
ada-x64 wants to merge 1 commit into
Draft
Conversation
There was a problem hiding this comment.
Pull request overview
This PR redirects Nanvix zlib build outputs into .nanvix/out and updates test/package paths to consume those relocated artifacts.
Changes:
- Adds artifact path constants and moves built libraries/test ELFs into
.nanvix/out. - Updates Makefile variables and test/package logic to reference configured artifact locations.
- Ignores
.nanvix/outand.nanvix/dist.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
.nanvix/z.py |
Defines output locations, relocates build artifacts, and updates test initrd inputs. |
.nanvix/Makefile.nanvix |
Accepts artifact/output variables and uses them in build, test, package, and clean targets. |
.nanvix/.gitignore |
Ignores generated Nanvix output and distribution directories. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| for binary in test_binaries: | ||
| name = binary.stem | ||
| print(f"RUN {name}...") | ||
| print(f"RUN {binary.stem}...") |
| initrd = make_initrd( | ||
| self, binary.name, InitRdArgs(app_args=["/tmp/zlib_test"]) | ||
| ) | ||
| initrd = make_initrd(self, binary, InitRdArgs(app_args=["/tmp/zlib_test"])) |
Comment on lines
192
to
194
| clean: | ||
| rm -f *.o test/*.o *~ $(STATICLIB) $(TEST_PROGS) | ||
| rm -f *.a *$(EXE) | ||
| rm -rf $(OUT_DIR) | ||
| rm -rf dist/ |
|
|
||
| # Ensure required variables are defined | ||
| _REQUIRED := PLATFORM PROCESS_MODE MEMORY_SIZE NANVIX_HOME NANVIX_TOOLCHAIN | ||
| _REQUIRED := PLATFORM PROCESS_MODE MEMORY_SIZE NANVIX_HOME NANVIX_TOOLCHAIN NANVIX_ROOT OUT_DIR DIST_DIR LIB_OUT INCLUDE_OUT TEST_OUT TEST_ARTIFACTS INCLUDE_ARTIFACTS LIB_ARTIFACTS |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
WIP pending upstream changes on zutils
Changes needed upstream before this works:
make_initrdshould discover files and output them to the corresponding out/ directories.Probably some changes on this branch still to come.