diff options
| -rw-r--r-- | CMakeLists.txt | 19 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | include/NeBuildKit/Detail/Config.h | 4 | ||||
| -rw-r--r-- | include/NeBuildKit/IManifestBuilder.h | 4 | ||||
| -rw-r--r-- | include/NeBuildKit/JSONManifestBuilder.h | 4 | ||||
| -rw-r--r-- | include/NeBuildKit/TOMLManifestBuilder.h | 4 | ||||
| -rw-r--r-- | install_windows.cmake | 19 | ||||
| -rw-r--r-- | src/cli/main.cc | 4 | ||||
| -rw-r--r-- | src/lib/IManifestBuilder.cc | 4 | ||||
| -rw-r--r-- | src/lib/JSONManifestBuilder.cc | 4 | ||||
| -rw-r--r-- | src/lib/TOMLManifestBuilder.cc | 21 |
11 files changed, 42 insertions, 49 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 909e9a9..7fb7068 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ # // ============================================================= // -# // nebuild +# // NeBuild # // Copyright (C) 2025, Amlal El Mahrouss, licensed under BSD-3 license. # // ============================================================= // # AMLALE: Update the CMake version, which requires a version that was too old. -cmake_minimum_required(VERSION 4.00) +cmake_minimum_required(VERSION 3.30) project(nebuild VERSION 0.1 LANGUAGES CXX) @@ -24,21 +24,12 @@ target_include_directories(nebuild PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_S option(BUILD_WINDOWS "Produce a Windows executable name (nebuild.exe)" OFF) -# Append .exe when it's a Windows build (The Windows loader requires it) -if(BUILD_WINDOWS) - set_target_properties(nebuild PROPERTIES OUTPUT_NAME "nebuild.exe") -endif() - add_custom_target(build-nebuild COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target nebuild COMMENT "=> NeBuild built successfully for POSIX." ) -add_custom_target(build-nebuild-windows - COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target nebuild - COMMENT "=> NeBuild built successfully for Windows (configure with -DBUILD_WINDOWS=ON)." -) - message(STATUS "Sources: ${NEBUILD_SOURCES}") -message(STATUS "Include dirs: ${CMAKE_SOURCE_DIR}/src;${CMAKE_SOURCE_DIR}/vendor") -message(STATUS "To build for Windows-style executable: configure with -DBUILD_WINDOWS=ON") +message(STATUS "Include Dirs: ${CMAKE_SOURCE_DIR}/src;${CMAKE_SOURCE_DIR}/vendor") + +include(install_windows.cmake)
\ No newline at end of file @@ -1,6 +1,6 @@ # // ============================================================= // -# // nebuild -# // Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +# // NeBuild +# // Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. # // ============================================================= // SUDO=sudo diff --git a/include/NeBuildKit/Detail/Config.h b/include/NeBuildKit/Detail/Config.h index fc2e9cc..22e144f 100644 --- a/include/NeBuildKit/Detail/Config.h +++ b/include/NeBuildKit/Detail/Config.h @@ -1,6 +1,6 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #pragma once diff --git a/include/NeBuildKit/IManifestBuilder.h b/include/NeBuildKit/IManifestBuilder.h index 95fb6b4..e734847 100644 --- a/include/NeBuildKit/IManifestBuilder.h +++ b/include/NeBuildKit/IManifestBuilder.h @@ -1,6 +1,6 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #pragma once diff --git a/include/NeBuildKit/JSONManifestBuilder.h b/include/NeBuildKit/JSONManifestBuilder.h index 4f3cec5..746f0b5 100644 --- a/include/NeBuildKit/JSONManifestBuilder.h +++ b/include/NeBuildKit/JSONManifestBuilder.h @@ -1,6 +1,6 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #pragma once diff --git a/include/NeBuildKit/TOMLManifestBuilder.h b/include/NeBuildKit/TOMLManifestBuilder.h index b4d61b8..42af72d 100644 --- a/include/NeBuildKit/TOMLManifestBuilder.h +++ b/include/NeBuildKit/TOMLManifestBuilder.h @@ -1,6 +1,6 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #pragma once diff --git a/install_windows.cmake b/install_windows.cmake new file mode 100644 index 0000000..38d9869 --- /dev/null +++ b/install_windows.cmake @@ -0,0 +1,19 @@ +# // ============================================================= // +# // NeBuild +# // Copyright (C) 2025, Amlal El Mahrouss, licensed under BSD-3 license. +# // ============================================================= // + +# AMLALE: Update the CMake version, which requires a version that was too old. +cmake_minimum_required(VERSION 3.30) + +# Append .exe when it's a Windows build (The Windows loader requires it) +if(BUILD_WINDOWS) + set_target_properties(nebuild PROPERTIES OUTPUT_NAME "nebuild.exe") + + add_custom_target(build-nebuild-windows + COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target nebuild + COMMENT "=> NeBuild built successfully for Windows (configure with -DBUILD_WINDOWS=ON)." + ) +endif() + +message(STATUS "To build for Windows-style executable: configure with -DBUILD_WINDOWS=ON")
\ No newline at end of file diff --git a/src/cli/main.cc b/src/cli/main.cc index e79cc6e..dd2590b 100644 --- a/src/cli/main.cc +++ b/src/cli/main.cc @@ -1,7 +1,7 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #include <NeBuildKit/JSONManifestBuilder.h> diff --git a/src/lib/IManifestBuilder.cc b/src/lib/IManifestBuilder.cc index 464004e..2a61ed0 100644 --- a/src/lib/IManifestBuilder.cc +++ b/src/lib/IManifestBuilder.cc @@ -1,6 +1,6 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #include <NeBuildKit/IManifestBuilder.h> diff --git a/src/lib/JSONManifestBuilder.cc b/src/lib/JSONManifestBuilder.cc index 83f1089..e35a783 100644 --- a/src/lib/JSONManifestBuilder.cc +++ b/src/lib/JSONManifestBuilder.cc @@ -1,6 +1,6 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #include <NeBuildKit/JSONManifestBuilder.h> diff --git a/src/lib/TOMLManifestBuilder.cc b/src/lib/TOMLManifestBuilder.cc index 257c4a3..757f3fc 100644 --- a/src/lib/TOMLManifestBuilder.cc +++ b/src/lib/TOMLManifestBuilder.cc @@ -1,6 +1,6 @@ // ============================================================= // -// nebuild -// Copyright (C) 2024-2025, Amlal El Mahrouss, licensed under BSD-3 license. +// NeBuild +// Copyright (C) 2024-2025, Amlal El Mahrouss and NeKernel Authors, licensed under BSD-3 license. // ============================================================= // #include <NeBuildKit/TOMLManifestBuilder.h> @@ -100,23 +100,6 @@ bool TOMLManifestBuilder::BuildTarget(BuildConfig& config) { config.has_failed_ = true; return false; } - - if (!config.dry_run_) { - auto run_after_build = toml_file["run_after_build"].as_boolean(); - if (!run_after_build) return true; - - auto val = run_after_build->get(); - if (val) { - ret_exec = std::system(target.c_str()); - - if (ret_exec > 0) { - NeBuild::Logger::info() << "error: exit with message: " << std::strerror(ret_exec) << "" - << std::endl; - config.has_failed_ = true; - return false; - } - } - } } catch (std::runtime_error& err) { NeBuild::Logger::info() << "error: exit with message: " << err.what() << "" << std::endl; config.has_failed_ = true; |
