From 1b5097d5035cb73a4845e914021851bf81186bfb Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@nekernel.org>
Date: Sat, 29 Nov 2025 21:15:44 -0500
Subject: chore: NeBuildKit: Architectural improvements over
 {Defines+Includes}.h

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
---
 include/NeBuildKit/Config.h           | 48 +++++++++++++++++++++++++++++++++++
 include/NeBuildKit/Defines.h          | 34 -------------------------
 include/NeBuildKit/IManifestBuilder.h |  2 +-
 include/NeBuildKit/Imports.h          | 23 -----------------
 4 files changed, 49 insertions(+), 58 deletions(-)
 create mode 100644 include/NeBuildKit/Config.h
 delete mode 100644 include/NeBuildKit/Defines.h
 delete mode 100644 include/NeBuildKit/Imports.h

(limited to 'include/NeBuildKit')

diff --git a/include/NeBuildKit/Config.h b/include/NeBuildKit/Config.h
new file mode 100644
index 0000000..00be9de
--- /dev/null
+++ b/include/NeBuildKit/Config.h
@@ -0,0 +1,48 @@
+// ============================================================= //
+// nebuild
+// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license.
+// ============================================================= //
+
+#pragma once
+
+/// =========================================================== ///
+/// @author Amlal El Mahrouss
+/// =========================================================== ///
+
+#include <rang/rang.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <thread>
+
+#define LIKELY(ARG) ((ARG) ? assert(false) : ((void) 0))
+#define UNLIKELY(ARG) LIKELY(!(ARG))
+
+#define LIBNEBUILD_VERSION "v0.0.7-buildkit"
+
+#define LIBNEBUILD_VERSION_BCD 0x0007
+
+#define LIBNEBUILD_VERSION_MAJOR 0
+#define LIBNEBUILD_VERSION_MINOR 0
+#define LIBNEBUILD_VERSION_PATCH 7
+
+#define LIBNEBUILD_EXPORT_C extern "C"
+
+#define LIBNEBUILD_UNUSED(X) ((void) X)
+
+namespace NeBuild {}
+
+namespace NeBuild::Logger {
+/// @brief replacement for std::cout for NeBuild logging.
+inline std::ostream& info() noexcept {
+  auto& out = std::cout;
+  out << rang::fg::red << "nebuild: " << rang::style::reset;
+  return out;
+}
+}  // namespace NeBuild::Logger
+
+
diff --git a/include/NeBuildKit/Defines.h b/include/NeBuildKit/Defines.h
deleted file mode 100644
index 06d936f..0000000
--- a/include/NeBuildKit/Defines.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// ============================================================= //
-// nebuild
-// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license.
-// ============================================================= //
-
-#pragma once
-
-#include <NeBuildKit/Imports.h>
-
-/// =========================================================== ///
-/// @brief Defines file
-/// =========================================================== ///
-
-#define LIKELY(ARG) ((ARG) ? assert(false) : ((void) 0))
-#define UNLIKELY(ARG) LIKELY(!(ARG))
-
-#define LIBNEBUILD_VERSION "v0.0.7-buildkit"
-
-#define LIBNEBUILD_VERSION_BCD 0x0007
-
-#define LIBNEBUILD_VERSION_MAJOR 1
-#define LIBNEBUILD_VERSION_MINOR 1
-#define LIBNEBUILD_VERSION_PATCH 0
-
-#define LIBNEBUILD_UNUSED(X) ((void) X)
-
-namespace NeBuild::Logger {
-/// @brief replacement for std::cout for NeBuild logging.
-inline std::ostream& info() noexcept {
-  auto& out = std::cout;
-  out << rang::fg::red << "nebuild: " << rang::style::reset;
-  return out;
-}
-}  // namespace NeBuild::Logger
diff --git a/include/NeBuildKit/IManifestBuilder.h b/include/NeBuildKit/IManifestBuilder.h
index 96c80c3..7d3101c 100644
--- a/include/NeBuildKit/IManifestBuilder.h
+++ b/include/NeBuildKit/IManifestBuilder.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <NeBuildKit/Defines.h>
+#include <NeBuildKit/Config.h>
 
 #define NEBUILD_MANIFEST_BUILDER : public ::NeBuild::IManifestBuilder
 
diff --git a/include/NeBuildKit/Imports.h b/include/NeBuildKit/Imports.h
deleted file mode 100644
index 33e1e31..0000000
--- a/include/NeBuildKit/Imports.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// ============================================================= //
-// nebuild
-// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license.
-// ============================================================= //
-
-#ifndef NEBUILD_INCLUDES_H
-#define NEBUILD_INCLUDES_H
-
-/// =========================================================== ///
-/// @brief Imports file
-/// =========================================================== ///
-
-#include <rang/rang.h>
-#include <cassert>
-#include <cstddef>
-#include <cstdio>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <thread>
-
-#endif  // NEBUILD_INCLUDES_H
-- 
cgit v1.2.3