wip

CHANGELOG.md

@@ -1,18 +1,3 @@
-## v3.0.2
-
-### Fixes
-
-- #159 - Compiler check configure methods should respect :use flag
-- #160 - Configure parameters should not be stored as unscoped construction variables
-
-## v3.0.1
-
-### Fixes
-
-- #156 - Avoid running configure operation twice
-- #157 - Load configure task arguments before early configure operations
-- #158 - Do not configure for clean tasks when not yet configured
-
 ## v3.0.0
 
 - #136 - Move rsconscache into build directory

Gemfile.lock

@@ -1,38 +1,32 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.5.0)
+    diff-lcs (1.4.4)
     docile (1.1.5)
-    json (2.6.1)
+    json (2.5.1)
-    psych (4.0.3)
-      stringio
     rake (13.0.6)
-    rdoc (6.4.0)
+    rdoc (6.3.2)
-      psych (>= 4.0.0)
     redcarpet (3.5.1)
-    rspec (3.11.0)
+    rspec (3.10.0)
-      rspec-core (~> 3.11.0)
+      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.11.0)
+      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.11.0)
+      rspec-mocks (~> 3.10.0)
-    rspec-core (3.11.0)
+    rspec-core (3.10.1)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.10.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.10.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.10.0)
-    rspec-support (3.11.0)
+    rspec-support (3.10.2)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    stringio (3.0.1)
     syntax (1.2.2)
-    webrick (1.7.0)
+    yard (0.9.26)
-    yard (0.9.27)
-      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -49,4 +43,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.31
+   2.1.4

Rakefile.rb

@@ -35,7 +35,7 @@ task :dspec, [:example_string] => :build_dist do |task, args|
   FileUtils.mkdir_p("test")
   FileUtils.cp("dist/rscons", "test/rscons.rb")
   ENV["dist_specs"] = "1"
-  Rake::Task["spec"].execute(args)
+  Rake::Task["spec"].execute(args.example_string)
   ENV.delete("dist_specs")
   FileUtils.rm_f(Dir.glob(".rscons-*"))
 end

build_tests/configure/check_c_compiler_use.rb

@@ -1,12 +0,0 @@
-configure do
-  check_c_compiler "clang", use: "clang"
-  check_c_compiler
-end
-
-env "t1" do |env|
-  env.Program("test_gcc.exe", "simple.c")
-end
-
-env "t2", use: "clang" do |env|
-  env.Program("test_clang.exe", "simple.c")
-end

build_tests/configure/check_cxx_compiler_use.rb

@@ -1,12 +0,0 @@
-configure do
-  check_cxx_compiler "clang++", use: "clang"
-  check_cxx_compiler
-end
-
-env "t1" do |env|
-  env.Program("test_gcc.exe", "simple.cc")
-end
-
-env "t2", use: "clang" do |env|
-  env.Program("test_clang.exe", "simple.cc")
-end

build_tests/configure/check_d_compiler_use.rb

@@ -1,12 +0,0 @@
-configure do
-  check_d_compiler "ldc2", use: "ldc2"
-  check_d_compiler
-end
-
-env "t1" do |env|
-  env.Program("test_gcc.exe", "simple.d")
-end
-
-env "t2", use: "ldc2" do |env|
-  env.Program("test_ldc2.exe", "simple.d")
-end

build_tests/configure/configure_with_top_level_env.rb

@@ -1,6 +0,0 @@
-configure do
-  check_c_compiler
-end
-env do |env|
-  puts "Prefix is #{Task["configure"]["prefix"]}"
-end

build_tests/configure/simple.cc

@@ -1,6 +0,0 @@
-#include <iostream>
-
-int main(int argc, char *argv[])
-{
-    std::cout << "Hi" << std::endl;
-}

build_tests/configure/simple.d

@@ -1,7 +0,0 @@
-import std.stdio;
-
-int main()
-{
-    writeln("Hello");
-    return 0;
-}

build_tests/library/Rsconscript

@@ -1,7 +1,4 @@
 env(echo: :command) do |env|
-  env["LIBS"] << "mylib"
+  env.Program('library.exe', ['lib.a', 'three.c'])
-  env["LIBPATH"] << "."
+  env.Library("lib.a", ['one.c', 'two.c'], 'CPPFLAGS' => ['-Dmake_lib'])
-  env.Program("library.exe", "one.c")
-  env.depends("library.exe", "libmylib.a")
-  env.Library("libmylib.a", ["two.c", "three.c"], "CPPFLAGS" => ["-Dmake_lib"])
 end

build_tests/library/one.c

@@ -1,11 +1,8 @@
 #include <stdio.h>
 
-void two();
+#ifdef make_lib
-void three();
-
 int main(int argc, char *argv[])
 {
-    two();
     printf("Library\n");
-    three();
 }
+#endif

build_tests/library/override_arcmd.rb

@@ -1,4 +1,4 @@
 env(echo: :command) do |env|
-  env["ARCMD"] = %w[ar rc ${_TARGET} ${_SOURCES}]
+  env["ARCMD"] = %w[ar rcf ${_TARGET} ${_SOURCES}]
   env.Library("lib.a", glob("*.c"))
 end

build_tests/library/three.c

@@ -1,3 +0,0 @@
-void three(void)
-{
-}

build_tests/library/two.c

@@ -1,3 +0,0 @@
-void two(void)
-{
-}

build_tests/simple/clean.rb

@@ -1,7 +0,0 @@
-env do |env|
-  env.Program('simple.exe', Dir['*.c'])
-end
-
-clean do
-  puts "custom clean action"
-end

build_tests/simple/env_in_task.rb

@@ -1,5 +0,0 @@
-default do
-  env do |env|
-    env.Program('simple.exe', Dir['*.c'])
-  end
-end

build_tests/simple/link_flag_change.rb

@@ -1,6 +1,5 @@
 env(echo: :command) do |env|
   env["LD"] = "gcc"
-  mkdir_p("libdir")
   env["LIBPATH"] += ["libdir"]
   env.Program('simple.exe', Dir['*.c'])
 end

build_tests/two_sources/two.c

@@ -1,6 +1,3 @@
 #ifdef ONE
 #error ONE should not be defined
 #endif
-void two(void)
-{
-}

doc/user_guide.md

@@ -446,9 +446,6 @@ end
 See ${#Configuring the Project} for more details on how to make use of the
 configuration functionality that Rscons provides.
 
-Configure blocks must be defined in the Rsconscript file before any
-environments are created.
-
 ####> Default Task
 
 The `default` task is special in that Rscons will execute it if no other task
@@ -790,9 +787,7 @@ Building target files is accomplished by using Environments.
 Environments can be created at the top level of the build script, or from
 within a task action block.
 
-Environments are created with the
+Environments are created with the `env` build script method.
-[`env`](../yard/Rscons/Script/GlobalDsl.html#env-instance_method) build script
-method.
 Here is an example build script that creates an Environment and registers a
 Program build target:
 
@@ -868,7 +863,7 @@ It also instructs the linker to link against the `m` library.
 
   * uppercase strings - the default construction variables that Rscons uses
   * strings beginning with "_" - set and used internally by builders
-  * lowercase strings with a ":" as "#{task_name}:#{parameter_name}" - set to task parameter values
+  * strings with a ":" as "#{task_name}:#{parameter_name}" - set to task parameter values
   * symbols, lowercase strings - reserved as user-defined construction variables
 
 ###> Builders
@@ -1416,22 +1411,9 @@ Example use:
 
 ```ruby
 default do
-  download "https://ftp.gnu.org/gnu/gcc/gcc-#{gcc_version}/gcc-#{gcc_version}.tar.xz",
-    "#{build_dir}/gcc-#{gcc_version}.tar.xz",
-    sha256_sum: gcc_checksum
 end
 ```
 
-The `download` method downloads the file specified by the URL in the first
-parameter, and writes it to the local file specified by the second parameter.
-If the `:sha256sum` option is given, this causes two changes to the default
-behavior:
-
-  * If Rscons finds the local file and it already has this checksum, then the
-    file will not be downloaded again.
-  * After downloading, Rscons verifies that the checksum matches what is given
-    and exits with an error if it does not.
-
 ###> PATH Management
 
 `rscons` provides methods for management of the `PATH` environment variable.
@@ -1939,88 +1921,6 @@ env do |env|
 end
 ```
 
-### Example: GCC Cross Compiler
-
-```ruby
-binutils_version = "2.35"
-binutils_checksum = "1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85"
-gcc_version = "10.2.0"
-gcc_checksum = "b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c"
-install_path = File.expand_path("i686-elf-gcc")
-target = "i686-elf"
-path_prepend "#{install_path}/bin"
-
-configure do
-  check_c_compiler "gcc"
-  check_program "make"
-  check_program "bison"
-  check_program "flex"
-  check_program "texi2any", on_fail: "Install the texinfo package"
-  check_program "wget"
-  check_lib "gmp", on_fail: "Install the libgmp-dev package"
-  check_lib "mpc", on_fail: "Install the libmpc-dev package"
-  check_lib "mpfr", on_fail: "Install the libmpfr-dev package"
-end
-
-default do
-  unless Dir.exist?(install_path)
-
-    # Download archives.
-    download "https://ftp.gnu.org/gnu/binutils/binutils-#{binutils_version}.tar.xz",
-      "#{build_dir}/binutils-#{binutils_version}.tar.xz",
-      sha256sum: binutils_checksum
-
-    download "https://ftp.gnu.org/gnu/gcc/gcc-#{gcc_version}/gcc-#{gcc_version}.tar.xz",
-      "#{build_dir}/gcc-#{gcc_version}.tar.xz",
-      sha256sum: gcc_checksum
-
-    # Extract archives.
-    sh "tar", "xJf", "binutils-#{binutils_version}.tar.xz",
-      chdir: build_dir
-
-    sh "tar", "xJf", "gcc-#{gcc_version}.tar.xz",
-      chdir: build_dir
-
-    # Build binutils.
-    rm_rf "#{build_dir}/build-binutils"
-    mkdir_p "#{build_dir}/build-binutils"
-    cd "#{build_dir}/build-binutils" do
-      sh %W[../binutils-#{binutils_version}/configure
-        --target=#{target} --prefix=#{install_path} --with-sysroot --disable-nls
-        --disable-werror]
-      sh "make"
-      sh "make install"
-    end
-
-    # Build gcc.
-    rm_rf "#{build_dir}/build-gcc"
-    mkdir_p "#{build_dir}/build-gcc"
-    cd "#{build_dir}/build-gcc" do
-      sh %W[../gcc-#{gcc_version}/configure
-        --target=#{target} --prefix=#{install_path} --disable-nls
-        --enable-languages=c,c++ --without-headers]
-      sh "make all-gcc"
-      sh "make all-target-libgcc"
-      sh "make install-gcc"
-      sh "make install-target-libgcc"
-    end
-  end
-end
-
-clean do
-  rm_f "#{build_dir}/binutils-#{binutils_version}.tar.xz"
-  rm_rf "#{build_dir}/binutils-#{binutils_version}"
-  rm_rf "#{build_dir}/build-binutils"
-  rm_f "#{build_dir}/gcc-#{gcc_version}.tar.xz"
-  rm_rf "#{build_dir}/gcc-#{gcc_version}"
-  rm_rf "#{build_dir}/build-gcc"
-end
-
-distclean do
-  rm_rf install_path
-end
-```
-
 ##> ./configure && make
 
 You can make your Rscons-based project more familiar to users of

lib/rscons/application.rb

@@ -42,16 +42,6 @@ module Rscons
       @variant_groups = []
     end
 
-    # Return if Rscons is in the task execution phase.
-    #
-    # @api private
-    #
-    # @return [Boolean]
-    #   If Rscons is in the task execution phase.
-    def task_execution_phase?
-      @task_execution_phase
-    end
-
     # Run the application.
     #
     # Execute user-specified tasks.
@@ -73,7 +63,6 @@ module Rscons
     #   Process exit code (0 on success).
     def run(rsconscript, tasks_and_params, show_tasks, all_tasks, enabled_variants)
       Cache.instance["failed_commands"] = []
-      @tasks_and_params = tasks_and_params
       @enabled_variants = enabled_variants
       if enabled_variants == "" && !tasks_and_params.include?("configure")
         if cache_enabled_variants = Cache.instance["configuration_data"]["enabled_variants"]
@@ -81,16 +70,13 @@ module Rscons
         end
       end
       @script = Script.new
-      if should_load_script
+      @script.load(rsconscript)
-        @script.load(rsconscript)
+      enable_variants
-        enable_variants
-      end
       if show_tasks
         show_script_tasks(all_tasks)
         return 0
       end
-      apply_task_params(false)
+      apply_task_params(tasks_and_params)
-      @task_execution_phase = true
       if tasks_and_params.empty?
         check_process_environments
         if Task.tasks["default"]
@@ -172,8 +158,8 @@ module Rscons
     def distclean
       cache = Cache.instance
       clean
-      cache.clear
       FileUtils.rm_rf(@build_dir)
+      cache.clear
     end
 
     # Check if the project needs to be configured.
@@ -182,7 +168,6 @@ module Rscons
     #
     # @return [void]
     def check_configure
-      apply_task_params(true)
       enable_variants
       unless Cache.instance["configuration_data"]["configured"]
         if @script.autoconf
@@ -209,20 +194,20 @@ module Rscons
     #
     # @api private
     #
+    # @param options [Hash]
+    #   Options.
+    #
     # @return [void]
     def configure
-      unless @_configured
+      co = ConfigureOp.new(@script)
-        @_configured = true
+      begin
-        co = ConfigureOp.new(@script)
+        @script.configure(co)
-        begin
+      rescue RsconsError => e
-          @script.configure(co)
+        co.close(false)
-        rescue RsconsError => e
+        raise e
-          co.close(false)
-          raise e
-        end
-        Cache.instance["configuration_data"]["enabled_variants"] = @enabled_variants
-        co.close(true)
       end
+      Cache.instance["configuration_data"]["enabled_variants"] = @enabled_variants
+      co.close(true)
     end
 
     # Remove installed files.
@@ -382,27 +367,18 @@ module Rscons
       end
     end
 
-    def apply_task_params(only_configure)
+    def apply_task_params(tasks_and_params)
-      @tasks_and_params.each do |task_name, task_params|
+      tasks_and_params.each do |task_name, task_params|
-        unless only_configure && task_name != "configure"
+        task_params.each do |param_name, param_value|
-          task_params.each do |param_name, param_value|
+          if param = Task[task_name].params[param_name]
-            if param = Task[task_name].params[param_name]
+            Task[task_name].set_param_value(param_name, param_value)
-              Task[task_name].set_param_value(param_name, param_value)
+          else
-            else
+            raise RsconsError.new("Unknown parameter #{param_name.inspect} for task #{task_name}")
-              raise RsconsError.new("Unknown parameter #{param_name.inspect} for task #{task_name}")
-            end
           end
         end
       end
     end
 
-    def should_load_script
-      return true if @tasks_and_params.empty?
-      return true if Cache.instance["configuration_data"]["configured"]
-      return false if (@tasks_and_params.keys - %w[distclean clean uninstall]).empty?
-      true
-    end
-
   end
 
 end

lib/rscons/cache.rb

@@ -101,7 +101,6 @@ module Rscons
     #
     # @return [void]
     def write
-      return unless Dir.exist?(File.dirname(cache_file))
       @cache["version"] = VERSION
       File.open(cache_file, "w") do |fh|
         fh.puts(JSON.dump(@cache))

lib/rscons/configure_op.rb

@@ -23,11 +23,14 @@ module Rscons
           $stdout.puts "Configuring project..."
         end
       end
+      vars = {}
       Task["configure"].params.each do |name, param|
         unless Rscons.application.silent_configure
           Ansi.write($stdout, "Setting #{name}... ", :green, param.value, :reset, "\n")
         end
+        vars[name] = param.value
       end
+      store_merge(vars)
     end
 
     # Close the log file handle.
@@ -62,7 +65,7 @@ module Rscons
         ccc = %w[gcc clang]
       end
       cc = ccc.find do |cc|
-        test_c_compiler(cc, options)
+        test_c_compiler(cc)
       end
       complete(cc ? 0 : 1, options.merge(success_message: cc))
     end
@@ -84,7 +87,7 @@ module Rscons
         ccc = %w[g++ clang++]
       end
       cc = ccc.find do |cc|
-        test_cxx_compiler(cc, options)
+        test_cxx_compiler(cc)
       end
       complete(cc ? 0 : 1, options.merge(success_message: cc))
     end
@@ -106,7 +109,7 @@ module Rscons
         cdc = %w[gdc ldc2]
       end
       dc = cdc.find do |dc|
-        test_d_compiler(dc, options)
+        test_d_compiler(dc)
       end
       complete(dc ? 0 : 1, options.merge(success_message: dc))
     end
@@ -412,7 +415,7 @@ module Rscons
     #
     # @return [Boolean]
     #   Whether the C compiler tested successfully.
-    def test_c_compiler(cc, options)
+    def test_c_compiler(cc)
       File.open("#{@work_dir}/cfgtest.c", "wb") do |fh|
         fh.puts <<-EOF
           int fun(int val) {
@@ -424,7 +427,7 @@ module Rscons
       merge = {"CC" => cc}
       _, _, status = log_and_test_command(command)
       if status == 0
-        store_merge(merge, options)
+        store_merge(merge)
         true
       end
     end
@@ -436,7 +439,7 @@ module Rscons
     #
     # @return [Boolean]
     #   Whether the C++ compiler tested successfully.
-    def test_cxx_compiler(cc, options)
+    def test_cxx_compiler(cc)
       File.open("#{@work_dir}/cfgtest.cxx", "wb") do |fh|
         fh.puts <<-EOF
           template<typename T>
@@ -449,7 +452,7 @@ module Rscons
       merge = {"CXX" => cc}
       _, _, status = log_and_test_command(command)
       if status == 0
-        store_merge(merge, options)
+        store_merge(merge)
         true
       end
     end
@@ -461,7 +464,7 @@ module Rscons
     #
     # @return [Boolean]
     #   Whether the D compiler tested successfully.
-    def test_d_compiler(dc, options)
+    def test_d_compiler(dc)
       File.open("#{@work_dir}/cfgtest.d", "wb") do |fh|
         fh.puts <<-EOF
           import core.math;
@@ -490,7 +493,7 @@ module Rscons
         end
         _, _, status = log_and_test_command(command)
         if status == 0
-          store_merge(merge, options)
+          store_merge(merge)
           true
         end
       end

lib/rscons/environment.rb

@@ -72,6 +72,24 @@ module Rscons
     attr_reader :name
 
     # Create an Environment object.
+    #
+    # @overload initialize(name, options)
+    # @overload initialize(options)
+    #
+    # @param name [String]
+    #   Environment name. This determines the folder name used to store all
+    #   environment build files under the top-level build directory.
+    # @param options [Hash]
+    # @option options [Symbol] :echo
+    #   :command, :short, or :off (default :short)
+    # @option options [Boolean] :exclude_builders
+    #   Whether to omit adding default builders (default false)
+    # @option options [String, Array<String>] :use
+    #   Use flag(s). If specified, any configuration flags which were saved
+    #   with a corresponding `:use` value will be applied to this Environment.
+    #
+    # If a block is given, the Environment object is yielded to the block and
+    # when the block returns, the {#process} method is automatically called.
     def initialize(*args, &block)
       @id = self.class.get_id
       if args.first.is_a?(String)

lib/rscons/script.rb

@@ -102,49 +102,9 @@ module Rscons
       end
 
       # Create an environment.
-      #
-      # @overload env(name, options)
-      #   @param name [String]
-      #     Environment name. This determines the folder name used to store all
-      #     environment build files under the top-level build directory.
-      #   @param options [Hash]
-      #   @option options [Symbol] :echo
-      #     :command, :short, or :off (default :short)
-      #   @option options [Boolean] :exclude_builders
-      #     Whether to omit adding default builders (default false)
-      #   @option options [String, Array<String>] :use
-      #     Use flag(s). If specified, any configuration flags which were saved
-      #     with a corresponding `:use` value will be applied to this
-      #     Environment.
-      #
-      # @overload env(options)
-      #   @param options [Hash]
-      #   @option options [Symbol] :echo
-      #     :command, :short, or :off (default :short)
-      #   @option options [Boolean] :exclude_builders
-      #     Whether to omit adding default builders (default false)
-      #   @option options [String, Array<String>] :use
-      #     Use flag(s). If specified, any configuration flags which were saved
-      #     with a corresponding `:use` value will be applied to this
-      #     Environment.
-      #
-      # If a block is given it is immediately executed and passed the newly
-      # created Environment object as an argument.
-      # If the Environment is created in task context, the +process+ method is
-      # immediately called.
-      # Otherwise, the Environment is not processed until the task execution
-      # phase.
-      #
-      # @yield [env]
-      # @yieldparam env [Environment]
-      #   The created environment.
       def env(*args, &block)
         Rscons.application.check_configure
-        e = Environment.new(*args, &block)
+        Environment.new(*args, &block)
-        if Rscons.application.task_execution_phase?
-          e.process
-        end
-        e
       end
 
       # Construct a task parameter.

lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # Project version.
-  VERSION = "3.0.2"
+  VERSION = "2.3.0"
 end

rb/build_dist.rb

@@ -60,13 +60,7 @@ combined_file.each do |line|
   end
 end
 
-license = File.read("LICENSE.txt").gsub(/^(.*?)$/) do |line|
+license = File.read("LICENSE.txt").gsub(/^/, "# ")
-  if line.size > 0
-    "# #{line}"
-  else
-    "#"
-  end
-end
 
 require "zlib"
 require "base64"

spec/build_tests_spec.rb

@@ -195,14 +195,6 @@ EOF
     expect(nr(`./simple.exe`)).to eq "This is a simple C program\n"
   end
 
-  it "processes the environment when created within a task" do
-    test_dir("simple")
-    result = run_rscons(args: %w[-f env_in_task.rb])
-    expect(result.stderr).to eq ""
-    expect(File.exists?("build/e.1/simple.c.o")).to be_truthy
-    expect(nr(`./simple.exe`)).to eq "This is a simple C program\n"
-  end
-
   it "uses the build directory specified with -b" do
     test_dir("simple")
     result = run_rscons(args: %w[-b b])
@@ -358,7 +350,7 @@ EOF
     expect(result.stderr).to match /Could not find a registered build target "foo"/
   end
 
-  context "clean task" do
+  context "clean operation" do
     it 'cleans built files' do
       test_dir("simple")
       result = run_rscons
@@ -372,28 +364,6 @@ EOF
       expect(File.exists?('simple.c')).to be_truthy
     end
 
-    it "executes custom clean action blocks" do
-      test_dir("simple")
-      result = run_rscons(args: %w[-f clean.rb])
-      expect(result.stderr).to eq ""
-      expect(File.exists?("build/e.1/simple.c.o")).to be_truthy
-      result = run_rscons(args: %w[-f clean.rb clean])
-      expect(result.stderr).to eq ""
-      expect(result.stdout).to match %r{custom clean action}
-      expect(File.exists?("build/e.1/simple.c.o")).to be_falsey
-    end
-
-    it "does not process environments" do
-      test_dir("simple")
-      result = run_rscons(args: %w[clean])
-      expect(result.stderr).to eq ""
-      expect(File.exists?('build/e.1/simple.c.o')).to be_falsey
-      expect(File.exists?('build/e.1')).to be_falsey
-      expect(File.exists?('simple.exe')).to be_falsey
-      expect(File.exists?('simple.c')).to be_truthy
-      expect(result.stdout).to eq ""
-    end
-
     it 'does not clean created directories if other non-rscons-generated files reside there' do
       test_dir("simple")
       result = run_rscons
@@ -576,16 +546,14 @@ EOF
     result = run_rscons
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
+      %r{gcc -c -o build/e.1/one.c.o -MMD -MF build/e.1/one.c.o.mf -Dmake_lib one.c},
       %r{gcc -c -o build/e.1/two.c.o -MMD -MF build/e.1/two.c.o.mf -Dmake_lib two.c},
-      %r{gcc -c -o build/e.1/three.c.o -MMD -MF build/e.1/three.c.o.mf -Dmake_lib three.c},
+      %r{ar rcs lib.a build/e.1/one.c.o build/e.1/two.c.o},
-      %r{ar rcs libmylib.a build/e.1/two.c.o build/e.1/three.c.o},
+      %r{gcc -c -o build/e.1/three.c.o -MMD -MF build/e.1/three.c.o.mf three.c},
-      %r{gcc -c -o build/e.1/one.c.o -MMD -MF build/e.1/one.c.o.mf one.c},
+      %r{gcc -o library.exe lib.a build/e.1/three.c.o},
-      %r{gcc -o library.exe build/e.1/one.c.o -L. -lmylib},
     ])
     expect(File.exists?("library.exe")).to be_truthy
-    ar_t = nr(`ar t libmylib.a`)
+    expect(nr(`ar t lib.a`)).to eq "one.c.o\ntwo.c.o\n"
-    expect(ar_t).to match %r{\btwo.c.o\b}
-    expect(ar_t).to match %r{\bthree.c.o\b}
   end
 
   it 'supports build hooks to override construction variables' do
@@ -1677,7 +1645,7 @@ EOF
       test_dir("library")
       result = run_rscons(args: %w[-f override_arcmd.rb])
       expect(result.stderr).to eq ""
-      verify_lines(lines(result.stdout), [%r{ar rc lib.a build/e.1/one.c.o build/e.1/three.c.o build/e.1/two.c.o}])
+      verify_lines(lines(result.stdout), [%r{ar rcf lib.a build/e.1/one.c.o build/e.1/three.c.o build/e.1/two.c.o}])
     end
 
     it "allows passing object files as sources" do
@@ -1722,7 +1690,7 @@ EOF
       ])
       expect(File.exist?("simple.exe")).to be_truthy
       expect(File.exist?("simple.size")).to be_truthy
-      expect(File.read("simple.size")).to match /text.*data/i
+      expect(File.read("simple.size")).to match /text.*data.*bss/
     end
   end
 
@@ -1820,7 +1788,7 @@ EOF
     end
   end
 
-  context "configure task" do
+  context "configure operation" do
     it "does not print configuring messages when no configure block and configure task not called" do
       test_dir "configure"
       result = run_rscons(args: %w[-f no_configure_output.rb])
@@ -1836,52 +1804,7 @@ EOF
       expect(result.status).to_not eq 0
     end
 
-    it "only runs the configure operation once" do
+    it "automatically runs the configure operation if the project is not yet configured in the given build directory" do
-      test_dir "configure"
-
-      result = run_rscons(args: %w[-f configure_with_top_level_env.rb configure])
-      expect(result.stderr).to eq ""
-      expect(result.status).to eq 0
-      expect(result.stdout).to_not match %r{Configuring project.*Configuring project}m
-    end
-
-    it "loads configure parameters before invoking configure" do
-      test_dir "configure"
-
-      result = run_rscons(args: %w[-f configure_with_top_level_env.rb configure --prefix=/yodabob])
-      expect(result.stderr).to eq ""
-      expect(result.status).to eq 0
-      expect(result.stdout).to match "Prefix is /yodabob"
-    end
-
-    it "does not configure for distclean operation" do
-      test_dir "configure"
-
-      result = run_rscons(args: %w[-f configure_with_top_level_env.rb distclean])
-      expect(result.stderr).to eq ""
-      expect(result.status).to eq 0
-      expect(result.stdout).to_not match %r{Configuring project}
-    end
-
-    it "does not configure for clean operation" do
-      test_dir "configure"
-
-      result = run_rscons(args: %w[-f configure_with_top_level_env.rb clean])
-      expect(result.stderr).to eq ""
-      expect(result.status).to eq 0
-      expect(result.stdout).to_not match %r{Configuring project}
-    end
-
-    it "does not configure for uninstall operation" do
-      test_dir "configure"
-
-      result = run_rscons(args: %w[-f configure_with_top_level_env.rb uninstall])
-      expect(result.stderr).to eq ""
-      expect(result.status).to eq 0
-      expect(result.stdout).to_not match %r{Configuring project}
-    end
-
-    it "automatically runs the configure task if the project is not yet configured in the given build directory" do
       test_dir "configure"
 
       result = run_rscons(args: %w[-f check_c_compiler.rb])
@@ -1940,17 +1863,6 @@ EOF
         end
       end
 
-      it "respects use flag" do
-        test_dir "configure"
-        result = run_rscons(args: %w[-f check_c_compiler_use.rb -v])
-        expect(result.stderr).to eq ""
-        expect(result.status).to eq 0
-        expect(result.stdout).to match %r{\bgcc .*/t1/}
-        expect(result.stdout).to_not match %r{\bclang .*/t1/}
-        expect(result.stdout).to match %r{\bclang .*/t2/}
-        expect(result.stdout).to_not match %r{\bgcc .*/t2/}
-      end
-
       it "successfully tests a compiler with an unknown name" do
         test_dir "configure"
         create_exe "mycompiler", %[exec gcc "$@"]
@@ -1994,17 +1906,6 @@ EOF
         end
       end
 
-      it "respects use flag" do
-        test_dir "configure"
-        result = run_rscons(args: %w[-f check_cxx_compiler_use.rb -v])
-        expect(result.stderr).to eq ""
-        expect(result.status).to eq 0
-        expect(result.stdout).to match %r{\bg\+\+ .*/t1/}
-        expect(result.stdout).to_not match %r{\bclang\+\+ .*/t1/}
-        expect(result.stdout).to match %r{\bclang\+\+ .*/t2/}
-        expect(result.stdout).to_not match %r{\bg\+\+ .*/t2/}
-      end
-
       it "successfully tests a compiler with an unknown name" do
         test_dir "configure"
         create_exe "mycompiler", %[exec clang++ "$@"]
@@ -2050,17 +1951,6 @@ EOF
         end
       end
 
-      it "respects use flag" do
-        test_dir "configure"
-        result = run_rscons(args: %w[-f check_d_compiler_use.rb -v])
-        expect(result.stderr).to eq ""
-        expect(result.status).to eq 0
-        expect(result.stdout).to match %r{\bgdc .*/t1/}
-        expect(result.stdout).to_not match %r{\bldc2 .*/t1/}
-        expect(result.stdout).to match %r{\bldc2 .*/t2/}
-        expect(result.stdout).to_not match %r{\bgdc .*/t2/}
-      end
-
       unless RUBY_PLATFORM =~ /mingw|msys/
         it "successfully tests a compiler with an unknown name that uses gdc-compatible options" do
           test_dir "configure"
@@ -2338,7 +2228,7 @@ EOF
 
     context "check_cfg" do
       context "when passed a package" do
-        it "stores flags and uses them during a build" do
+        it "stores flags and uses them during a build operation" do
           test_dir "configure"
           create_exe "pkg-config", "echo '-DMYPACKAGE'"
           result = run_rscons(args: %w[-f check_cfg_package.rb configure])
@@ -2375,7 +2265,7 @@ EOF
       end
 
       context "when passed a program" do
-        it "stores flags and uses them during a build" do
+        it "stores flags and uses them during a build operation" do
           test_dir "configure"
           create_exe "my-config", "echo '-DMYCONFIG -lm'"
           result = run_rscons(args: %w[-f check_cfg.rb configure])
@@ -2614,15 +2504,15 @@ EOF
     end
   end
 
-  context "install task" do
+  context "install operation" do
-    it "invokes the configure task if the project is not yet configured" do
+    it "invokes a configure operation if the project is not yet configured" do
       test_dir "typical"
 
       result = run_rscons(args: %w[-f install.rb install])
       expect(result.stdout).to match /Configuring install_test/
     end
 
-    it "invokes a build dependency" do
+    it "invokes a build operation" do
       test_dir "typical"
 
       Dir.mktmpdir do |prefix|
@@ -2682,7 +2572,7 @@ EOF
     end
   end
 
-  context "uninstall task" do
+  context "uninstall operation" do
     it "removes installed files but not built files" do
       test_dir "typical"