check_program: do not fail on Windows for non-existent PATH entries

CHANGELOG.md

@@ -1,15 +1,3 @@
-## v2.0.2
-
-### Fixes
-
-- #113 - distinguish object files built from multiple sources with the same base name but different extensions
-
-## v2.0.1
-
-### Fixes
-
-- #112 - Install builder cannot replace a currently executing binary on Linux
-
 ## v2.0.0
 
 - convert rscons from a Ruby gem to a standalone script
@@ -44,7 +32,6 @@
 - various performance improvements
 - wrote a new user guide
 - added new website ([https://holtrop.github.io/rscons/](https://holtrop.github.io/rscons/))
-- added new logo
 
 ## v1.17.0
 

README.md

@@ -1,7 +1,5 @@
 # Rscons
 
-![rscons logo](img/rscons_logo_1000.png)
-
 Rscons (https://github.com/holtrop/rscons) is an open-source build system
 for developers.
 

Rakefile.rb

@@ -11,7 +11,7 @@ require "rake/clean"
 require "fileutils"
 
 CLEAN.include %w[build_test_run .yardoc yard coverage test]
-CLOBBER.include %w[dist gen large_project pkg]
+CLOBBER.include %w[dist pkg]
 
 task :build_dist do
   sh "ruby rb/build_dist.rb"
@@ -93,10 +93,3 @@ task :user_guide do
 end
 
 task :default => :spec
-
-task :all => [
-  :build_dist,
-  :spec,
-  :yard,
-  :user_guide,
-]

build_tests/configure/custom_config_check.rb

@@ -17,10 +17,6 @@ configure do
     end
     op.complete(status, success_message: "good!", fail_message: fail_message, fail: should_fail)
   end
-  custom_check("Checking sed -E flag") do |op|
-    stdout, stderr, status = op.log_and_test_command(%w[sed -E -e s/ab+/rep/], stdin: "abbbc")
-    op.complete(stdout =~ /repc/ ? 0 : 1, success_message: "good", fail_message: "fail")
-  end
 end
 
 build do

build_tests/custom_builder/build_after.rb

@@ -6,8 +6,7 @@ build do
                 "CMD_DESC" => "Generating")
     env["build_root"] = env.build_root
     env["inc_c"] = "inc.c"
-    env.Object("program.o", "program.c")
+    env.build_after("${build_root}/program.o", "${inc_c}")
-    env.build_after("program.o", "${inc_c}")
+    env.Program("program.exe", ["program.c", "inc.c"])
-    env.Program("program.exe", ["program.o", "inc.c"])
   end
 end

build_tests/custom_builder/produces.rb

@@ -4,9 +4,8 @@ build do
     env["inc_h"] = "inc.h"
 
     env.Copy("copy_inc.h", "${inc_h}")
-    env.depends("program.o", "${inc_h}")
+    env.depends("${build_root}/program.o", "${inc_h}")
-    env.Object("program.o", "program.c")
+    env.Program("program.exe", ["program.c", "inc.c"])
-    env.Program("program.exe", ["program.o", "inc.c"])
 
     inc_c = env.Command("inc.c",
                         [],

build_tests/custom_builder/produces_env.rb

@@ -4,9 +4,8 @@ build do
     env["inc_h"] = "inc.h"
 
     env.Copy("copy_inc.h", "${inc_h}")
-    env.depends("program.o", "${inc_h}")
+    env.depends("${build_root}/program.o", "${inc_h}")
-    env.Object("program.o", "program.c")
+    env.Program("program.exe", ["program.c", "inc.c"])
-    env.Program("program.exe", ["program.o", "inc.c"])
 
     env.Command("inc.c",
                 [],

build_tests/install_running_exe/Rsconscript

@@ -1,6 +0,0 @@
-build do
-  Environment.new do |env|
-    env.Program("program.exe", "program.c")
-    env.Install("install/program.exe", "program.exe")
-  end
-end

build_tests/install_running_exe/program.c

@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-int main(int argc, char * argv[])
-{
-    sleep(2);
-    return 0;
-}

build_tests/json_to_yaml/Rsconscript

@@ -4,7 +4,6 @@ build do
     require 'yaml'
     env.add_builder(:JsonToYaml) do |params|
       unless @cache.up_to_date?(@target, :JsonToYaml, @sources, @env)
-        print_run_message("JsonToYaml #{@target}", nil)
         @cache.mkdir_p(File.dirname(@target))
         File.open(@target, 'w') do |f|
           f.write(YAML.dump(JSON.load(IO.read(@sources.first))))

build_tests/multiple_basename/Rsconscript

@@ -1,5 +0,0 @@
-build do
-  Environment.new do |env|
-    env.Program("foo.exe", glob("*.cc", "*.c"))
-  end
-end

build_tests/multiple_basename/foo.c

@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-void foo(void)
-{
-    printf("foo\n");
-}

build_tests/multiple_basename/foo.cc

@@ -1,12 +0,0 @@
-#include <iostream>
-
-extern "C" {
-    void foo(void);
-}
-
-int main(int argc, char * argv[])
-{
-    foo();
-    std::cout << "main" << std::endl;
-    return 0;
-}

build_tests/typical/build_hooks.rb

@@ -2,9 +2,9 @@ build do
   Environment.new(echo: :command) do |env|
     env.append('CPPPATH' => glob('src/**/*/'))
     env.add_build_hook do |builder|
-      if File.basename(builder.sources.first) == "one.c"
+      if File.basename(builder.target) == "one.o"
         builder.vars["CFLAGS"] << "-O1"
-      elsif File.basename(builder.sources.first) == "two.c"
+      elsif File.basename(builder.target) == "two.o"
         builder.vars["CFLAGS"] << "-O2"
       end
     end

doc/user_guide.md

@@ -8,7 +8,7 @@ It supports the following features:
   * built-in builders for several common operations
   * out-of-the-box support for C, C++, and D languages
   * extensibility for other languages or custom builders
-  * compatible with Windows, Linux, OS X, and FreeBSD
+  * compatible with Windows, Linux, and OS X
   * colorized output with build progress
   * build hooks
 
@@ -98,8 +98,7 @@ The only dependency required to run Rscons is to have a Ruby interpreter
 installed.
 The latest release can be downloaded from [https://github.com/holtrop/rscons/releases](https://github.com/holtrop/rscons/releases).
 Simply copy the `rscons` executable script into the desired location within
-the project to be built (typically the root of the repository) and mark it
+the project to be built (typically the root of the repository).
-executable.
 
 ## Version Control Setup
 
@@ -1025,7 +1024,7 @@ Here is our Custom builder example extended to print its status:
 ```ruby
 class Rscons::Builders::Custom < Rscons::Builder
   def run(options)
-    print_run_message("Creating <target>#{@target}<reset> from Custom builder", nil)
+    print_run_message("Creating <target>#{@target}<reset> from Custom builder")
     File.open(@target, "w") do |fh|
       fh.write("Target file created.")
     end
@@ -1050,7 +1049,7 @@ Here is a Custom builder which combines its source files similar to what the
 class Rscons::Builders::Custom < Rscons::Builder
   def run(options)
     unless @cache.up_to_date?(@target, nil, @sources, @env)
-      print_run_message("Combining <source>#{Util.short_format_paths(@sources)}<reset> => <target>#{@target}<reset>", nil)
+      print_run_message("Combining <source>#{Util.short_format_paths(@sources)}<reset> => <target>#{@target}<reset>")
       File.open(@target, "wb") do |fh|
         @sources.each do |source|
           fh.write(File.read(source, mode: "rb"))
@@ -1277,7 +1276,7 @@ To do this, create a `configure` script with contents similar to the following:
 
 ```
 #!/bin/sh
-exec "$(dirname "$0")"/rscons configure "$@"
+exec "$(dirname "$0")"/rscons "$@"
 ```
 
 and make it executable with `chmod +x configure`.

lib/rscons.rb

@@ -64,6 +64,16 @@ module Rscons
       target.is_a?(Symbol)
     end
 
+    # Return a new path by changing the suffix in path to suffix.
+    #
+    # @param path [String] The path to alter.
+    # @param suffix [String] The new filename suffix, e.g. ".exe".
+    #
+    # @return [String] New path.
+    def set_suffix(path, suffix)
+      path.sub(/\.[^.]*$/, "") + suffix
+    end
+
     # Return the system shell and arguments for executing a shell command.
     #
     # @return [Array<String>] The shell and flag.

lib/rscons/application.rb

@@ -75,8 +75,6 @@ module Rscons
           end
           if rv == 0
             build(operation_options)
-          else
-            rv
           end
         when "clean"
           clean
@@ -194,7 +192,6 @@ module Rscons
       begin
         @script.configure(co)
       rescue ConfigureOp::ConfigureFailure
-        Ansi.write($stderr, :red, "Configuration failed", :reset, "\n")
         rv = 1
       end
       co.close(rv == 0)

lib/rscons/builders/copy.rb

@@ -57,7 +57,6 @@ module Rscons
                 printed_message = true
               end
               @cache.mkdir_p(File.dirname(dest), install: @install_builder)
-              FileUtils.rm_f(dest)
               FileUtils.cp(src, dest, :preserve => true)
             end
             @cache.register_build(dest, :Copy, [src], @env, install: @install_builder)

lib/rscons/builders/mixins/object.rb

@@ -78,7 +78,7 @@ module Rscons
               if @vars[:direct]
                 @env.get_build_fname(target, depfilesuffix, self.class)
               else
-                "#{target}#{depfilesuffix}"
+                Rscons.set_suffix(target, depfilesuffix)
               end
             @cache.mkdir_p(File.dirname(@vars["_DEPFILE"]))
             command = @env.build_command(@command_template, @vars)

lib/rscons/builders/preprocess.rb

@@ -23,7 +23,7 @@ module Rscons
           @vars["_PREPROCESS_DEPGEN"] = depgen
           @vars["_TARGET"] = @target
           @vars["_SOURCES"] = @sources
-          @vars["_DEPFILE"] = "#{target}#{env.expand_varref("${DEPFILESUFFIX}", vars)}"
+          @vars["_DEPFILE"] = Rscons.set_suffix(target, env.expand_varref("${DEPFILESUFFIX}", vars))
           command = @env.build_command("${CPP_CMD}", @vars)
           self.produces(@vars["_DEPFILE"])
           standard_command("Preprocessing <source>#{Util.short_format_paths(@sources)}<reset> => <target>#{@target}<reset>", command)

lib/rscons/configure_op.rb

@@ -280,19 +280,12 @@ module Rscons
 
     # Execute a test command and log the result.
     #
-    # @param command [Array<String>]
-    #   Command to execute.
-    # @param options [Hash]
-    #   Optional arguments.
-    # @option options [String] :stdin
-    #   Data to send to standard input stream of the executed command.
-    #
     # @return [String, String, Process::Status]
     #   stdout, stderr, status
-    def log_and_test_command(command, options = {})
+    def log_and_test_command(command)
       begin
         @log_fh.puts("Command: #{command.join(" ")}")
-        stdout, stderr, status = Open3.capture3(*command, stdin_data: options[:stdin])
+        stdout, stderr, status = Open3.capture3(*command)
         @log_fh.puts("Exit status: #{status.to_i}")
         @log_fh.write(stdout)
         @log_fh.write(stderr)

lib/rscons/environment.rb

@@ -251,7 +251,7 @@ module Rscons
       if extra_path = builder_class.extra_path
         extra_path = "/#{extra_path}"
       end
-      "#{@build_root}#{extra_path}/#{Util.make_relative_path("#{source_fname}#{suffix}")}".gsub("\\", "/")
+      "#{@build_root}#{extra_path}/#{Util.make_relative_path(Rscons.set_suffix(source_fname, suffix))}".gsub("\\", "/")
     end
 
     # Build all build targets specified in the Environment.

lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # Project version.
-  VERSION = "2.0.2"
+  VERSION = "2.0.0beta2"
 end

rb/assets/user_guide.html.erb

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>Rscons User Guide<%= subpage_title %> - Version <%= Rscons::VERSION %></title>
+    <title>RScons User Guide<%= subpage_title %> - Version <%= Rscons::VERSION %></title>
     <style>
       body {
         background-color: #CCC;
@@ -31,11 +31,6 @@
       .separator {
         height: 2em;
       }
-      .img_block_center {
-        display: block;
-        margin-left: auto;
-        margin-right: auto;
-      }
       .page_nav {
         width: 100%;
         table-layout: fixed;

rb/gen_user_guide.rb

@@ -154,8 +154,7 @@ class Generator
   end
 
   def render_toc
-    toc_content = %[<img class="img_block_center" src="rscons_logo_1000.png" />]
+    toc_content = %[<h1>Table of Contents</h1>\n]
-    toc_content += %[<h1>Table of Contents</h1>\n]
     @sections.each do |section|
       indent = section.number.split(".").size - 1
       toc_content += %[<span style="padding-left: #{4 * indent}ex;">]
@@ -224,6 +223,5 @@ end
 input = load_file("doc/user_guide.md")
 FileUtils.rm_rf("gen/user_guide")
 FileUtils.mkdir_p("gen/user_guide")
-FileUtils.cp("img/rscons_logo_1000.png", "gen/user_guide")
 Generator.new(input, "gen/user_guide/user_guide.html", false)
 Generator.new(input, "gen/user_guide", true)

spec/build_tests_spec.rb

@@ -195,7 +195,7 @@ EOF
     test_dir('simple')
     result = run_rscons
     expect(result.stderr).to eq ""
-    expect(File.exists?('build/e.1/simple.c.o')).to be_truthy
+    expect(File.exists?('build/e.1/simple.o')).to be_truthy
     expect(`./simple.exe`).to eq "This is a simple C program\n"
   end
 
@@ -212,8 +212,8 @@ EOF
     result = run_rscons(rsconscript: "command.rb")
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o build/e.1/simple.c.o -MMD -MF build/e.1/simple.c.o.mf simple.c},
+      %r{gcc -c -o build/e.1/simple.o -MMD -MF build/e.1/simple.mf simple.c},
-      %r{gcc -o simple.exe build/e.1/simple.c.o},
+      %r{gcc -o simple.exe build/e.1/simple.o},
     ])
   end
 
@@ -231,7 +231,7 @@ EOF
     test_dir('header')
     result = run_rscons
     expect(result.stderr).to eq ""
-    expect(File.exists?('build/e.1/header.c.o')).to be_truthy
+    expect(File.exists?('build/e.1/header.o')).to be_truthy
     expect(`./header.exe`).to eq "The value is 2\n"
   end
 
@@ -281,13 +281,13 @@ EOF
     result = run_rscons(rsconscript: "command.rb")
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o build/e.1/simple.c.o -MMD -MF build/e.1/simple.c.o.mf simple.c},
+      %r{gcc -c -o build/e.1/simple.o -MMD -MF build/e.1/simple.mf simple.c},
-      %r{gcc -o simple.exe build/e.1/simple.c.o},
+      %r{gcc -o simple.exe build/e.1/simple.o},
     ])
     result = run_rscons(rsconscript: "link_flag_change.rb")
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -o simple.exe build/e.1/simple.c.o -Llibdir},
+      %r{gcc -o simple.exe build/e.1/simple.o -Llibdir},
     ])
   end
 
@@ -317,9 +317,9 @@ EOF
     result = run_rscons(rsconscript: "carat.rb")
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o build/e.1/one.o -MMD -MF build/e.1/one.o.mf -Isrc -Isrc/one -Isrc/two build/e.1/one.c},
+      %r{gcc -c -o build/e.1/one.o -MMD -MF build/e.1/one.mf -Isrc -Isrc/one -Isrc/two build/e.1/one.c},
-      %r{gcc -c -o build/e.1/src/two/two.c.o -MMD -MF build/e.1/src/two/two.c.o.mf -Isrc -Isrc/one -Isrc/two src/two/two.c},
+      %r{gcc -c -o build/e.1/src/two/two.o -MMD -MF build/e.1/src/two/two.mf -Isrc -Isrc/one -Isrc/two src/two/two.c},
-      %r{gcc -o program.exe build/e.1/src/two/two.c.o build/e.1/one.o},
+      %r{gcc -o program.exe build/e.1/src/two/two.o build/e.1/one.o},
     ])
   end
 
@@ -337,29 +337,15 @@ EOF
     expect(result.stderr).to match /Could not find a registered build target "foo"/
   end
 
-  it "allows replacing a running executable when performing an 'install' operation" do
-    test_dir("install_running_exe")
-    result = run_rscons(op: "install")
-    expect(result.stderr).to eq ""
-    fcontents = File.read("program.c", mode: "rb")
-    File.open("program.c", "wb") do |fh|
-      fh.write(fcontents.sub(/2/, '3'))
-    end
-    pid = Process.spawn("install/program.exe")
-    result = run_rscons(op: "install")
-    expect(result.stderr).to eq ""
-    Process.wait(pid)
-  end
-
   context "clean operation" do
     it 'cleans built files' do
       test_dir("simple")
       result = run_rscons
       expect(result.stderr).to eq ""
       expect(`./simple.exe`).to match /This is a simple C program/
-      expect(File.exists?('build/e.1/simple.c.o')).to be_truthy
+      expect(File.exists?('build/e.1/simple.o')).to be_truthy
       result = run_rscons(op: %w[clean])
-      expect(File.exists?('build/e.1/simple.c.o')).to be_falsey
+      expect(File.exists?('build/e.1/simple.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
@@ -370,7 +356,7 @@ EOF
       result = run_rscons
       expect(result.stderr).to eq ""
       expect(`./simple.exe`).to match /This is a simple C program/
-      expect(File.exists?('build/e.1/simple.c.o')).to be_truthy
+      expect(File.exists?('build/e.1/simple.o')).to be_truthy
       File.open('build/e.1/dum', 'w') { |fh| fh.puts "dum" }
       result = run_rscons(op: %w[clean])
       expect(File.exists?('build/e.1')).to be_truthy
@@ -387,12 +373,12 @@ EOF
         result = run_rscons(rsconscript: "install.rb", op: %W[install])
         expect(result.stderr).to eq ""
         expect(File.exists?("#{prefix}/bin/program.exe")).to be_truthy
-        expect(File.exists?("build/e.1/src/one/one.c.o")).to be_truthy
+        expect(File.exists?("build/e.1/src/one/one.o")).to be_truthy
 
         result = run_rscons(rsconscript: "install.rb", op: %W[clean])
         expect(result.stderr).to eq ""
         expect(File.exists?("#{prefix}/bin/program.exe")).to be_truthy
-        expect(File.exists?("build/e.1/src/one/one.c.o")).to be_falsey
+        expect(File.exists?("build/e.1/src/one/one.o")).to be_falsey
       end
     end
 
@@ -409,7 +395,7 @@ EOF
         result = run_rscons(rsconscript: "install.rb", op: %W[clean])
         expect(result.stderr).to eq ""
         expect(File.exists?("#{prefix}/bin/program.exe")).to be_truthy
-        expect(File.exists?("build/e.1/src/one/one.c.o")).to be_falsey
+        expect(File.exists?("build/e.1/src/one/one.o")).to be_falsey
 
         result = run_rscons(rsconscript: "install.rb", op: %W[uninstall -v])
         expect(result.stderr).to eq ""
@@ -491,10 +477,10 @@ EOF
     result = run_rscons
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o build/e.1/src/program.c.o -MMD -MF build/e.1/src/program.c.o.mf '-DSTRING="Debug Version"' -O2 src/program.c},
+      %r{gcc -c -o build/e.1/src/program.o -MMD -MF build/e.1/src/program.mf '-DSTRING="Debug Version"' -O2 src/program.c},
-      %r{gcc -o program-debug.exe build/e.1/src/program.c.o},
+      %r{gcc -o program-debug.exe build/e.1/src/program.o},
-      %r{gcc -c -o build/e.2/src/program.c.o -MMD -MF build/e.2/src/program.c.o.mf '-DSTRING="Release Version"' -O2 src/program.c},
+      %r{gcc -c -o build/e.2/src/program.o -MMD -MF build/e.2/src/program.mf '-DSTRING="Release Version"' -O2 src/program.c},
-      %r{gcc -o program-release.exe build/e.2/src/program.c.o},
+      %r{gcc -o program-release.exe build/e.2/src/program.o},
     ])
   end
 
@@ -503,12 +489,12 @@ EOF
     result = run_rscons(rsconscript: "clone_all.rb")
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o build/e.1/src/program.c.o -MMD -MF build/e.1/src/program.c.o.mf -DSTRING="Hello" -O2 src/program.c},
+      %r{gcc -c -o build/e.1/src/program.o -MMD -MF build/e.1/src/program.mf -DSTRING="Hello" -O2 src/program.c},
-      %r{post build/e.1/src/program.c.o},
+      %r{post build/e.1/src/program.o},
-      %r{gcc -o program.exe build/e.1/src/program.c.o},
+      %r{gcc -o program.exe build/e.1/src/program.o},
       %r{post program.exe},
-      %r{post build/e.2/src/program.c.o},
+      %r{post build/e.2/src/program.o},
-      %r{gcc -o program2.exe build/e.2/src/program.c.o},
+      %r{gcc -o program2.exe build/e.2/src/program.o},
       %r{post program2.exe},
     ])
   end
@@ -517,7 +503,7 @@ EOF
     test_dir('simple_cc')
     result = run_rscons
     expect(result.stderr).to eq ""
-    expect(File.exists?('build/e.1/simple.cc.o')).to be_truthy
+    expect(File.exists?('build/e.1/simple.o')).to be_truthy
     expect(`./simple.exe`).to eq "This is a simple C++ program\n"
   end
 
@@ -534,9 +520,9 @@ EOF
     result = run_rscons
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o one.o -MMD -MF one.o.mf -DONE one.c},
+      %r{gcc -c -o one.o -MMD -MF one.mf -DONE one.c},
-      %r{gcc -c -o build/e.1/two.c.o -MMD -MF build/e.1/two.c.o.mf two.c},
+      %r{gcc -c -o build/e.1/two.o -MMD -MF build/e.1/two.mf two.c},
-      %r{gcc -o two_sources.exe one.o build/e.1/two.c.o},
+      %r{gcc -o two_sources.exe one.o build/e.1/two.o},
     ])
     expect(File.exists?("two_sources.exe")).to be_truthy
     expect(`./two_sources.exe`).to eq "This is a C program with two sources.\n"
@@ -547,14 +533,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/one.o -MMD -MF build/e.1/one.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/two.o -MMD -MF build/e.1/two.mf -Dmake_lib two.c},
-      %r{ar rcs lib.a build/e.1/one.c.o build/e.1/two.c.o},
+      %r{ar rcs lib.a build/e.1/one.o build/e.1/two.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/three.o -MMD -MF build/e.1/three.mf three.c},
-      %r{gcc -o library.exe lib.a build/e.1/three.c.o},
+      %r{gcc -o library.exe lib.a build/e.1/three.o},
     ])
     expect(File.exists?("library.exe")).to be_truthy
-    expect(`ar t lib.a`).to eq "one.c.o\ntwo.c.o\n"
+    expect(`ar t lib.a`).to eq "one.o\ntwo.o\n"
   end
 
   it 'supports build hooks to override construction variables' do
@@ -562,9 +548,9 @@ EOF
     result = run_rscons(rsconscript: "build_hooks.rb")
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o build/e.1/src/one/one.c.o -MMD -MF build/e.1/src/one/one.c.o.mf -Isrc/one -Isrc/two -O1 src/one/one.c},
+      %r{gcc -c -o build/e.1/src/one/one.o -MMD -MF build/e.1/src/one/one.mf -Isrc/one -Isrc/two -O1 src/one/one.c},
-      %r{gcc -c -o build/e.1/src/two/two.c.o -MMD -MF build/e.1/src/two/two.c.o.mf -Isrc/one -Isrc/two -O2 src/two/two.c},
+      %r{gcc -c -o build/e.1/src/two/two.o -MMD -MF build/e.1/src/two/two.mf -Isrc/one -Isrc/two -O2 src/two/two.c},
-      %r{gcc -o build_hook.exe build/e.1/src/one/one.c.o build/e.1/src/two/two.c.o},
+      %r{gcc -o build_hook.exe build/e.1/src/one/one.o build/e.1/src/two/two.o},
     ])
     expect(`./build_hook.exe`).to eq "Hello from two()\n"
   end
@@ -574,8 +560,8 @@ EOF
     result = run_rscons(rsconscript: "build_hooks_override_vars.rb")
     expect(result.stderr).to eq ""
     verify_lines(lines(result.stdout), [
-      %r{gcc -c -o one.o -MMD -MF one.o.mf -Isrc -Isrc/one -Isrc/two -O1 src/two/two.c},
+      %r{gcc -c -o one.o -MMD -MF one.mf -Isrc -Isrc/one -Isrc/two -O1 src/two/two.c},
-      %r{gcc -c -o two.o -MMD -MF two.o.mf -Isrc -Isrc/one -Isrc/two -O2 src/two/two.c},
+      %r{gcc -c -o two.o -MMD -MF two.mf -Isrc -Isrc/one -Isrc/two -O2 src/two/two.c},
     ])
     expect(File.exists?('one.o')).to be_truthy
     expect(File.exists?('two.o')).to be_truthy
@@ -591,7 +577,7 @@ EOF
       %r{Compiling simple.c},
       %r{Linking simple.exe},
     ])
-    expect(File.exists?('build/e.1/simple.c.o')).to be_truthy
+    expect(File.exists?('build/e.1/simple.o')).to be_truthy
     expect(`./simple.exe`).to eq "This is a simple C program\n"
 
     File.open("program.ld", "w") {|fh| fh.puts("2")}
@@ -614,9 +600,9 @@ EOF
     result = run_rscons
     expect(result.stderr).to eq ""
     slines = lines(result.stdout)
-    verify_lines(slines, [%r{gdc -c -o build/e.1/main.d.o -MMD -MF build/e.1/main.d.o.mf main.d}])
+    verify_lines(slines, [%r{gdc -c -o build/e.1/main.o -MMD -MF build/e.1/main.mf main.d}])
-    verify_lines(slines, [%r{gdc -c -o build/e.1/mod.d.o -MMD -MF build/e.1/mod.d.o.mf mod.d}])
+    verify_lines(slines, [%r{gdc -c -o build/e.1/mod.o -MMD -MF build/e.1/mod.mf mod.d}])
-    verify_lines(slines, [%r{gdc -o hello-d.exe build/e.1/main.d.o build/e.1/mod.d.o}])
+    verify_lines(slines, [%r{gdc -o hello-d.exe build/e.1/main.o build/e.1/mod.o}])
     expect(`./hello-d.exe`.rstrip).to eq "Hello from D, value is 42!"
   end
 
@@ -625,9 +611,9 @@ EOF
     result = run_rscons(rsconscript: "build-ldc2.rb")
     expect(result.stderr).to eq ""
     slines = lines(result.stdout)
-    verify_lines(slines, [%r{ldc2 -c -of build/e.1/main.d.o(bj)? -deps=build/e.1/main.d.o.mf main.d}])
+    verify_lines(slines, [%r{ldc2 -c -of build/e.1/main.o(bj)? -deps=build/e.1/main.mf main.d}])
-    verify_lines(slines, [%r{ldc2 -c -of build/e.1/mod.d.o(bj)? -deps=build/e.1/mod.d.o.mf mod.d}])
+    verify_lines(slines, [%r{ldc2 -c -of build/e.1/mod.o(bj)? -deps=build/e.1/mod.mf mod.d}])
-    verify_lines(slines, [%r{ldc2 -of hello-d.exe build/e.1/main.d.o(bj)? build/e.1/mod.d.o(bj)?}])
+    verify_lines(slines, [%r{ldc2 -of hello-d.exe build/e.1/main.o(bj)? build/e.1/mod.o(bj)?}])
     expect(`./hello-d.exe`.rstrip).to eq "Hello from D, value is 42!"
   end
 
@@ -636,9 +622,9 @@ EOF
     result = run_rscons(rsconscript: "build-ldc2.rb")
     expect(result.stderr).to eq ""
     slines = lines(result.stdout)
-    verify_lines(slines, [%r{ldc2 -c -of build/e.1/main.d.o(bj)? -deps=build/e.1/main.d.o.mf main.d}])
+    verify_lines(slines, [%r{ldc2 -c -of build/e.1/main.o(bj)? -deps=build/e.1/main.mf main.d}])
-    verify_lines(slines, [%r{ldc2 -c -of build/e.1/mod.d.o(bj)? -deps=build/e.1/mod.d.o.mf mod.d}])
+    verify_lines(slines, [%r{ldc2 -c -of build/e.1/mod.o(bj)? -deps=build/e.1/mod.mf mod.d}])
-    verify_lines(slines, [%r{ldc2 -of hello-d.exe build/e.1/main.d.o(bj)? build/e.1/mod.d.o(bj)?}])
+    verify_lines(slines, [%r{ldc2 -of hello-d.exe build/e.1/main.o(bj)? build/e.1/mod.o(bj)?}])
     expect(`./hello-d.exe`.rstrip).to eq "Hello from D, value is 42!"
     contents = File.read("mod.d", mode: "rb").sub("42", "33")
     File.open("mod.d", "wb") do |fh|
@@ -647,9 +633,9 @@ EOF
     result = run_rscons(rsconscript: "build-ldc2.rb")
     expect(result.stderr).to eq ""
     slines = lines(result.stdout)
-    verify_lines(slines, [%r{ldc2 -c -of build/e.1/main.d.o(bj)? -deps=build/e.1/main.d.o.mf main.d}])
+    verify_lines(slines, [%r{ldc2 -c -of build/e.1/main.o(bj)? -deps=build/e.1/main.mf main.d}])
-    verify_lines(slines, [%r{ldc2 -c -of build/e.1/mod.d.o(bj)? -deps=build/e.1/mod.d.o.mf mod.d}])
+    verify_lines(slines, [%r{ldc2 -c -of build/e.1/mod.o(bj)? -deps=build/e.1/mod.mf mod.d}])
-    verify_lines(slines, [%r{ldc2 -of hello-d.exe build/e.1/main.d.o(bj)? build/e.1/mod.d.o(bj)?}])
+    verify_lines(slines, [%r{ldc2 -of hello-d.exe build/e.1/main.o(bj)? build/e.1/mod.o(bj)?}])
     expect(`./hello-d.exe`.rstrip).to eq "Hello from D, value is 33!"
   end
 
@@ -668,18 +654,18 @@ EOF
       result = run_rscons
       expect(result.stderr).to eq ""
       slines = lines(result.stdout)
-      verify_lines(slines, [%r{gdc -c -o build/e.1/main.d.o -MMD -MF build/e.1/main.d.o.mf main.d}])
+      verify_lines(slines, [%r{gdc -c -o build/e.1/main.o -MMD -MF build/e.1/main.mf main.d}])
-      verify_lines(slines, [%r{gdc -c -o build/e.1/mod.d.o -MMD -MF build/e.1/mod.d.o.mf mod.d}])
+      verify_lines(slines, [%r{gdc -c -o build/e.1/mod.o -MMD -MF build/e.1/mod.mf mod.d}])
-      verify_lines(slines, [%r{gdc -o hello-d.exe build/e.1/main.d.o build/e.1/mod.d.o}])
+      verify_lines(slines, [%r{gdc -o hello-d.exe build/e.1/main.o build/e.1/mod.o}])
       expect(`./hello-d.exe`.rstrip).to eq "Hello from D, value is 42!"
       fcontents = File.read("mod.d", mode: "rb").sub("42", "33")
       File.open("mod.d", "wb") {|fh| fh.write(fcontents)}
       result = run_rscons
       expect(result.stderr).to eq ""
       slines = lines(result.stdout)
-      verify_lines(slines, [%r{gdc -c -o build/e.1/main.d.o -MMD -MF build/e.1/main.d.o.mf main.d}])
+      verify_lines(slines, [%r{gdc -c -o build/e.1/main.o -MMD -MF build/e.1/main.mf main.d}])
-      verify_lines(slines, [%r{gdc -c -o build/e.1/mod.d.o -MMD -MF build/e.1/mod.d.o.mf mod.d}])
+      verify_lines(slines, [%r{gdc -c -o build/e.1/mod.o -MMD -MF build/e.1/mod.mf mod.d}])
-      verify_lines(slines, [%r{gdc -o hello-d.exe build/e.1/main.d.o build/e.1/mod.d.o}])
+      verify_lines(slines, [%r{gdc -o hello-d.exe build/e.1/main.o build/e.1/mod.o}])
       expect(`./hello-d.exe`.rstrip).to eq "Hello from D, value is 33!"
     end
 
@@ -755,8 +741,8 @@ EOF
     test_dir("simple")
     result = run_rscons(rsconscript: "register_target_in_build_hook.rb")
     expect(result.stderr).to eq ""
-    expect(File.exists?("build/e.1/simple.c.o")).to be_truthy
+    expect(File.exists?("build/e.1/simple.o")).to be_truthy
-    expect(File.exists?("build/e.1/simple.c.o.txt")).to be_truthy
+    expect(File.exists?("build/e.1/simple.o.txt")).to be_truthy
     expect(`./simple.exe`).to eq "This is a simple C program\n"
   end
 
@@ -765,8 +751,8 @@ EOF
     File.open("other.cccc", "w") {|fh| fh.puts}
     result = run_rscons(rsconscript: "cxxsuffix.rb")
     expect(result.stderr).to eq ""
-    expect(File.exists?("build/e.1/simple.cc.o")).to be_truthy
+    expect(File.exists?("build/e.1/simple.o")).to be_truthy
-    expect(File.exists?("build/e.1/other.cccc.o")).to be_truthy
+    expect(File.exists?("build/e.1/other.o")).to be_truthy
     expect(`./simple.exe`).to eq "This is a simple C++ program\n"
   end
 
@@ -775,8 +761,8 @@ EOF
     FileUtils.mv("src/one/one.c", "src/one/one.yargh")
     result = run_rscons(rsconscript: "csuffix.rb")
     expect(result.stderr).to eq ""
-    expect(File.exists?("build/e.1/src/one/one.yargh.o")).to be_truthy
+    expect(File.exists?("build/e.1/src/one/one.o")).to be_truthy
-    expect(File.exists?("build/e.1/src/two/two.c.o")).to be_truthy
+    expect(File.exists?("build/e.1/src/two/two.o")).to be_truthy
     expect(`./program.exe`).to eq "Hello from two()\n"
   end
 
@@ -848,7 +834,7 @@ EOF
     test_dir("simple")
     result = run_rscons(rsconscript: "cvar_array.rb")
     expect(result.stderr).to eq ""
-    expect(File.exists?("build/e.1/simple.c.o")).to be_truthy
+    expect(File.exists?("build/e.1/simple.o")).to be_truthy
     expect(`./simple.exe`).to eq "This is a simple C program\n"
   end
 
@@ -930,7 +916,7 @@ EOF
     result = run_rscons(rsconscript: "absolute_source_path.rb")
     expect(result.stderr).to eq ""
     slines = lines(result.stdout)
-    verify_lines(slines, [%r{build/e.1/.*/abs\.c.o$}])
+    verify_lines(slines, [%r{build/e.1/.*/abs\.o$}])
     verify_lines(slines, [%r{\babs.exe\b}])
   end
 
@@ -1445,18 +1431,6 @@ EOF
       expect(result.stdout).to eq ""
     end
 
-    it "supports building multiple object files from sources with the same pathname and basename" do
-      test_dir "multiple_basename"
-      result = run_rscons
-      expect(result.stderr).to eq ""
-      expect(result.status).to eq 0
-      expect(File.exist?("foo.exe")).to be_truthy
-      result = run_rscons
-      expect(result.stderr).to eq ""
-      expect(result.stdout).to eq ""
-      expect(result.status).to eq 0
-    end
-
     context "debugging" do
       it "prints a message when the target does not exist" do
         test_dir("simple")
@@ -1550,7 +1524,7 @@ EOF
       result = run_rscons(rsconscript: "override_depfilesuffix.rb")
       expect(result.stderr).to eq ""
       verify_lines(lines(result.stdout), [
-        %r{gcc -c -o simple.o -MMD -MF simple.o.deppy simple.c},
+        %r{gcc -c -o simple.o -MMD -MF simple.deppy simple.c},
       ])
     end
 
@@ -1574,7 +1548,7 @@ EOF
       test_dir("library")
       result = run_rscons(rsconscript: "override_arcmd.rb")
       expect(result.stderr).to eq ""
-      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}])
+      verify_lines(lines(result.stdout), [%r{ar rcf lib.a build/e.1/one.o build/e.1/three.o build/e.1/two.o}])
     end
 
     it "allows passing object files as sources" do
@@ -1604,7 +1578,7 @@ EOF
       test_dir "shared_library"
       result = run_rscons(rsconscript: "shared_library_from_object.rb")
       expect(result.stderr).to eq ""
-      expect(File.exists?("one.c.o"))
+      expect(File.exists?("one.o"))
     end
   end
 
@@ -1737,7 +1711,7 @@ EOF
             create_exe "gcc", "exit 1"
             create_exe "clang", "exit 1"
             result = run_rscons(rsconscript: rsconscript, op: "configure")
-            expect(result.stderr).to match /Configuration failed/
+            expect(result.stderr).to eq ""
             expect(result.status).to_not eq 0
             expect(result.stdout).to match /Checking for C compiler\.\.\. not found/
           end
@@ -1780,7 +1754,7 @@ EOF
             create_exe "g++", "exit 1"
             create_exe "clang++", "exit 1"
             result = run_rscons(rsconscript: rsconscript, op: "configure")
-            expect(result.stderr).to match /Configuration failed/
+            expect(result.stderr).to eq ""
             expect(result.status).to_not eq 0
             expect(result.stdout).to match /Checking for C\+\+ compiler\.\.\. not found/
           end
@@ -1823,7 +1797,7 @@ EOF
             create_exe "gdc", "exit 1"
             create_exe "ldc2", "exit 1"
             result = run_rscons(rsconscript: rsconscript, op: "configure")
-            expect(result.stderr).to match /Configuration failed/
+            expect(result.stderr).to eq ""
             expect(result.status).to_not eq 0
             expect(result.stdout).to match /Checking for D compiler\.\.\. not found/
           end
@@ -1861,7 +1835,7 @@ EOF
       it "fails when the requested header is not found" do
         test_dir "configure"
         result = run_rscons(rsconscript: "check_c_header_failure.rb", op: "configure")
-        expect(result.stderr).to match /Configuration failed/
+        expect(result.stderr).to eq ""
         expect(result.status).to_not eq 0
         expect(result.stdout).to match /Checking for C header 'not___found\.h'... not found/
       end
@@ -1926,7 +1900,7 @@ EOF
       it "fails when the requested header is not found" do
         test_dir "configure"
         result = run_rscons(rsconscript: "check_cxx_header_failure.rb", op: "configure")
-        expect(result.stderr).to match /Configuration failed/
+        expect(result.stderr).to eq ""
         expect(result.status).to_not eq 0
         expect(result.stdout).to match /Checking for C\+\+ header 'not___found\.h'... not found/
       end
@@ -1967,7 +1941,7 @@ EOF
       it "fails when the requested import is not found" do
         test_dir "configure"
         result = run_rscons(rsconscript: "check_d_import_failure.rb", op: "configure")
-        expect(result.stderr).to match /Configuration failed/
+        expect(result.stderr).to eq ""
         expect(result.status).to_not eq 0
         expect(result.stdout).to match /Checking for D import 'not\.found'... not found/
       end
@@ -2008,7 +1982,7 @@ EOF
       it "fails when the requested library is not found" do
         test_dir "configure"
         result = run_rscons(rsconscript: "check_lib_failure.rb", op: "configure")
-        expect(result.stderr).to match /Configuration failed/
+        expect(result.stderr).to eq ""
         expect(result.status).to_not eq 0
         expect(result.stdout).to match /Checking for library 'mfoofoo'... not found/
       end
@@ -2089,7 +2063,7 @@ EOF
       it "fails when the requested program is not found" do
         test_dir "configure"
         result = run_rscons(rsconscript: "check_program_failure.rb", op: "configure")
-        expect(result.stderr).to match /Configuration failed/
+        expect(result.stderr).to eq ""
         expect(result.status).to_not eq 0
         expect(result.stdout).to match /Checking for program 'program-that-is-not-found'... not found/
       end
@@ -2121,7 +2095,7 @@ EOF
         it "fails when the configure program given does not exist" do
           test_dir "configure"
           result = run_rscons(rsconscript: "check_cfg.rb", op: "configure")
-          expect(result.stderr).to match /Configuration failed/
+          expect(result.stderr).to eq ""
           expect(result.status).to_not eq 0
           expect(result.stdout).to match /Checking 'my-config'\.\.\. not found/
         end
@@ -2166,7 +2140,7 @@ EOF
               test_dir "configure"
               create_exe "grep", "exit 4"
               result = run_rscons(rsconscript: "custom_config_check.rb", op: "configure")
-              expect(result.stderr).to match /Configuration failed/
+              expect(result.stderr).to eq ""
               expect(result.stdout).to match /Checking 'grep' version\.\.\. error executing grep/
               expect(result.status).to_not eq 0
             end
@@ -2177,7 +2151,7 @@ EOF
               test_dir "configure"
               create_exe "grep", "echo 'grep (GNU grep) 1.1'"
               result = run_rscons(rsconscript: "custom_config_check.rb", op: "configure")
-              expect(result.stderr).to match /Configuration failed/
+              expect(result.stderr).to eq ""
               expect(result.stdout).to match /Checking 'grep' version\.\.\. too old!/
               expect(result.status).to_not eq 0
             end
@@ -2215,14 +2189,6 @@ EOF
             expect(result.status).to eq 0
           end
         end
-
-        it "allows passing standard input data to the executed command" do
-          test_dir "configure"
-          result = run_rscons(rsconscript: "custom_config_check.rb", op: "configure")
-          expect(result.stderr).to eq ""
-          expect(result.stdout).to match /Checking sed -E flag\.\.\. good/
-          expect(result.status).to eq 0
-        end
       end
     end
 
@@ -2264,13 +2230,11 @@ EOF
       expect(result.status).to_not eq 0
     end
 
-    it "exits with an error code and message if configuration fails during autoconf" do
+    it "exits with an error if configuration fails during autoconf" do
       test_dir "configure"
       result = run_rscons(rsconscript: "autoconf_fail.rb")
       expect(result.stdout).to match /Checking for C compiler\.\.\. not found/
       expect(result.status).to_not eq 0
-      expect(result.stderr).to_not match /from\s/
-      expect(lines(result.stderr).last).to eq "Configuration failed"
     end
 
     it "exits with an error if configuration has not been performed before attempting to create an environment" do
@@ -2474,13 +2438,13 @@ EOF
         result = run_rscons(rsconscript: "install.rb", op: %W[install])
         expect(result.stderr).to eq ""
         expect(File.exists?("#{prefix}/bin/program.exe")).to be_truthy
-        expect(File.exists?("build/e.1/src/one/one.c.o")).to be_truthy
+        expect(File.exists?("build/e.1/src/one/one.o")).to be_truthy
 
         result = run_rscons(rsconscript: "install.rb", op: %W[uninstall])
         expect(result.stderr).to eq ""
         expect(result.stdout).to_not match /Removing/
         expect(File.exists?("#{prefix}/bin/program.exe")).to be_falsey
-        expect(File.exists?("build/e.1/src/one/one.c.o")).to be_truthy
+        expect(File.exists?("build/e.1/src/one/one.o")).to be_truthy
         expect(Dir.entries(prefix)).to match_array %w[. ..]
       end
     end

spec/rscons_spec.rb

@@ -1,5 +1,15 @@
 describe Rscons do
 
+  describe ".set_suffix" do
+    it "changes the suffix to the new one" do
+      expect(Rscons.set_suffix("foo.c", ".h")).to eq("foo.h")
+    end
+
+    it "appends a suffix if the given file name does not have one" do
+      expect(Rscons.set_suffix("bazz", ".d")).to eq("bazz.d")
+    end
+  end
+
   describe ".get_system_shell" do
     before(:each) do
       Rscons.instance_variable_set(:@shell, nil)