diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2026-01-30 08:06:09 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2026-01-30 08:06:09 +0100 |
| commit | 0760932c4532cdfcb15a68cbf5a16d0845d0e9f7 (patch) | |
| tree | 30fc43092eb552e7ce2a1d94cd3ecdfdbc874dcc | |
| parent | 635401b6a71dd7466604f25a1591ba324125d133 (diff) | |
feat: Windows DLL support, descriptions support.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | scripts/osx.json | 10 | ||||
| -rw-r--r-- | scripts/posix.json | 10 | ||||
| -rw-r--r-- | scripts/win64-dylib.json | 10 | ||||
| -rw-r--r-- | scripts/win64.json | 10 | ||||
| -rw-r--r-- | src/lib/JSONManifestBuilder.cc | 7 |
6 files changed, 19 insertions, 32 deletions
@@ -1,12 +1,12 @@ # // ============================================================= // # // NeBuild -# // Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. +# // Copyright (C) 2024-2026, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. # // ============================================================= // SUDO=sudo GCC=clang++ GCC_MINGW=x86_64-w64-mingw32-g++ -CXXFLAGS=-I./include -I./vendor -lNeBuildKit +CXXFLAGS=-I./include -L/usr/local/lib -I./vendor -lNeBuildKit CXXSTD= -std=c++20 SRC=$(wildcard src/cli/*.cc) OUT=nebuild diff --git a/scripts/osx.json b/scripts/osx.json deleted file mode 100644 index bdcab49..0000000 --- a/scripts/osx.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compiler_path": "clang++", - "compiler_std": "c++20", - "headers_path": ["include", "vendor"], - "sources_path": ["src/lib/*.cc", "src/cli/*.cc"], - "output_name": "nebuild", - "compiler_flags": ["-fPIC"], - "cpp_macros": ["NEBUILD_POSIX", "NEBUILD_OSX"], - "run_after_build": false -} diff --git a/scripts/posix.json b/scripts/posix.json deleted file mode 100644 index 679296c..0000000 --- a/scripts/posix.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compiler_path": "clang++", - "compiler_std": "c++20", - "headers_path": ["include/", "vendor"], - "sources_path": ["src/lib/*.cc", "src/cli/*.cc"], - "output_name": "nebuild", - "compiler_flags": ["-fPIC"], - "cpp_macros": ["NEBUILD_POSIX"], - "run_after_build": false -} diff --git a/scripts/win64-dylib.json b/scripts/win64-dylib.json new file mode 100644 index 0000000..d7c9f0e --- /dev/null +++ b/scripts/win64-dylib.json @@ -0,0 +1,10 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++.exe", + "compiler_std": "c++20", + "headers_path": ["include", "vendor"], + "sources_path": ["src/lib/*.cc"], + "output_name": "libNeBuildKit.dll", + "compiler_flags": ["-fPIC", "-shared"], + "cpp_macros": ["NEBUILD_WINDOWS", "NEBUILD_INTERNAL_SDK"], + "run_after_build": false +} diff --git a/scripts/win64.json b/scripts/win64.json deleted file mode 100644 index 75c025a..0000000 --- a/scripts/win64.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++.exe", - "compiler_std": "c++20", - "headers_path": ["include", "vendor"], - "sources_path": ["src/lib/*.cc", "src/cli/*.cc"], - "output_name": "nebuild.exe", - "compiler_flags": ["-fPIC"], - "cpp_macros": ["NEBUILD_WINDOWS"], - "run_after_build": false -} diff --git a/src/lib/JSONManifestBuilder.cc b/src/lib/JSONManifestBuilder.cc index 9dce796..5983b3c 100644 --- a/src/lib/JSONManifestBuilder.cc +++ b/src/lib/JSONManifestBuilder.cc @@ -44,6 +44,13 @@ bool JSONManifestBuilder::BuildTarget(BuildConfig& config) { nlohmann::json json_obj = nlohmann::json::parse(json); + nlohmann::json description = json_obj["description"]; + + NeBuild::Logger::info() << "nebuild: installing: " << path << std::endl; + + if (auto res = description.get<std::string>(); !res.empty()) + NeBuild::Logger::info() << "nebuild: description: " << res << std::endl; + std::string compiler = json_obj["compiler_path"].get<std::string>(); std::string command = compiler + " "; |