Merge pull request #10 from nekernel-org/dev

feat! breaking changes, merging to stable.

18 files changed, 34 insertions, 24 deletions

diff --git a/GNUmakefile b/GNUmakefile
index bcdc8e9..c0bc97f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -6,9 +6,9 @@
 SUDO=sudo
 GCC=clang++
 GCC_MINGW=x86_64-w64-mingw32-g++
-CXXFLAGS=-I./dev -I./vendor
+CXXFLAGS=-I./include -I./vendor
 CXXSTD= -std=c++20
-SRC=$(wildcard dev/cli/*.cc) $(wildcard dev/src/*.cc)
+SRC=$(wildcard src/cli/*.cc) $(wildcard src/lib/*.cc)
 OUT=nebuild
 CP=cp
 
diff --git a/examples/example_02_libnebuild/libnebuild.cc b/examples/example_02_libnebuild/libnebuild.cc
index 5540503..c5f13fe 100644
--- a/examples/example_02_libnebuild/libnebuild.cc
+++ b/examples/example_02_libnebuild/libnebuild.cc
@@ -1,4 +1,4 @@
-#include <BuildKit/JSONManifestBuilder.h>
+#include <NeBuildKit/JSONManifestBuilder.h>
 #include <cstdlib>
 
 #ifndef _WIN32
diff --git a/examples/example_02_libnebuild/posix.json b/examples/example_02_libnebuild/posix.json
index b8145bd..262d358 100644
--- a/examples/example_02_libnebuild/posix.json
+++ b/examples/example_02_libnebuild/posix.json
@@ -2,7 +2,7 @@
   "compiler_path": "clang++",
   "compiler_std": "c++20",
   "headers_path": [
-    "../../dev",
+    "../../include",
     "../../vendor"
   ],
   "sources_path": [
diff --git a/examples/example_02_libnebuild/win64.json b/examples/example_02_libnebuild/win64.json
index 3118a36..dcd1142 100644
--- a/examples/example_02_libnebuild/win64.json
+++ b/examples/example_02_libnebuild/win64.json
@@ -2,7 +2,7 @@
   "compiler_path": "x86_64-w64-mingw32-g++",
   "compiler_std": "c++20",
   "headers_path": [
-    "../../dev",
+    "../../include",
     "../../vendor"
   ],
   "sources_path": [
diff --git a/dev/BuildKit/Defines.h b/include/NeBuildKit/Defines.h
index 1c88ceb..06d936f 100644
--- a/dev/BuildKit/Defines.h
+++ b/include/NeBuildKit/Defines.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <BuildKit/Imports.h>
+#include <NeBuildKit/Imports.h>
 
 /// =========================================================== ///
 /// @brief Defines file
diff --git a/dev/BuildKit/IManifestBuilder.h b/include/NeBuildKit/IManifestBuilder.h
index abb389f..96c80c3 100644
--- a/dev/BuildKit/IManifestBuilder.h
+++ b/include/NeBuildKit/IManifestBuilder.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <BuildKit/Defines.h>
+#include <NeBuildKit/Defines.h>
 
 #define NEBUILD_MANIFEST_BUILDER : public ::NeBuild::IManifestBuilder
 
diff --git a/dev/BuildKit/Imports.h b/include/NeBuildKit/Imports.h
index 33e1e31..33e1e31 100644
--- a/dev/BuildKit/Imports.h
+++ b/include/NeBuildKit/Imports.h
diff --git a/dev/BuildKit/JSONManifestBuilder.h b/include/NeBuildKit/JSONManifestBuilder.h
index 438bdab..ccd5f6e 100644
--- a/dev/BuildKit/JSONManifestBuilder.h
+++ b/include/NeBuildKit/JSONManifestBuilder.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <BuildKit/IManifestBuilder.h>
+#include <NeBuildKit/IManifestBuilder.h>
 #include <json/json.h>
 
 /// @file JSONManifestBuilder.h
diff --git a/dev/BuildKit/TOMLManifestBuilder.h b/include/NeBuildKit/TOMLManifestBuilder.h
index 7c508fc..c6a12bc 100644
--- a/dev/BuildKit/TOMLManifestBuilder.h
+++ b/include/NeBuildKit/TOMLManifestBuilder.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <BuildKit/IManifestBuilder.h>
+#include <NeBuildKit/IManifestBuilder.h>
 #include <toml++/toml.hpp>
 
 /// @file TOMLManifestBuilder.h
diff --git a/osx-dylib.json b/osx-dylib.json
index f9e2274..d5b87bc 100644
--- a/osx-dylib.json
+++ b/osx-dylib.json
@@ -1,9 +1,9 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["dev", "vendor"],
-  "sources_path": ["dev/src/*.cc"],
-  "output_name": "libNeBuild.dylib",
+  "headers_path": ["include", "vendor"],
+  "sources_path": ["src/lib/*.cc"],
+  "output_name": "libNeBuildKit.dylib",
   "compiler_flags": ["-fPIC", "-shared"],
   "cpp_macros": ["NEBUILD_DYLIB", "NEBUILD_OSX"],
   "run_after_build": false
diff --git a/osx.json b/osx.json
index 3819ea7..bdcab49 100644
--- a/osx.json
+++ b/osx.json
@@ -1,8 +1,8 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["dev", "vendor"],
-  "sources_path": ["dev/src/*.cc", "dev/cli/*.cc"],
+  "headers_path": ["include", "vendor"],
+  "sources_path": ["src/lib/*.cc", "src/cli/*.cc"],
   "output_name": "nebuild",
   "compiler_flags": ["-fPIC"],
   "cpp_macros": ["NEBUILD_POSIX", "NEBUILD_OSX"],
diff --git a/posix-dylib.json b/posix-dylib.json
new file mode 100644
index 0000000..3326b3e
--- /dev/null
+++ b/posix-dylib.json
@@ -0,0 +1,10 @@
+{
+  "compiler_path": "clang++",
+  "compiler_std": "c++20",
+  "headers_path": ["include/", "vendor"],
+  "sources_path": ["src/lib/*.cc"],
+  "output_name": "libNeBuildKit.so",
+  "compiler_flags": ["-fPIC", "-shared"],
+  "cpp_macros": ["NEBUILD_POSIX", "NEBUILD_DYLIB"],
+  "run_after_build": false
+}
diff --git a/posix.json b/posix.json
index b6dc247..679296c 100644
--- a/posix.json
+++ b/posix.json
@@ -1,8 +1,8 @@
 {
   "compiler_path": "clang++",
   "compiler_std": "c++20",
-  "headers_path": ["dev/", "vendor"],
-  "sources_path": ["dev/src/*.cc", "dev/cli/*.cc"],
+  "headers_path": ["include/", "vendor"],
+  "sources_path": ["src/lib/*.cc", "src/cli/*.cc"],
   "output_name": "nebuild",
   "compiler_flags": ["-fPIC"],
   "cpp_macros": ["NEBUILD_POSIX"],
diff --git a/dev/cli/AppMain.cc b/src/cli/AppMain.cc
index afd912e..173820b 100644
--- a/dev/cli/AppMain.cc
+++ b/src/cli/AppMain.cc
@@ -4,8 +4,8 @@
 // Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license.
 // ============================================================= //
 
-#include <BuildKit/JSONManifestBuilder.h>
-#include <BuildKit/TOMLManifestBuilder.h>
+#include <NeBuildKit/JSONManifestBuilder.h>
+#include <NeBuildKit/TOMLManifestBuilder.h>
 
 static bool kFailed = false;
 static bool kDryRun = false;
@@ -19,7 +19,7 @@ int main(int argc, char** argv) {
     if (index_path == "-v" || index_path == "-version") {
       NeBuild::Logger::info() << "NeKernel Build.\n";
       NeBuild::Logger::info()
-          << "Bugs or issues? Check out: https://github.com/nekernel-org/nebuild/issues\n";
+          << "Bugs, Issues? Check out: https://github.com/nekernel-org/nebuild/issues\n";
 
       return EXIT_SUCCESS;
     } else if (index_path == "-dry-run" || index_path == "-n") {
diff --git a/dev/src/IManifestBuilder.cc b/src/lib/IManifestBuilder.cc
index 745e81d..464004e 100644
--- a/dev/src/IManifestBuilder.cc
+++ b/src/lib/IManifestBuilder.cc
@@ -3,4 +3,4 @@
 // Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license.
 // ============================================================= //
 
-#include <BuildKit/IManifestBuilder.h>
+#include <NeBuildKit/IManifestBuilder.h>
diff --git a/dev/src/JSONManifestBuilder.cc b/src/lib/JSONManifestBuilder.cc
index d54653b..9de6608 100644
--- a/dev/src/JSONManifestBuilder.cc
+++ b/src/lib/JSONManifestBuilder.cc
@@ -3,7 +3,7 @@
 // Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license.
 // ============================================================= //
 
-#include <BuildKit/JSONManifestBuilder.h>
+#include <NeBuildKit/JSONManifestBuilder.h>
 
 using namespace NeBuild;
 using namespace nlohmann;
diff --git a/dev/src/TOMLManifestBuilder.cc b/src/lib/TOMLManifestBuilder.cc
index 49de8eb..fc10c88 100644
--- a/dev/src/TOMLManifestBuilder.cc
+++ b/src/lib/TOMLManifestBuilder.cc
@@ -3,7 +3,7 @@
 // Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license.
 // ============================================================= //
 
-#include <BuildKit/TOMLManifestBuilder.h>
+#include <NeBuildKit/TOMLManifestBuilder.h>
 #include <filesystem>
 
 using namespace NeBuild;
diff --git a/win64.json b/win64.json
index 6585723..75c025a 100644
--- a/win64.json
+++ b/win64.json
@@ -1,8 +1,8 @@
 {
   "compiler_path": "x86_64-w64-mingw32-g++.exe",
   "compiler_std": "c++20",
-  "headers_path": ["dev", "vendor"],
-  "sources_path": ["dev/src/*.cc", "dev/cli/*.cc"],
+  "headers_path": ["include", "vendor"],
+  "sources_path": ["src/lib/*.cc", "src/cli/*.cc"],
   "output_name": "nebuild.exe",
   "compiler_flags": ["-fPIC"],
   "cpp_macros": ["NEBUILD_WINDOWS"],