Commit 525038ed30df3da6610fd22500b8c7f869eb02ba
Commits[COMMIT BEGIN]commit 525038ed30df3da6610fd22500b8c7f869eb02ba Author: 0x4248 <[email protected]> Date: Mon Dec 15 21:46:59 2025 +0000 makefile: introduce the Nbuild system What is Nbuild? Nbuild is a new build system designed to simplify and streamline the build process for the megarepo. Just simply make a Makefile in the project and then append the folder contaning the Makefile to the local Nbuild file and it will magically be included in the build process. Changes made: - Added Nbuild system to main makefile - Removed old build scripts and marked them as depricated - Updated .gitignore to include .vscode/settings.json - Added colour and icon settings to Nbuild files for VSCode - Created example Nbuild files in the usr/ directory as a starting point Tested-by: 0x4248 <[email protected]> Signed-off-by: 0x4248 <[email protected]> diff --git a/.gitignore b/.gitignore index 878c2bb..baab0bd 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ !.init !.project !.defconfig +!.vscode/ # Dirs build/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 9ddf6b2..a8b7292 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,7 @@ { - "cmake.ignoreCMakeListsMissing": true + "cmake.ignoreCMakeListsMissing": true, + "catppuccin-icons.associations.files": { + "Nbuild": "makefile", + "Kconfig": "config" + } } \ No newline at end of file diff --git a/Makefile b/Makefile index e4b4d29..d1e868d 100644 --- a/Makefile +++ b/Makefile @@ -38,18 +38,22 @@ precheck: fi; \ fi - - - -quickstart: - - -include tools/build/make/includes.mk -.PHONY: precheck $(TARGETS) - ifneq ($(filter $(MAKECMDGOALS),$(NOCONFIG_TARGETS)),) # This is only ran if they wanted to make the config without any config else $(MAKECMDGOALS): precheck endif + +include Nbuild + +build: $(NBUILD-T) + $(T)$(LOG) -e "NBUILD\t COMPLETE" + +$(NBUILD-T): + $(T)$(LOG) -e "NBUILD\t $(NBUILD-T)" + $(MAKE) -C $@ + +.PHONY: precheck build $(TARGETS) $(NBUILD-T) + diff --git a/Nbuild b/Nbuild new file mode 100644 index 0000000..300ee7a --- /dev/null +++ b/Nbuild @@ -0,0 +1 @@ +include usr/Nbuild \ No newline at end of file diff --git a/tools/build/make/build.mk b/tools/build/depricated/build.mk similarity index 100% rename from tools/build/make/build.mk rename to tools/build/depricated/build.mk diff --git a/tools/build/makelist/main.py b/tools/build/depricated/makelist/main.py similarity index 100% rename from tools/build/makelist/main.py rename to tools/build/depricated/makelist/main.py diff --git a/tools/build/make/includes.mk b/tools/build/make/includes.mk index 9eee3c7..82af49a 100644 --- a/tools/build/make/includes.mk +++ b/tools/build/make/includes.mk @@ -23,5 +23,4 @@ include tools/build/make/git.mk include tools/build/make/help.mk include tools/build/make/test.mk include tools/build/make/misc.mk -include tools/build/make/scripts.mk -include tools/build/make/build.mk +include tools/build/make/scripts.mk \ No newline at end of file diff --git a/usr/Nbuild b/usr/Nbuild new file mode 100644 index 0000000..f7129bf --- /dev/null +++ b/usr/Nbuild @@ -0,0 +1,3 @@ +NB-ROOT = usr +NBUILD-T += $(NB-ROOT)/key_detect +NBUILD-T += $(NB-ROOT)/vishash \ No newline at end of file[COMMIT END](C) 2025 0x4248 (C) 2025 4248 Media and 4248 Systems, All part of 0x4248 See LICENCE files for more information. Not all files are by 0x4248 always check Licencing.