summaryrefslogtreecommitdiffhomepage
path: root/dev/src
diff options
context:
space:
mode:
Diffstat (limited to 'dev/src')
-rw-r--r--dev/src/JSONManifestBuilder.cc84
-rw-r--r--dev/src/TOMLManifestBuilder.cc107
2 files changed, 121 insertions, 70 deletions
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)";
+}
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-13 10:11:06 +0000