Merge pull request #5 from nekernel-org/dev

release: NeBuild v0.0.7

9 files changed, 163 insertions, 81 deletions

diff --git a/GNUmakefile b/GNUmakefile
index a195f86..b05411c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,6 +18,7 @@ build-nebuild-windows:
 
 .PHONY: help
 help:
+	@echo "NEBUILD => HELP"
 	@echo "=> help: Show this help message."
 	@echo "=> build-nebuild-windows: Build NeBuild for Windows."
 	@echo "=> build-nebuild: Build NeBuild for POSIX."
diff --git a/ReadMe.md b/ReadMe.md
index d134b83..8516959 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -16,4 +16,4 @@
 
 - Run `nebuild` and pass the path to the manifest file.
 
-###### Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel.org Authors, all rights reserved.
+###### Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel.org Authors, licensed under the BSD 3 Clause license.
diff --git a/dev/BuildKit/TOMLManifestBuilder.h b/dev/BuildKit/TOMLManifestBuilder.h
index 10a8200..9c4a3a0 100644
--- a/dev/BuildKit/TOMLManifestBuilder.h
+++ b/dev/BuildKit/TOMLManifestBuilder.h
@@ -27,7 +27,7 @@ class TOMLManifestBuilder final NEBUILD_MANIFEST_BUILDER {
   /// @param arg_val filename path.
   /// @retval true build succeeded.
   /// @retval false failed to build.
-  bool        BuildTarget(int arg_sz, const char* arg_val, const bool dry_run = false) override;
+  bool        BuildTarget(const std::string& arg_val, const bool dry_run = false) override;
   const char* BuildSystem() override;
 };
 }  // namespace NeBuild
\ No newline at end of file
diff --git a/dev/cli/Tool.cc b/dev/cli/App.cc
index 1d49c9f..ca81d4e 100644
--- a/dev/cli/Tool.cc
+++ b/dev/cli/App.cc
@@ -5,6 +5,7 @@
 // ============================================================= //
 
 #include <BuildKit/JSONManifestBuilder.h>
+#include <BuildKit/TOMLManifestBuilder.h>
 
 static bool kFailed = false;
 static bool kDryRun = false;
@@ -16,18 +17,16 @@ int main(int argc, char** argv) {
     std::string index_path = argv[index];
 
     if (index_path == "-v" || index_path == "--version") {
-      NeBuild::Logger::info() << "Brought to you by Amlal El Mahrouss for NeKernel.org.\n";
-      NeBuild::Logger::info() << "© 2024-2025 Amlal El Mahrouss, all rights reserved.\n";
-
+      NeBuild::Logger::info() << "NeKernel Build Tool.\n";
       NeBuild::Logger::info()
-          << "Bugs, issues? Check out: https://github.com/nekernel-org/nebuild/issues\n";
+          << "Bugs, or issues? Check out: https://github.com/nekernel-org/nebuild/issues\n";
 
       return EXIT_SUCCESS;
     } else if (index_path == "--dry-run") {
       kDryRun = true;
       continue;
     } else if (index_path == "-h" || index_path == "--help") {
-      NeBuild::Logger::info() << "Usage: nebuild <file>\n";
+      NeBuild::Logger::info() << "usage: nebuild <file>\n";
 
       return EXIT_SUCCESS;
     }
@@ -52,12 +51,20 @@ int main(int argc, char** argv) {
               return;
             }
           } else {
-            NeBuild::Logger::info()
-                << "error: file '" << index_path << "' is not a JSON file!" << std::endl;
-            kFailed = true;
-            return;
+            const auto kTomlExtension = ".toml";
+            builder                   = new NeBuild::TOMLManifestBuilder();
+
+            if (index_path.ends_with(kTomlExtension)) {
+              goto end;
+            } else {
+              NeBuild::Logger::info()
+                  << "error: file '" << index_path << "' is not a JSON file!" << std::endl;
+              kFailed = true;
+              return;
+            }
           }
 
+        end:
           NeBuild::Logger::info() << "building manifest: " << index_path << std::endl;
 
           if (builder && !builder->BuildTarget(index_path, kDryRun)) {
diff --git a/dev/src/JSONManifestBuilder.cc b/dev/src/JSONManifestBuilder.cc
index 0b010fe..daf47af 100644
--- a/dev/src/JSONManifestBuilder.cc
+++ b/dev/src/JSONManifestBuilder.cc
@@ -5,12 +5,7 @@
 
 #include <BuildKit/JSONManifestBuilder.h>
 
-#if defined(NEBUILD_POSIX)
-#include <dlfcn.h>
-#endif
-
-using JSON = nlohmann::json;
-
+using JSON   = nlohmann::json;
 namespace FS = std::filesystem;
 
 using namespace NeBuild;
@@ -49,19 +44,26 @@ bool JSONManifestBuilder::BuildTarget(const std::string& argv_val, const bool dr
 
     std::string compiler = json_obj["compiler_path"].get<std::string>();
 
-    JSON header_search_path = json_obj["headers_path"];
-    JSON sources_files      = json_obj["sources_path"];
-
     std::string command = compiler + " ";
 
-    for (auto& sources : sources_files) {
-      command += sources.get<std::string>() + " ";
-    }
+    JSON header_search_path = json_obj["compiler_headers_path"];
 
     for (auto& headers : header_search_path) {
       command += "-I" + headers.get<std::string>() + " ";
     }
 
+    JSON headers_path  = json_obj["headers_path"];
+
+    for (auto& headers : headers_path) {
+      command += "-I" + headers.get<std::string>() + " ";
+    }
+
+    JSON sources_files = json_obj["sources_path"];
+
+    for (auto& sources : sources_files) {
+      command += sources.get<std::string>() + " ";
+    }
+
     JSON macros_list = json_obj["cpp_macros"];
 
     for (auto& macro : macros_list) {
@@ -84,15 +86,6 @@ bool JSONManifestBuilder::BuildTarget(const std::string& argv_val, const bool dr
     NeBuild::Logger::info() << "output path: " << target << "\n";
     NeBuild::Logger::info() << "command: " << command << "\n";
 
-    try {
-      if (json_obj["dry_run"].get<bool>()) return true;
-    } catch (...) {
-    }
-
-    if (dry_run) {
-      return true;
-    }
-
     auto ret_exec = std::system(command.c_str());
 
     if (ret_exec > 0) {
@@ -100,57 +93,8 @@ bool JSONManifestBuilder::BuildTarget(const std::string& argv_val, const bool dr
                               << std::endl;
       return false;
     }
-
-    try {
-      if (json_obj["run_after_build"].get<bool>()) {
-        if (target.ends_with(".so") || target.ends_with(".dylib")) {
-#if defined(NEBUILD_POSIX)
-          auto dll = dlopen(target.c_str(), RTLD_LAZY);
-
-          if (dll) {
-            int (*entrypoint)(void) = nullptr;
-            entrypoint = (decltype(entrypoint))dlsym(dll, "shared_runner");
-
-            if (entrypoint) entrypoint();
-
-            dlclose(dll);
-
-            return true;
-          }
-#endif
-
-          return false;
-        } else {
-          std::ifstream     file = std::ifstream(target);
-          std::stringstream ss;
-
-          ss << file.rdbuf();
-
-          if (ss.str()[0] == 'O' && ss.str()[1] == 'p' && ss.str()[2] == 'e' && ss.str()[3] == 'n')
-            NeBuild::Logger::info()
-                << "error: can't open PEF dynamic library, it mayn't contain an entrypoint"
-                << std::endl;
-          else if (ss.str()[0] == 'n' && ss.str()[1] == 'e' && ss.str()[2] == 'p' &&
-                   ss.str()[3] == 'O')
-            NeBuild::Logger::info()
-                << "error: can't open FEP dynamic library, it mayn't contain an entrypoint"
-                << std::endl;
-
-          return false;
-        }
-
-#if defined(NEBUILD_WINDOWS)
-        std::system((".\\" + target).c_str());
-#else
-        std::system(("./" + target).c_str());
-#endif
-      }
-    } catch (...) {
-      return true;
-    }
   } catch (std::runtime_error& err) {
     NeBuild::Logger::info() << "error: " << err.what() << std::endl;
-
     return false;
   }
 
diff --git a/dev/src/TOMLManifestBuilder.cc b/dev/src/TOMLManifestBuilder.cc
new file mode 100644
index 0000000..e35416a
--- /dev/null
+++ b/dev/src/TOMLManifestBuilder.cc
@@ -0,0 +1,107 @@
+// ============================================================= //
+// nebuild
+// Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved.
+// ============================================================= //
+
+#include <BuildKit/TOMLManifestBuilder.h>
+
+namespace FS = std::filesystem;
+
+using namespace NeBuild;
+
+/// @brief Builds a TOML target from a TOML file.
+/// @param arg_sz filename size (must be 1 or greater).
+/// @param arg_val filename path (must be a valid TOML file).
+/// @retval true building has succeeded.
+/// @retval false fail to build, see error message.
+bool TOMLManifestBuilder::BuildTarget(const std::string& argv_val, const bool dry_run) {
+  std::string path;
+
+  if (argv_val.empty()) {
+    NeBuild::Logger::info() << "nebuild: error: file path is empty" << std::endl;
+    return false;
+  } else {
+    path = argv_val;
+
+    if (!FS::exists(path)) {
+      NeBuild::Logger::info() << "nebuild: error: file '" << path << "' does not exist"
+                              << std::endl;
+      return false;
+    }
+  }
+
+  try {
+    auto toml_file = toml::parse_file(path);
+
+    std::string compiler = toml_file["compiler_path"].as_string()->get();
+
+    std::string command = compiler + " ";
+
+    auto header_search_path = toml_file["compiler_headers_path"].as_array();
+
+    if (header_search_path) {
+      for (auto& headers : *header_search_path) {
+        command += "-I" + headers.as_string()->get() + " ";
+      }
+    }
+
+    auto headers_path = toml_file["headers_path"].as_array();
+
+    if (headers_path) {
+      for (auto& headers : *headers_path) {
+        command += "-I" + headers.as_string()->get() + " ";
+      }
+    }
+
+    auto sources_files = toml_file["sources_path"].as_array();
+
+    if (sources_files) {
+      for (auto& sources : *sources_files) {
+        command += sources.as_string()->get() + " ";
+      }
+    }
+
+    auto macros_list = toml_file["cpp_macros"].as_array();
+
+    if (macros_list) {
+      for (auto& macro : *macros_list) {
+        command += "-D" + macro.as_string()->get() + " ";
+      }
+    }
+
+    auto compiler_flags = toml_file["compiler_flags"].as_array();
+
+    if (compiler_flags) {
+      for (auto& flag : *compiler_flags) {
+        command += flag.as_string()->get() + " ";
+      }
+      }
+
+    if (toml_file["compiler_std"].is_string())
+      command += "-std=" + toml_file["compiler_std"].as_string()->get() + " ";
+
+    command += "-o " + toml_file["output_name"].as_string()->get();
+
+    auto target = toml_file["output_name"].as_string()->get();
+
+    NeBuild::Logger::info() << "output path: " << target << "\n";
+    NeBuild::Logger::info() << "command: " << command << "\n";
+
+    auto ret_exec = std::system(command.c_str());
+
+    if (ret_exec > 0) {
+      NeBuild::Logger::info() << "error: exit with message: " << std::strerror(ret_exec) << ""
+                              << std::endl;
+      return false;
+    }
+  } catch (std::runtime_error& err) {
+    NeBuild::Logger::info() << "error: " << err.what() << std::endl;
+    return false;
+  }
+
+  return true;
+}
+
+const char* TOMLManifestBuilder::BuildSystem() {
+  return "NeBuild (TOML)";
+}
diff --git a/examples/example_03_hello_world_toml/hello_world.cc b/examples/example_03_hello_world_toml/hello_world.cc
new file mode 100644
index 0000000..ae47ce8
--- /dev/null
+++ b/examples/example_03_hello_world_toml/hello_world.cc
@@ -0,0 +1,7 @@
+#include <iostream>
+#include <string>
+
+int main(int argc, char** argv) {
+  std::cout << "hello, world!\n";
+  return 0;
+}
diff --git a/examples/example_03_hello_world_toml/posix.toml b/examples/example_03_hello_world_toml/posix.toml
new file mode 100644
index 0000000..4f71f7d
--- /dev/null
+++ b/examples/example_03_hello_world_toml/posix.toml
@@ -0,0 +1,8 @@
+compiler_path = "g++"
+compiler_std = "c++20"
+headers_path = [ "lib" ]
+sources_path = [ "hello_world.cc" ]
+output_name = "hello_world.elf"
+compiler_flags = [ "-fPIC" ]
+cpp_macros = [ "FOO_MACRO" ]
+run_after_build = true
diff --git a/examples/example_03_hello_world_toml/win64.toml b/examples/example_03_hello_world_toml/win64.toml
new file mode 100644
index 0000000..c8001a4
--- /dev/null
+++ b/examples/example_03_hello_world_toml/win64.toml
@@ -0,0 +1,8 @@
+compiler_path = "x86_64-w64-mingw32-g++"
+compiler_std = "c++20"
+headers_path = [ "lib" ]
+sources_path = [ "hello_world.cc" ]
+output_name = "hello_world.elf"
+compiler_flags = [ "-fPIC" ]
+cpp_macros = [ "FOO_MACRO" ]
+run_after_build = true