refactor(component): move archive/bundle/pkgconfig/rename out of tools

Post-install helpers are component oficios, not activatable tools.
Keep BUILDMASTER_RENAME_VARIANTS and _BM_PC_* names. Rename functions
to _bm_component_{archive,rename,pkgconfig}_*.

Author: StormBytePP

tools/archive/find_archiver.cmake component/archive/find_archiver.cmaketools/archive/find_archiver.cmake renamed to component/archive/find_archiver.cmake

@@ -1,5 +1,5 @@
 # =============================================================================
-# tools/archive/find_archiver.cmake — static archiver resolution (shared)
+# component/archive/find_archiver.cmake — static archiver resolution (shared)
 # =============================================================================
 
 ## @brief Resolve the static archiver for this toolchain/host.
@@ -19,8 +19,8 @@
 ## @note Missing archiver is fatal (`_bm_log_message(ARCHIVE FATAL …)`).
 ## @note Safe to include from `cmake -P` scripts after `log.cmake` (the archive
 ##       helpers stub already does that).
-function(_bm_tools_archive_find out_path out_style)
-	_bm_log_message(ARCHIVE LOWLEVEL "Entering _bm_tools_archive_find")
+function(_bm_component_archive_find out_path out_style)
+	_bm_log_message(ARCHIVE LOWLEVEL "Entering _bm_component_archive_find")
 	if(ARGC GREATER 2)
 		set(_hint "${ARGV2}")
 	else()
@@ -64,7 +64,7 @@ function(_bm_tools_archive_find out_path out_style)
 
 	if(_found STREQUAL "")
 		_bm_log_message(ARCHIVE FATAL
-			"_bm_tools_archive_find: no archiver found (CMAKE_AR, ENV{AR}, llvm-lib/lib, llvm-ar/gcc-ar/ar)")
+			"_bm_component_archive_find: no archiver found (CMAKE_AR, ENV{AR}, llvm-lib/lib, llvm-ar/gcc-ar/ar)")
 	endif()
 
 	get_filename_component(_name "${_found}" NAME)
@@ -79,5 +79,5 @@ function(_bm_tools_archive_find out_path out_style)
 	_bm_log_message(ARCHIVE DEBUG "archiver=${_found} style=${_style}")
 	set(${out_path} "${_found}" PARENT_SCOPE)
 	set(${out_style} "${_style}" PARENT_SCOPE)
-	_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_tools_archive_find")
+	_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_component_archive_find")
 endfunction()

tools/archive/helpers.cmake component/archive/helpers.cmaketools/archive/helpers.cmake renamed to component/archive/helpers.cmake

@@ -1,18 +1,18 @@
 # =============================================================================
-# tools/archive/helpers.cmake — include stub
+# component/archive/helpers.cmake — include stub
 # =============================================================================
 # Usable from configure-time helpers and from cmake -P scripts (pass
 # BUILDMASTER_SRCDIR and include this file). Implementation lives next to
 # this stub. Including strip_msvc_res.cmake is safe from other -P scripts
 # because that file only runs its CLI body when it is the -P entry point.
 
 if(DEFINED BUILDMASTER_SRCDIR AND EXISTS "${BUILDMASTER_SRCDIR}/log.cmake")
-	include("${BUILDMASTER_SRCDIR}/log.cmake")
+    include("${BUILDMASTER_SRCDIR}/log.cmake")
 elseif(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../../log.cmake")
-	include("${CMAKE_CURRENT_LIST_DIR}/../../log.cmake")
+    include("${CMAKE_CURRENT_LIST_DIR}/../../log.cmake")
 endif()
 if(COMMAND _bm_log_level_init)
-	_bm_log_level_init()
+    _bm_log_level_init()
 endif()
 
 include("${CMAKE_CURRENT_LIST_DIR}/find_archiver.cmake")

tools/archive/strip_msvc_res.cmake component/archive/strip_msvc_res.cmaketools/archive/strip_msvc_res.cmake renamed to component/archive/strip_msvc_res.cmake

@@ -1,16 +1,16 @@
 # =============================================================================
-# tools/archive/strip_msvc_res.cmake
+# component/archive/strip_msvc_res.cmake
 # =============================================================================
-# Function: _bm_ar_strip_msvc_res(lib)
+# Function: _bm_component_archive_strip_msvc_res(lib)
 # Script:  cmake -DLIB=<archive.lib> -DBUILDMASTER_SRCDIR=<root>
-#          [-DCMAKE_AR=…] -P tools/archive/strip_msvc_res.cmake
+#          [-DCMAKE_AR=…] -P component/archive/strip_msvc_res.cmake
 #
 # After RENAME: list members of a static MSVC/clang-cl archive and
 # /REMOVE every member whose basename ends in .res (case-insensitive).
 # Missing archive, non-msvc_lib archiver, empty list, or already-stripped
 # members are not fatal.
 #
-# This file is also included from tools/archive/helpers.cmake so install_exec
+# This file is also included from component/archive/helpers.cmake so install_exec
 # and other -P scripts can call the function. Script-mode body MUST only run
 # when *this* file is the -P entry point. CMAKE_SCRIPT_MODE_FILE is set for
 # *any* cmake -P (e.g. merge_static_archives.cmake); comparing against
@@ -27,13 +27,13 @@ if(NOT COMMAND buildmaster_message)
 	endif()
 endif()
 
-if(NOT COMMAND _bm_tools_archive_find)
+if(NOT COMMAND _bm_component_archive_find)
 	include("${CMAKE_CURRENT_LIST_DIR}/find_archiver.cmake")
 endif()
 
 ## @brief Strip `*.res` members from one MSVC/clang-cl static archive.
 ## @param[in] lib Absolute path to the `.lib` (canonical name, post-RENAME).
-## @note Resolves the archiver via `_bm_tools_archive_find`. If the style
+## @note Resolves the archiver via `_bm_component_archive_find`. If the style
 ##       is not `msvc_lib` (Unix `ar` / `llvm-ar`), this is a silent no-op.
 ## @note Lists members with `/LIST`. A member is removed only when its
 ##       basename matches `*.res` / `*.RES` (case-insensitive). Paths such
@@ -42,27 +42,27 @@ endif()
 ## @note `/REMOVE` uses the member string exactly as `/LIST` printed it.
 ## @note Missing `lib`, failed `/LIST`, or failed `/REMOVE` of one member
 ##       do not abort the parent install (`WARNING` / `DEBUG` only).
-function(_bm_ar_strip_msvc_res lib)
-	_bm_log_message(ARCHIVE LOWLEVEL "Entering _bm_ar_strip_msvc_res")
+function(_bm_component_archive_strip_msvc_res lib)
+	_bm_log_message(ARCHIVE LOWLEVEL "Entering _bm_component_archive_strip_msvc_res")
 	if("${lib}" STREQUAL "")
-		_bm_log_message(ARCHIVE FATAL "_bm_ar_strip_msvc_res: empty lib path")
+		_bm_log_message(ARCHIVE FATAL "_bm_component_archive_strip_msvc_res: empty lib path")
 	endif()
 
 	if(NOT EXISTS "${lib}")
 		_bm_log_message(ARCHIVE DEBUG "strip_msvc_res: missing ${lib} (skip)")
-		_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_ar_strip_msvc_res")
+		_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_component_archive_strip_msvc_res")
 		return()
 	endif()
 
 	set(_hint "")
 	if(DEFINED CMAKE_AR AND NOT CMAKE_AR STREQUAL "")
 		set(_hint "${CMAKE_AR}")
 	endif()
-	_bm_tools_archive_find(_bm_ar _bm_style "${_hint}")
+	_bm_component_archive_find(_bm_ar _bm_style "${_hint}")
 	if(NOT _bm_style STREQUAL "msvc_lib")
 		_bm_log_message(ARCHIVE DEBUG
 			"strip_msvc_res: archiver style '${_bm_style}' is not msvc_lib (skip)")
-		_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_ar_strip_msvc_res")
+		_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_component_archive_strip_msvc_res")
 		return()
 	endif()
 
@@ -76,7 +76,7 @@ function(_bm_ar_strip_msvc_res lib)
 	if(NOT _rc EQUAL 0)
 		_bm_log_message(ARCHIVE WARNING
 			"strip_msvc_res: /LIST failed on ${lib} (${_rc}): ${_err}")
-		_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_ar_strip_msvc_res")
+		_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_component_archive_strip_msvc_res")
 		return()
 	endif()
 
@@ -112,7 +112,7 @@ function(_bm_ar_strip_msvc_res lib)
 
 	_bm_log_message(ARCHIVE DEBUG
 		"strip_msvc_res: removed ${_removed} .res member(s) from ${lib}")
-	_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_ar_strip_msvc_res")
+	_bm_log_message(ARCHIVE LOWLEVEL "Exiting _bm_component_archive_strip_msvc_res")
 endfunction()
 
 if(CMAKE_SCRIPT_MODE_FILE AND CMAKE_SCRIPT_MODE_FILE STREQUAL CMAKE_CURRENT_LIST_FILE)
@@ -123,5 +123,5 @@ if(CMAKE_SCRIPT_MODE_FILE AND CMAKE_SCRIPT_MODE_FILE STREQUAL CMAKE_CURRENT_LIST
 			message(FATAL_ERROR "strip_msvc_res: need -DLIB=")
 		endif()
 	endif()
-	_bm_ar_strip_msvc_res("${LIB}")
+	_bm_component_archive_strip_msvc_res("${LIB}")
 endif()

tools/bundle/merge_static_archives.cmake …onent/bundle/merge_static_archives.cmaketools/bundle/merge_static_archives.cmake renamed to component/bundle/merge_static_archives.cmake tools/bundle/merge_static_archives.cmake renamed to component/bundle/merge_static_archives.cmake

@@ -29,8 +29,8 @@ endforeach()
 get_filename_component(_out_dir "${OUTPUT}" DIRECTORY)
 file(MAKE_DIRECTORY "${_out_dir}")
 
-include("${BUILDMASTER_SRCDIR}/tools/archive/helpers.cmake")
-_bm_tools_archive_find(_ar _style)
+include("${BUILDMASTER_SRCDIR}/component/archive/helpers.cmake")
+_bm_component_archive_find(_ar _style)
 
 # Apple ar has no MRI (-M). Prefer libtool -static.
 if(APPLE)

component/helpers.cmake

@@ -27,6 +27,11 @@ include("${CMAKE_CURRENT_LIST_DIR}/toolchain_inherit.cmake")
 # Static archive merge (REPACK on buildmaster_meta).
 include("${CMAKE_CURRENT_LIST_DIR}/repack.cmake")
 
+# Post-install helpers (were under tools/).
+include("${CMAKE_CURRENT_LIST_DIR}/archive/helpers.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/rename/variants.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/pkgconfig/helpers.cmake")
+
 # Deferred materialize + fragment emit + finalize.
 include("${CMAKE_CURRENT_LIST_DIR}/materialize.cmake")
 

component/materialize/fragment.cmake

@@ -22,9 +22,9 @@
 ##       (`OUTPUT <file>` `DEPENDS` `<id>_install`) for each extra.
 ## @note `_BM_STRIPRES_ENABLED` is `1` only for static mode when STRIPRES is on
 ##       (default ON). Shared/headers never strip; install_exec is a no-op there.
-## @note `_BM_PC_*` comes from `_bm_pc_fill_vars` (tools/pkgconfig).
-##       ENABLED is `1` only when `PC={…}` is on and not BUILDONLY (already FATAL
-##       at _bm_graph_create).
+## @note `_BM_PC_*` comes from `_bm_component_pkgconfig_fill_vars`
+##       (`component/pkgconfig`). ENABLED is `1` only when `PC={…}` is on and
+##       not BUILDONLY (already FATAL at _bm_graph_create).
 function(_bm_materialize_collect_outputs _component)
 	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_materialize_collect_outputs")
 	get_property(_library_mode GLOBAL PROPERTY BUILDMASTER_COMPONENT_${_component}_MODE)
@@ -58,7 +58,7 @@ function(_bm_materialize_collect_outputs _component)
 		set(_BM_STRIPRES_ENABLED "0")
 	endif()
 
-	_bm_pc_fill_vars("${_component}")
+	_bm_component_pkgconfig_fill_vars("${_component}")
 
 	set(_LIBRARY_COMPONENT_NAMES "")
 	set(_LIBRARY_COMPONENT_FILES "")
@@ -302,7 +302,7 @@ function(_bm_materialize_write_fragment _component _deferred)
 				VERBATIM
 			)
 			_bm_log_message(COMPONENT DEBUG
-				"Ninja file rule for spec-link '${_file}' via '${_component}_install'")
+				"Ninja file rule for spec-link '${_file}' via '${_component}_install")
 		endforeach()
 	endif()
 

tools/pkgconfig/fields.cmake component/pkgconfig/fields.cmaketools/pkgconfig/fields.cmake renamed to component/pkgconfig/fields.cmake

@@ -1,14 +1,14 @@
 # =============================================================================
-# tools/pkgconfig/fields.cmake — helper .pc field assembly
+# component/pkgconfig/fields.cmake — helper .pc field assembly
 # =============================================================================
 
 ## @brief Drop include-path tokens from a flag string.
 ## @param[in]  flags   Space-separated compiler flags.
 ## @param[out] out_var Parent-scope string without `-I`, `/I`, `-isystem`.
 ## @note Those paths belong to the BM prefix env, not to a helper .pc.
 ## @note Empty `flags` yields an empty string.
-function(_bm_pc_drop_include_tokens flags out_var)
-	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_pc_drop_include_tokens")
+function(_bm_component_pkgconfig_drop_include_tokens flags out_var)
+	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_component_pkgconfig_drop_include_tokens")
 	set(_keep "")
 	separate_arguments(_toks UNIX_COMMAND "${flags}")
 	foreach(_t IN LISTS _toks)
@@ -23,16 +23,16 @@ function(_bm_pc_drop_include_tokens flags out_var)
 	string(REPLACE ";" " " _joined "${_keep}")
 	string(STRIP "${_joined}" _joined)
 	set(${out_var} "${_joined}" PARENT_SCOPE)
-	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_pc_drop_include_tokens")
+	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_component_pkgconfig_drop_include_tokens")
 endfunction()
 
 ## @brief Tokens in `child` that are not in `parent`.
 ## @param[in]  parent  Parent job flags (space-separated).
 ## @param[in]  child   Component flags (space-separated).
 ## @param[out] out_var Parent-scope leftover string.
 ## @note Comparison is exact token match after `separate_arguments`.
-function(_bm_pc_subtract_parent parent child out_var)
-	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_pc_subtract_parent")
+function(_bm_component_pkgconfig_subtract_parent parent child out_var)
+	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_component_pkgconfig_subtract_parent")
 	separate_arguments(_p UNIX_COMMAND "${parent}")
 	separate_arguments(_c UNIX_COMMAND "${child}")
 	set(_out "")
@@ -52,16 +52,16 @@ function(_bm_pc_subtract_parent parent child out_var)
 	string(REPLACE ";" " " _joined "${_out}")
 	string(STRIP "${_joined}" _joined)
 	set(${out_var} "${_joined}" PARENT_SCOPE)
-	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_pc_subtract_parent")
+	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_component_pkgconfig_subtract_parent")
 endfunction()
 
 ## @brief Pull C/C++ flag strings out of a component option list.
 ## @param[in]  options Semicolon list (`-DCMAKE_C_FLAGS=…`, `-Dc_args=…`, …).
 ## @param[out] out_var Parent-scope combined flag string.
 ## @note Recognized prefixes: `-DCMAKE_C_FLAGS=`, `-DCMAKE_CXX_FLAGS=`,
 ##       `-Dc_args=`, `-Dcpp_args=`. Other options are ignored.
-function(_bm_pc_options_flags options out_var)
-	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_pc_options_flags")
+function(_bm_component_pkgconfig_options_flags options out_var)
+	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_component_pkgconfig_options_flags")
 	set(_acc "")
 	foreach(_opt IN LISTS options)
 		if(_opt MATCHES "^-DCMAKE_C_FLAGS=(.*)$")
@@ -76,10 +76,10 @@ function(_bm_pc_options_flags options out_var)
 	endforeach()
 	string(STRIP "${_acc}" _acc)
 	set(${out_var} "${_acc}" PARENT_SCOPE)
-	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_pc_options_flags")
+	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_component_pkgconfig_options_flags")
 endfunction()
 
-## @brief Fill `_BM_PC_*` for `install_exec` / `_bm_tools_*_stages`.
+## @brief Fill `_BM_PC_*` for `install_exec` / create_*_stages.
 ## @param[in] id Registered component id.
 ## @note Parent-scope: `_BM_PC_ENABLED` (`1`/`0`), `_BM_PC_NAME`,
 ##       `_BM_PC_VERSION`, `_BM_PC_DESCRIPTION`, `_BM_PC_LIBS`,
@@ -88,8 +88,8 @@ endfunction()
 ##       components with PC enabled (not metas). Cflags are component
 ##       extras minus parent `CMAKE_C{,XX}_FLAGS`, minus include tokens.
 ## @note When PC is off, all string outs are empty and ENABLED is `0`.
-function(_bm_pc_fill_vars id)
-	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_pc_fill_vars")
+function(_bm_component_pkgconfig_fill_vars id)
+	_bm_log_message(COMPONENT LOWLEVEL "Entering _bm_component_pkgconfig_fill_vars")
 	get_property(_on GLOBAL PROPERTY BUILDMASTER_COMPONENT_${id}_PC)
 	if(NOT _on)
 		set(_BM_PC_ENABLED "0" PARENT_SCOPE)
@@ -100,7 +100,7 @@ function(_bm_pc_fill_vars id)
 		set(_BM_PC_REQUIRES "" PARENT_SCOPE)
 		set(_BM_PC_CFLAGS "" PARENT_SCOPE)
 		set(_BM_PC_OUT "" PARENT_SCOPE)
-		_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_pc_fill_vars")
+		_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_component_pkgconfig_fill_vars")
 		return()
 	endif()
 
@@ -153,10 +153,10 @@ function(_bm_pc_fill_vars id)
 	endif()
 	string(REPLACE ";" ", " _req "${_req}")
 
-	_bm_pc_options_flags("${_opts}" _child_flags)
+	_bm_component_pkgconfig_options_flags("${_opts}" _child_flags)
 	set(_parent_flags "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}")
-	_bm_pc_subtract_parent("${_parent_flags}" "${_child_flags}" _delta)
-	_bm_pc_drop_include_tokens("${_delta}" _cflags)
+	_bm_component_pkgconfig_subtract_parent("${_parent_flags}" "${_child_flags}" _delta)
+	_bm_component_pkgconfig_drop_include_tokens("${_delta}" _cflags)
 
 	set(_out "${BUILDMASTER_INSTALL_LIBDIR}/pkgconfig/${_name}.pc")
 
@@ -169,5 +169,5 @@ function(_bm_pc_fill_vars id)
 	set(_BM_PC_CFLAGS "${_cflags}" PARENT_SCOPE)
 	set(_BM_PC_OUT "${_out}" PARENT_SCOPE)
 	_bm_log_message(COMPONENT DEBUG "PC fields for ${id}: ${_name} ${_ver} → ${_out}")
-	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_pc_fill_vars")
+	_bm_log_message(COMPONENT LOWLEVEL "Exiting _bm_component_pkgconfig_fill_vars")
 endfunction()

tools/pkgconfig/helpers.cmake component/pkgconfig/helpers.cmaketools/pkgconfig/helpers.cmake renamed to component/pkgconfig/helpers.cmake

@@ -1,5 +1,5 @@
 # =============================================================================
-# tools/pkgconfig/helpers.cmake — include stub only
+# component/pkgconfig/helpers.cmake — include stub only
 # =============================================================================
 
 include("${CMAKE_CURRENT_LIST_DIR}/../../log.cmake")

tools/pkgconfig/write_pc.cmake component/pkgconfig/write_pc.cmaketools/pkgconfig/write_pc.cmake renamed to component/pkgconfig/write_pc.cmake

@@ -1,5 +1,5 @@
 # =============================================================================
-# tools/pkgconfig/write_pc.cmake
+# component/pkgconfig/write_pc.cmake
 # =============================================================================
 # cmake -DPC_NAME= -DPC_VERSION= -DPC_DESCRIPTION= -DPC_LIBS=
 #       -DPC_REQUIRES= -DPC_CFLAGS= -DPREFIX= -DLIBDIR= -DINCLUDEDIR=