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

CHANGELOG.md

@@ -32,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/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;
-}

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
-executable.
+the project to be built (typically the root of the repository).
 
 ## Version Control Setup
 

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/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/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # Project version.
-  VERSION = "2.0.1"
+  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

@@ -337,20 +337,6 @@ 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")
@@ -2203,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