ceedling 1.0.0 → 1.1.0

data/lib/ceedling/rake_app/rake_wrapper.rb

@@ -0,0 +1,40 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'rubygems'
+require 'rake'
+require 'ceedling/makefile' # our replacement for rake's make-style dependency loader
+
+include Rake::DSL if defined?(Rake::DSL)
+
+class Rake::Task
+  attr_reader :already_invoked
+end
+
+class RakeWrapper
+
+  def initialize
+    @makefile_loader = Rake::MakefileLoader.new # use our custom replacement noted above
+  end
+
+  def [](task)
+    return Rake::Task[task]
+  end
+
+  def task_list
+    return Rake::Task.tasks
+  end
+
+  def create_file_task(file_task, dependencies)
+    file(file_task => dependencies)
+  end
+
+  def load_dependencies(dependencies_path)
+    @makefile_loader.load(dependencies_path)
+  end
+
+end

data/lib/ceedling/rake_app/rakefile_component_resolver.rb

@@ -0,0 +1,77 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+# Resolves the ordered list of .rake files Ceedling will load for a given project
+# configuration. Callable from both bin/ (early, before do_setup) and lib/ (within
+# ConfiguratorPlugins). Config must be in structured (pre-flatten) format.
+module RakefileComponentResolver
+  module_function
+
+  STOCK_RAKE_FILES = %w[
+    tasks_base.rake
+    tasks_filesystem.rake
+    tasks_tests.rake
+    rules_tests.rake
+  ].freeze
+
+  RELEASE_RAKE_FILES = %w[
+    rules_release.rake
+    tasks_release.rake
+  ].freeze
+
+  # Returns ordered plugin search paths: user-configured paths first, built-in Ceedling
+  # plugins path last. This ordering lets user plugins shadow built-in plugins of the
+  # same name. Used by both resolve() (bin/ CLI scope) and Configurator#prepare_plugins_load_paths
+  # (application scope) so both scopes search plugins in the same priority order.
+  def prepare_plugin_load_paths(config, ceedling_plugins_path)
+    load_paths = Array( config.dig(:plugins, :load_paths) ).dup
+    load_paths << ceedling_plugins_path
+    load_paths.compact!
+    load_paths.uniq!
+    load_paths
+  end
+
+  # Returns ordered list of all .rake file paths for the given config:
+  #   - Stock files (always)
+  #   - Conditional stock files (rules_release, tasks_release if release_build is enabled)
+  #   - Plugin .rake files (first matching <root>/<plugin>/<plugin>.rake across load_paths)
+  def resolve(config, ceedling_lib_path, ceedling_plugins_path)
+    paths = STOCK_RAKE_FILES.map { |f| File.join(ceedling_lib_path, f) }
+
+    if config.dig(:project, :release_build)
+      RELEASE_RAKE_FILES.each { |f| paths << File.join(ceedling_lib_path, f) }
+    end
+
+    paths.concat(
+      plugin_rake_files( config, prepare_plugin_load_paths(config, ceedling_plugins_path) )
+    )
+
+    return paths
+  end
+
+  # Returns ordered list of .rake file paths for enabled plugins only.
+  # Searches each root in load_paths for <root>/<plugin>/<plugin>.rake.
+  # Uses File.exist? directly (no DI needed) — same check as ConfiguratorPlugins#find_rake_plugins.
+  # Array() wraps nil gracefully so missing config keys don't raise.
+  def plugin_rake_files(config, load_paths)
+    enabled = Array( config.dig(:plugins, :enabled) )
+    results = []
+
+    enabled.each do |plugin|
+      load_paths.each do |load_path|
+        candidate = File.join(load_path, plugin, "#{plugin}.rake")
+        if File.exist?(candidate)
+          results << candidate
+          break
+        end
+      end
+    end
+
+    results
+  end
+
+end

data/lib/ceedling/rakefile.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -10,6 +10,10 @@ require 'fileutils'
 # Add Unity and CMock's Ruby code paths to $LOAD_PATH for runner generation and mocking
 $LOAD_PATH.unshift( File.join( CEEDLING_APPCFG[:ceedling_vendor_path], 'unity/auto') )
 $LOAD_PATH.unshift( File.join( CEEDLING_APPCFG[:ceedling_vendor_path], 'cmock/lib') )
+# Add all subdirectories beneath ceedling_lib_path to $LOAD_PATH to support DIY construction
+Dir.glob(File.join(CEEDLING_APPCFG[:ceedling_lib_path], '**/')).each do |dir|
+  $LOAD_PATH.unshift(dir)
+end
 
 require 'rake'
 
@@ -25,12 +29,11 @@ def log_runtime(run, start_time_s, end_time_s, enabled)
   return if !defined?(PROJECT_VERBOSITY)
   return if (PROJECT_VERBOSITY < Verbosity::NORMAL)
 
-  duration = Reportinator.generate_duration( start_time_s: start_time_s, end_time_s: end_time_s )
+  duration = Reportinator.generate_duration_from_interval( start_time_s: start_time_s, end_time_s: end_time_s )
 
   return if duration.empty?
 
-  @ceedling[:loginator].log() # Blank line
-  @ceedling[:loginator].log( "Ceedling #{run} completed in #{duration}", Verbosity::NORMAL)
+  @ceedling[:loginator].log( "\nCeedling #{run} completed in #{duration}", Verbosity::NORMAL)
 end
 
 start_time = nil # Outside scope of exception handling
@@ -90,10 +93,15 @@ begin
   start_time = SystemWrapper.time_stopwatch_s()
 
   # Tell all our plugins we're about to do something
-  @ceedling[:plugin_manager].pre_build if CEEDLING_APPCFG.build_tasks?
+  @ceedling[:plugin_manager].pre_build( start_time ) if CEEDLING_APPCFG.build_tasks?
 
   # load rakefile component files (*.rake)
   PROJECT_RAKEFILE_COMPONENT_FILES.each { |component| load(component) }
+
+  # Re-scan loaded .rake files with all constants now resolvable (Pass 2).
+  # The same RakeTaskRegistry instance built in bin/ is reused via CEEDLING_HANDOFF_OBJECTS.
+  @ceedling[:rake_task_registry].register_test_tasks( PROJECT_RAKEFILE_COMPONENT_FILES )
+  @ceedling[:rake_task_registry].register_release_tasks( PROJECT_RAKEFILE_COMPONENT_FILES )
 rescue StandardError => ex
   boom_handler( @ceedling[:loginator], ex )
   exit(1)
@@ -114,12 +122,12 @@ END {
     # Tell all our plugins the build is done and process results
     begin
       if CEEDLING_APPCFG.build_tasks?
-        @ceedling[:plugin_manager].post_build
+        @ceedling[:plugin_manager].post_build( SystemWrapper.time_stopwatch_s() )
         @ceedling[:plugin_manager].print_plugin_failures
       end
       ops_done = SystemWrapper.time_stopwatch_s()
       log_runtime( 'operations', start_time, ops_done, CEEDLING_APPCFG.build_tasks? )
-      test_failures_handler() if (@ceedling[:task_invoker].test_invoked? || @ceedling[:task_invoker].invoked?(/^gcov:/))
+      test_failures_handler() if @ceedling[:rake_invocation_tracker].test_build_invoked?
     rescue => ex
       ops_done = SystemWrapper.time_stopwatch_s()
       log_runtime( 'operations', start_time, ops_done, CEEDLING_APPCFG.build_tasks? )
@@ -134,7 +142,7 @@ END {
     msg = "Ceedling could not complete operations because of errors"
     @ceedling[:loginator].log( msg, Verbosity::ERRORS, LogLabels::TITLE )
     begin
-      @ceedling[:plugin_manager].post_error if CEEDLING_APPCFG.build_tasks?
+      @ceedling[:plugin_manager].post_error( SystemWrapper.time_stopwatch_s() ) if CEEDLING_APPCFG.build_tasks?
     rescue => ex
       boom_handler( @ceedling[:loginator], ex)
     ensure

data/lib/ceedling/release_invoker.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -10,15 +10,51 @@ require 'ceedling/constants'
 
 class ReleaseInvoker
 
-  constructor :configurator, :release_invoker_helper, :dependinator, :task_invoker, :file_path_utils, :file_wrapper
+  constructor :configurator, :batchinator, :reportinator, :loginator, :rake_wrapper, :file_path_utils, :file_wrapper
 
+  def collect_release_build_objects()
+    objects = []
+
+    @batchinator.build_step( "Determining Objects to be Built", heading: false ) do
+      objects.concat(
+        @file_path_utils.form_release_build_objects_filelist(
+          @configurator.collection_release_build_input
+        )
+      )
+
+      objects.concat(
+        @file_path_utils.form_release_build_objects_filelist(
+          @configurator.collection_release_artifact_extra_link_objects
+        )
+      )
+    end
+
+    return objects    
+  end
 
   def setup_and_invoke_objects( files )
     objects = @file_path_utils.form_release_build_objects_filelist( files )
-    @task_invoker.invoke_release_objects( objects )
+
+    @batchinator.build_step( "Building Objects" ) do
+      @batchinator.exec(workload: :compile, things: objects) do |object|
+        @rake_wrapper[object].invoke
+      end    
+    end
+
     return objects
   end
 
+  def setup_and_invoke_binary( filepath )
+    @batchinator.build_step( "Building Binary" ) do
+      @rake_wrapper[filepath].invoke
+    end
+
+    banner = @reportinator.generate_banner(
+      @loginator.decorate( File.basename( filepath ), LogLabels::TITLE )
+    )
+    @loginator.log( "\n" + banner + "\n" )
+  end
+
   def artifactinate( *files )
     files.flatten.each do |file|
       @file_wrapper.cp( file, @configurator.project_release_artifacts_path ) if @file_wrapper.exist?( file )
@@ -26,10 +62,18 @@ class ReleaseInvoker
   end
 
   def convert_libraries_to_arguments(libraries)
-    args = ((libraries || []) + ((defined? LIBRARIES_SYSTEM) ? LIBRARIES_SYSTEM : [])).flatten
+    args =
+      (libraries || []) + 
+      ((defined? LIBRARIES_SYSTEM) ? LIBRARIES_SYSTEM : []) +
+      ((defined? LIBRARIES_RELEASE) ? LIBRARIES_RELEASE : [])
+
+    args.flatten!
+    args.compact!
+
     if (defined? LIBRARIES_FLAG)
       args.map! {|v| LIBRARIES_FLAG.gsub(/\$\{1\}/, v) }
     end
+
     return args
   end
 

data/lib/ceedling/reportinator.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -11,21 +11,28 @@ require 'unicode/display_width'
 # Pretifies reports
 class Reportinator
 
-  # Generate human readable string of days, hours, minutes, seconds (and 
-  # milliseconds) from a start count of seconds and end count of seconds.
-  def self.generate_duration(start_time_s:, end_time_s:)
-    return '' if start_time_s.nil? or end_time_s.nil?
-
+  # Generate human readable string of days, hours, minutes, seconds (and
+  # milliseconds) from a floating-point count of seconds. The optional
+  # +precision+ keyword controls decimal places on the sub-minute seconds
+  # field (default: 2). When +abbreviate+ is true, "hour", "minute", and
+  # "second" are shortened to "hr", "min", and "sec" (pluralized as normal).
+  def self.generate_duration_string(seconds_s, precision: 2, abbreviate: false)
     # Calculate duration as integer milliseconds
-    duration_ms = ((end_time_s - start_time_s) * 1000).to_i
+    duration_ms = (seconds_s * 1000).to_i
 
     # Collect human readable time string tidbits
     duration = []
 
+    # Singular/plural unit label, with optional abbreviation for hr/min/sec
+    unit = ->(count, full, abbrev = nil) {
+      word = (abbreviate && abbrev) ? abbrev : full
+      "#{count} #{word}#{'s' if count > 1}"
+    }
+
     # Singular / plural whole days
     if duration_ms >= DurationCounts::DAY_MS
       days = duration_ms / DurationCounts::DAY_MS
-      duration << "#{days} day#{'s' if days > 1}"
+      duration << unit.call(days, 'day')
       duration_ms -= (days * DurationCounts::DAY_MS)
       # End duration string if remainder is less than 1 second (e.g. no 2 days 13 milliseconds)
       duration_ms = 0 if duration_ms < 1000
@@ -34,7 +41,7 @@ class Reportinator
     # Singular / plural whole hours
     if duration_ms >= DurationCounts::HOUR_MS
       hours = duration_ms / DurationCounts::HOUR_MS
-      duration << "#{hours} hour#{'s' if hours > 1}"
+      duration << unit.call(hours, 'hour', 'hr')
       duration_ms -= (hours * DurationCounts::HOUR_MS)
       # End duration string if remainder is less than 1 second (e.g. no 2 days 13 milliseconds)
       duration_ms = 0 if duration_ms < 1000
@@ -43,30 +50,41 @@ class Reportinator
     # Singular / plural whole minutes
     if duration_ms >= DurationCounts::MINUTE_MS
       minutes = duration_ms / DurationCounts::MINUTE_MS
-      duration << "#{minutes} minute#{'s' if minutes > 1}"
+      duration << unit.call(minutes, 'minute', 'min')
       duration_ms -= (minutes * DurationCounts::MINUTE_MS)
       # End duration string if remainder is less than 1 second (e.g. no 2 days 13 milliseconds)
       duration_ms = 0 if duration_ms < 1000
     end
 
-    # Plural fractional seconds (rounded)
+    # Plural fractional seconds (rounded to requested precision)
     if duration_ms >= DurationCounts::SECOND_MS
-      seconds = (duration_ms.to_f() / 1000.0).round(2)
-      duration << "#{seconds} seconds"
+      seconds = (duration_ms.to_f / 1000.0).round(precision)
+      duration << "#{seconds} #{abbreviate ? 'secs' : 'seconds'}"
       # End duration string
       duration_ms = 0
     end
 
-    # Singular / plural whole milliseconds (only if orginal duration less than 1 second)
+    # Singular / plural whole milliseconds (only if original duration less than 1 second)
     if duration_ms > 0
-      duration << "#{duration_ms} millisecond#{'s' if duration_ms > 1}"
+      duration << unit.call(duration_ms, 'millisecond')
     end
 
     return duration.join(' ')
   end
 
-  def generate_duration(start_time_s:, end_time_s:)
-    return Reportinator.generate_duration( start_time_s: start_time_s, end_time_s: end_time_s )
+  # Generate human readable string of days, hours, minutes, seconds (and
+  # milliseconds) from a start count of seconds and end count of seconds.
+  def self.generate_duration_from_interval(start_time_s:, end_time_s:, precision: 2, abbreviate: false)
+    return '' if start_time_s.nil? || end_time_s.nil?
+    Reportinator.generate_duration_string( end_time_s - start_time_s, precision: precision, abbreviate: abbreviate )
+  end
+
+  def generate_duration_string(seconds_s, precision: 2, abbreviate: false)
+    return Reportinator.generate_duration_string( seconds_s, precision: precision, abbreviate: abbreviate )
+  end
+
+  def generate_duration_from_interval(start_time_s:, end_time_s:, precision: 2, abbreviate: false)
+    return Reportinator.generate_duration_from_interval( start_time_s: start_time_s, end_time_s: end_time_s, precision: precision, abbreviate: abbreviate )
   end
 
   ##
@@ -107,8 +125,11 @@ class Reportinator
   def generate_module_progress(module_name:, filename:, operation:)
     # <Operation [module_name::]filename>..."
 
+    # Sanitze -- ensure it's a string and strip any filename extension
+    _module_name = module_name.to_s().ext('')
+
     # If filename is the module name, don't add the module label
-    label = (File.basename(filename).ext('') == module_name.to_s) ? '' : "#{module_name}::"
+    label = (File.basename(filename).ext('') == _module_name) ? '' : "#{_module_name}::"
     return generate_progress("#{operation} #{label}#{filename}")
   end
 

data/lib/ceedling/ruby_expandinator.rb

@@ -0,0 +1,61 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'ceedling/constants'
+require 'ceedling/exceptions'
+
+# Centralized, security-gated handling of Ceedling's inline Ruby string expansion
+# feature (`#{...}` embedded in project configuration values). This executes arbitrary
+# Ruby sourced from YAML content, so it is disabled by default and can only be enabled
+# via the `--ruby-replacement` command line flag (never from YAML itself).
+class RubyExpandinator
+
+  def initialize
+    @enabled = false
+  end
+
+  # One-directional: once enabled (via the --ruby-replacement CLI flag), nothing should
+  # be able to turn this back off mid-process.
+  def enable!
+    @enabled = true
+  end
+
+  def enabled?
+    @enabled
+  end
+
+  # Pure pattern predicate -- no gating, no evaluation.
+  def replacement?(string)
+    !!(string =~ PATTERNS::RUBY_STRING_REPLACEMENT)
+  end
+
+  # Raises if `string` contains the Ruby-replacement pattern and the feature is not
+  # enabled. No-op (and no evaluation) otherwise. `source` is a short descriptive label
+  # for what was being processed -- Ceedling's config pipeline merges project.yml,
+  # mixins, and plugin config into one in-memory hash well before most call sites run,
+  # so there's no literal source-file/line available; the label is the best available
+  # context (e.g. "tool 'test_compiler' :executable", ":environment", ":mixins ↳ :load_paths").
+  def check!(string, source:)
+    return unless replacement?(string)
+    return if @enabled
+
+    raise CeedlingException.new(
+      "Inline Ruby string expansion is disabled ⏩️ #{source} contains `\#{...}` Ruby code " +
+      "but this feature is not enabled. Re-run with `--ruby-replacement` to allow it " +
+      "(security-sensitive: only enable this for configuration you trust)."
+    )
+  end
+
+  # Gated expansion: validates via check! (raises if disabled), then evaluates and
+  # returns the result if the pattern is present; returns `string` unchanged otherwise.
+  def expand(string, source:)
+    return string unless replacement?(string)
+    check!(string, source: source)
+    Object.module_eval("\"" + string + "\"")
+  end
+
+end

data/lib/ceedling/rules_release.rake

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -59,16 +59,18 @@ rule(/#{PROJECT_RELEASE_BUILD_TARGET}/) do |bin_file|
   lib_args  = @ceedling[:release_invoker].convert_libraries_to_arguments(libraries)
   lib_paths = @ceedling[:release_invoker].get_library_paths_to_arguments()
   map_file  = @ceedling[:configurator].project_release_build_map
+  flags     = @ceedling[:flaginator].flag_down( context:RELEASE_SYM, operation:OPERATION_LINK_SYM )
 
   @ceedling[:generator].generate_executable_file(
     tool,
     RELEASE_SYM,
     objects,
-    [], # Flags
+    flags,
     bin_file.name,
     map_file,
     lib_args,
     lib_paths )
+    
   @ceedling[:release_invoker].artifactinate( bin_file.name, map_file, @ceedling[:configurator].release_build_artifacts )
 end
 

data/lib/ceedling/rules_tests.rake

@@ -1,32 +1,10 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
-rule(/#{PROJECT_TEST_BUILD_OUTPUT_PATH}\/#{'.+\\' + EXTENSION_OBJECT}$/ => [
-    proc do |task_name|
-      _, object = (task_name.split('+'))
-      @ceedling[:file_finder].find_build_input_file(filepath: object, context: TEST_SYM)
-    end
-  ]) do |target|
-    test, object = (target.name.split('+'))
-
-    tool = TOOLS_TEST_COMPILER
-
-    if @ceedling[:file_wrapper].extname(target.source) == EXTENSION_ASSEMBLY
-      tool = TOOLS_TEST_ASSEMBLER
-    end
-
-    @ceedling[:test_invoker].compile_test_component(
-      tool: tool,
-      test: test.to_sym,
-      source: target.source,
-      object: object
-    )
-  end
-
 namespace TEST_SYM do
   TOOL_COLLECTION_TEST_RULES = {
     :context        => TEST_SYM,

data/lib/ceedling/setupinator.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 
@@ -57,7 +57,7 @@ class Setupinator
     @loginator.set_logfile( app_cfg[:log_filepath] )
     @configurator.project_logging = @loginator.project_logging
 
-    log_step( 'Validating configuration contains minimum required sections', heading:false )
+    log_step( 'Validating configuration contains minimum required sections', heading: false )
 
     # Complain early about anything essential that's missing
     @configurator.validate_essential( config_hash )
@@ -65,11 +65,17 @@ class Setupinator
     # Merge any needed runtime settings into user configuration
     @configurator.merge_ceedling_runtime_config( config_hash, CEEDLING_RUNTIME_CONFIG.deep_clone )
 
+    if config_hash[:project][:use_partials]
+      log_step( 'Processing Partials configuration', heading: false, verbosity: Verbosity::NORMAL )
+      # Set configuration settings derived from enabling partials
+      @configurator.set_partials_derived_config( config_hash )
+    end
+
     ##
     ## 2. Handle basic configuration
     ##
 
-    log_step( 'Base configuration handling', heading:false )
+    log_step( 'Base configuration handling', heading: false )
 
     # Evaluate environment vars before plugin configurations that might reference with inline Ruby string expansion
     @configurator.eval_environment_variables( config_hash )
@@ -133,6 +139,12 @@ class Setupinator
     # Fill out any missing tool config value
     @configurator.populate_tools_config( config_hash )
 
+    # Probe whether the configured C preprocessor supports -fdirectives-only output.
+    # Must run after tool configs are populated (executable name resolved) and before
+    # build() flattens the config ➡️ the new key is picked up by accessor generation.
+    log_step( 'Probing directives-only preprocessor support', heading: false )
+    @configurator.resolve_directives_only_preprocessing( config_hash, @ceedling[:tool_executor] )
+
     # From any tool definition shortcuts:
     #  - Redefine executable if set
     #  - Add arguments from tool definition shortcuts if set
@@ -146,7 +158,7 @@ class Setupinator
     ## 6. Validate configuration
     ##
 
-    log_step( 'Validating final project configuration', heading:false )
+    log_step( 'Validating final project configuration', heading: false )
 
     @configurator.validate_final( config_hash, app_cfg )
 
@@ -185,14 +197,14 @@ class Setupinator
 private
 
   # Neaten up a build step with progress message and some scope encapsulation
-  def log_step(msg, heading:true)
-    if heading
-      msg = @reportinator.generate_heading( @loginator.decorate( msg, LogLabels::CONSTRUCT ) )
-    else # Progress message
-      msg = "\n" + @reportinator.generate_progress( @loginator.decorate( msg, LogLabels::CONSTRUCT ) )
+  def log_step(msg, heading: true, verbosity: Verbosity::OBNOXIOUS )
+    @loginator.lazy( verbosity ) do 
+      if heading
+        @reportinator.generate_heading( @loginator.decorate( msg, LogLabels::CONSTRUCT ) )
+      else # Progress message
+        "\n" + @reportinator.generate_progress( @loginator.decorate( msg, LogLabels::CONSTRUCT ) )
+      end
     end
-
-    @loginator.log( msg, Verbosity::OBNOXIOUS )
   end
 
 

data/lib/ceedling/stream_wrapper.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================
 

data/lib/ceedling/system_utils.rb

@@ -1,7 +1,7 @@
 # =========================================================================
 #   Ceedling - Test-Centered Build System for C
 #   ThrowTheSwitch.org
-#   Copyright (c) 2010-25 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
 #   SPDX-License-Identifier: MIT
 # =========================================================================