v3.0.2

Document variants

CHANGELOG.md

@@ -1,3 +1,118 @@
+## 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
+- #140 - Support naming environments
+- #143 - Add Size builder
+- #142 - Add 'sh' script DSL method
+- #144 - Add FileUtils class methods to script DSL
+- #145 - Support environment variable to set rscons build directory
+- #146 - Add ^^/ shortcut to top-level build directory
+- #139 - Add tasks
+- #147 - Add task options
+- #148 - Add license/copyright to distributable script
+- #150 - Add env.expand() shortcut method to expand paths and construction variables
+- #152 - Add download script method
+- #153 - Allow passing spawn options to sh
+- #154 - Record build directory absolute path
+- #149 - Add shortcut method for creating environments
+- #131 - Only configure if necessary
+- #151 - Store configure task parameters in configuration cache data
+- #137 - Add variants
+- #155 - Add build_dir script method
+
+## v2.3.0
+
+### New Features
+
+- #125 - Support subsidiary Rsconscript files
+- #126 - Add PATH manipulation methods
+
+### Fixes
+
+- #121 - env.depends() does not work with build-root-relative "^/" paths
+- #130 - Document -f command line option
+- #133 - Clarify failed command error message indicating to run -F
+- #134 - Document CMD_STDOUT variable for Command builder
+- #135 - Write dependency file to build directory when user invokes Object builder directly
+- #141 - Document phony targets
+
+## v2.2.0
+
+### New Features
+
+- #120 - improve support for MSYS2
+- #119 - add failure messages for failed configuration checks
+- #118 - compiler checks should support cross-compilers and freestanding compilers
+
+## v2.1.0
+
+### New Features
+
+- #117 - ruby 2.7 compatibility
+
+## 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
+- compress rscons distributable script
+- add configure operation to detect compilers, check for headers/libraries, etc... (invoked automatically if needed)
+- Environments store builder classes instead of instances of builder classes
+- use a separate Builder instance for each build operation
+- load Rsconscript from Rsconscript/Rsconscript.rb instead of Rsconsfile
+- drop support for builder run methods using the old 5 parameter signature
+- remove Environment#build_dir
+- set Environment build root in configure step
+- remove Builder#finalize (now #run called repeatedly until builder completes)
+- remove Builder#setup
+- remove Builder#features and Builder#produces?
+- add functionality to allow builders to wait on Ruby threads or other builders
+- add install/uninstall/distclean command-line operations
+- preserve makefile dependency files under build directory
+- remove a few deprecated methods
+- pass a Builder instance to build hooks instead of a build operation Hash
+- support a basic markup syntax in builder run messages to colorize target/source files
+- hide (but store) failed compilation command by default so the user doesn't have to scroll back as much to see compiler output
+- refactor to remove some redundancy among built-in builders
+- track object file source language (correctly determine linker when only passed object files previously built by particular toolchains)
+- add barriers
+- add InstallDirectory builder
+- change Install builder to copy files on 'install' operation
+- add "prefix" construction variable based on configured installation prefix
+- allow passing builder objects as sources to build targets
+- differentiate 'build' targets from 'install' targets in cache contents
+- add verbose mode
+- show build progress as a percentage in builder output messages
+- 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
 
 ### New Features

DEVELOPING.md

@@ -0,0 +1,14 @@
+# Developing
+
+# Specs
+
+To run the rscons specs, the following commands must be available:
+
+* gcc
+* clang
+* g++
+* clang++
+* gdc
+* ldc
+* flex
+* bison

Gemfile

@@ -1,10 +1,14 @@
 source 'https://rubygems.org'
 
-gem "json"
 gem "rspec"
 gem "rake"
-gem "simplecov"
+gem "simplecov", "~> 0.15.0"
-gem "yard"
+if RbConfig::CONFIG["host"]["msys"]
-gem "rdoc"
+  gem "json", "2.1.0"
-gem "redcarpet"
+else
-gem "syntax"
+  gem "json"
+  gem "yard"
+  gem "rdoc"
+  gem "redcarpet"
+  gem "syntax"
+end

Gemfile.lock

@@ -1,32 +1,38 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
-    docile (1.3.2)
+    docile (1.1.5)
-    json (2.2.0)
+    json (2.6.1)
-    rake (12.3.2)
+    psych (4.0.3)
-    rdoc (6.1.1)
+      stringio
-    redcarpet (3.4.0)
+    rake (13.0.6)
-    rspec (3.8.0)
+    rdoc (6.4.0)
-      rspec-core (~> 3.8.0)
+      psych (>= 4.0.0)
-      rspec-expectations (~> 3.8.0)
+    redcarpet (3.5.1)
-      rspec-mocks (~> 3.8.0)
+    rspec (3.11.0)
-    rspec-core (3.8.2)
+      rspec-core (~> 3.11.0)
-      rspec-support (~> 3.8.0)
+      rspec-expectations (~> 3.11.0)
-    rspec-expectations (3.8.4)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.11.0)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.11.0)
-    rspec-support (3.8.2)
+    rspec-support (3.11.0)
-    simplecov (0.15.0)
+    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)
-    yard (0.9.20)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -38,9 +44,9 @@ DEPENDENCIES
   rdoc
   redcarpet
   rspec
-  simplecov
+  simplecov (~> 0.15.0)
   syntax
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.2.31

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2019 Josh Holtrop
+Copyright (c) 2013-2022 Josh Holtrop
 
 MIT License
 

README.md

@@ -1,6 +1,42 @@
 # Rscons
 
+![rscons logo](img/rscons_logo_1000.png)
+
 Rscons (https://github.com/holtrop/rscons) is an open-source build system
 for developers.
+It supports the following features:
 
-Rscons is written in Ruby, and is inspired by [SCons](https://scons.org/) and [waf](https://waf.io/).
+  * multi-threaded job execution
+  * auto-configuration
+  * 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
+  * colorized output with build progress
+  * build hooks
+  * user-defined tasks with dependencies and custom parameters
+  * build variants
+
+At its core, Rscons is mainly an engine to:
+
+  * determine the proper order to perform build steps,
+  * determine whether each build target is up to date or in need of rebuild, and
+  * schedule those build steps across multiple threads as efficiently as possible.
+
+Along the way, Rscons provides a concise syntax for specifying common types of
+build steps, but also provides an extensible framework for performing
+custom build operations as well.
+
+Rscons takes inspiration from:
+
+  * [SCons](https://scons.org/)
+  * [waf](https://waf.io/)
+  * [rake](https://github.com/ruby/rake)
+  * [CMake](https://cmake.org/)
+  * [Autoconf](https://www.gnu.org/software/autoconf/)
+
+Rscons is written in Ruby.
+The only requirement to run Rscons is that the system has a Ruby interpreter
+installed.
+
+See [https://holtrop.github.io/rscons/index.html](https://holtrop.github.io/rscons/index.html) for User Guide and Installation instructions.

Rakefile.rb

@@ -6,24 +6,27 @@ rescue Bundler::BundlerError => e
 end
 
 require "rspec/core/rake_task"
-require "yard"
 require "rake/clean"
 require "fileutils"
 
 CLEAN.include %w[build_test_run .yardoc yard coverage test]
-CLOBBER.include %w[dist pkg]
+CLOBBER.include %w[dist gen large_project pkg]
 
 task :build_dist do
   sh "ruby rb/build_dist.rb"
 end
 
 RSpec::Core::RakeTask.new(:spec, :example_string) do |task, args|
+  ENV["specs"] = "1"
   if args.example_string
     ENV["partial_specs"] = "1"
     task.rspec_opts = %W[-e "#{args.example_string}" -f documentation]
   end
 end
 task :spec => :build_dist
+task :spec do
+  ENV.delete("specs")
+end
 
 # dspec task is useful to test the distributable release script, but is not
 # useful for coverage information.
@@ -32,16 +35,11 @@ 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"].invoke(args.example_string)
+  Rake::Task["spec"].execute(args)
   ENV.delete("dist_specs")
   FileUtils.rm_f(Dir.glob(".rscons-*"))
 end
 
-YARD::Rake::YardocTask.new do |yard|
-  yard.files = ['lib/**/*.rb']
-  yard.options = ["-ogen/yard"]
-end
-
 task :gen_large_project, [:size] => :build_dist do |task, args|
   size = (args.size || 10000).to_i
   FileUtils.rm_rf("large_project")
@@ -78,7 +76,7 @@ task :gen_large_project, [:size] => :build_dist do |task, args|
   end
   File.open("large_project/Rsconscript", "w") do |fh|
     fh.puts <<EOF
-build do
+default do
   Environment.new do |env|
     env.Program("project", glob("src/*.c"))
   end
@@ -88,8 +86,25 @@ EOF
   FileUtils.cp("dist/rscons", "large_project")
 end
 
-task :user_guide do
+unless RbConfig::CONFIG["host"]["msys"]
-  system("ruby", "-Ilib", "rb/gen_user_guide.rb")
+  require "yard"
+  YARD::Rake::YardocTask.new do |yard|
+    yard.files = ['lib/**/*.rb']
+    yard.options = ["-ogen/yard"]
+  end
+
+  desc "Build user guide"
+  task :user_guide do
+    system("ruby", "-Ilib", "rb/gen_user_guide.rb")
+  end
 end
 
 task :default => :spec
+
+task :all => [
+  :build_dist,
+  :spec,
+  :dspec,
+  :yard,
+  :user_guide,
+]

bin/rscons

@@ -3,5 +3,5 @@
 require "rscons/cli"
 
 if __FILE__ == $0
-  Rscons::Cli.run(ARGV)
+  Rscons::Cli.new.run(ARGV)
 end

build_tests/cfile/Rsconscript

@@ -1,6 +1,4 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.CFile("lexer.c", "lexer.l")
-    env.CFile("lexer.c", "lexer.l")
+  env.CFile("parser.c", "parser.y")
-    env.CFile("parser.c", "parser.y")
-  end
 end

build_tests/cfile/error_unknown_extension.rb

@@ -1,5 +1,3 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.CFile("file.c", "foo.bar")
-    env.CFile("file.c", "foo.bar")
-  end
 end

build_tests/clone_env/Rsconscript

@@ -1,12 +1,10 @@
-build do
+debug = env(echo: :command) do |env|
-  debug = Environment.new(echo: :command) do |env|
+  env['CFLAGS'] = '-O2'
-    env['CFLAGS'] = '-O2'
+  env['CPPFLAGS'] = '-DSTRING="Debug Version"'
-    env['CPPFLAGS'] = '-DSTRING="Debug Version"'
+  env.Program('program-debug.exe', Dir['src/*.c'])
-    env.Program('program-debug.exe', Dir['src/*.c'])
+end
-  end
+
-
+release = debug.clone do |env|
-  release = debug.clone do |env|
+  env["CPPFLAGS"] = '-DSTRING="Release Version"'
-    env["CPPFLAGS"] = '-DSTRING="Release Version"'
+  env.Program('program-release.exe', Dir['src/*.c'])
-    env.Program('program-release.exe', Dir['src/*.c'])
-  end
 end

build_tests/clone_env/clone_all.rb

@@ -1,16 +1,14 @@
-build do
+env1 = env(echo: :command) do |env|
-  env1 = Environment.new(echo: :command) do |env|
+  env['CFLAGS'] = '-O2'
-    env['CFLAGS'] = '-O2'
+  env.add_build_hook do |builder|
-    env.add_build_hook do |builder|
+    builder.vars['CPPFLAGS'] = '-DSTRING="Hello"'
-      builder.vars['CPPFLAGS'] = '-DSTRING="Hello"'
-    end
-    env.add_post_build_hook do |builder|
-      $stdout.puts "post #{builder.target}"
-    end
-    env.Program('program.exe', Dir['src/*.c'])
   end
-
+  env.add_post_build_hook do |builder|
-  env2 = env1.clone do |env|
+    $stdout.puts "post #{builder.target}"
-    env.Program('program2.exe', Dir['src/*.c'])
   end
+  env.Program('program.exe', Dir['src/*.c'])
+end
+
+env2 = env1.clone do |env|
+  env.Program('program2.exe', Dir['src/*.c'])
 end

build_tests/configure/autoconf_fail.rb

@@ -1,3 +1,4 @@
 configure do
   check_c_compiler "nope.nope"
 end
+default

build_tests/configure/autoconf_false.rb

@@ -1 +1,3 @@
 autoconf false
+env do |env|
+end

build_tests/configure/autoconf_rebuild.rb

@@ -3,8 +3,6 @@ configure do
   check_c_header "stdio.h"
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.Program("simple.exe", "simple.c")
-    env.Program("simple.exe", "simple.c")
-  end
 end

build_tests/configure/check_c_compiler.rb

@@ -1,3 +1,4 @@
 configure do
   check_c_compiler
 end
+default

build_tests/configure/check_c_compiler_non_default.rb

@@ -0,0 +1,6 @@
+configure do
+  check_c_compiler "clang"
+end
+env do |env|
+  env.Program("simple.exe", "simple.c")
+end

build_tests/configure/check_c_compiler_use.rb

@@ -0,0 +1,12 @@
+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_c_header_cpppath.rb

@@ -0,0 +1,8 @@
+configure do
+  check_c_header "string.h", check_cpppath: ["./usr1"]
+  check_c_header "frobulous.h", check_cpppath: ["./usr2"]
+end
+
+env do |env|
+  env.Object("test.o", "test.c")
+end

build_tests/configure/check_c_header_no_fail_set_define.rb

@@ -1,9 +1,7 @@
 configure do
-  check_c_header "not___found.h", fail: false, set_define: "HAVE_NOT___FOUND_H"
+  check_c_header "not___found.h", set_define: "HAVE_NOT___FOUND_H"
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
-  end
 end

build_tests/configure/check_c_header_success_set_define.rb

@@ -2,8 +2,6 @@ configure do
   check_c_header "string.h", set_define: "HAVE_STRING_H"
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
-  end
 end

build_tests/configure/check_cfg.rb

@@ -2,8 +2,6 @@ configure do
   check_cfg program: "my-config"
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Program("myconfigtest", "simple.c")
-    env.Program("myconfigtest", "simple.c")
-  end
 end

build_tests/configure/check_cfg_package.rb

@@ -2,8 +2,6 @@ configure do
   check_cfg package: "mypackage"
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Program("myconfigtest", "simple.c")
-    env.Program("myconfigtest", "simple.c")
-  end
 end

build_tests/configure/check_cfg_use.rb

@@ -2,14 +2,12 @@ configure do
   check_cfg package: "mypackage", use: "myp"
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Copy("myconfigtest1.c", "simple.c")
-    env.Copy("myconfigtest1.c", "simple.c")
+  env.Program("myconfigtest1.exe", "myconfigtest1.c")
-    env.Program("myconfigtest1.exe", "myconfigtest1.c")
+end
-  end
+
-
+env(echo: :command, use: "myp") do |env|
-  Environment.new(echo: :command, use: "myp") do |env|
+  env.Copy("myconfigtest2.c", "simple.c")
-    env.Copy("myconfigtest2.c", "simple.c")
+  env.Program("myconfigtest2.exe", "myconfigtest2.c")
-    env.Program("myconfigtest2.exe", "myconfigtest2.c")
-  end
 end

build_tests/configure/check_cxx_compiler_use.rb

@@ -0,0 +1,12 @@
+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_cxx_header_cpppath.rb

@@ -0,0 +1,8 @@
+configure do
+  check_cxx_header "string.h", check_cpppath: ["./usr1"]
+  check_cxx_header "frobulous.h", check_cpppath: ["./usr2"]
+end
+
+env do |env|
+  env.Object("test.o", "test.cc")
+end

build_tests/configure/check_d_compiler_use.rb

@@ -0,0 +1,12 @@
+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/check_d_import_d_import_path.rb

@@ -0,0 +1,9 @@
+configure do
+  check_d_compiler
+  check_d_import "std.stdio", check_d_import_path: ["./usr1"]
+  check_d_import "frobulous", check_d_import_path: ["./usr2"]
+end
+
+env do |env|
+  env.Object("test.o", "test.d")
+end

build_tests/configure/check_d_import_success.rb

@@ -1,3 +1,4 @@
 configure do
+  check_d_compiler
   check_d_import "std.stdio"
 end

build_tests/configure/check_lib_libpath1.rb

@@ -0,0 +1,3 @@
+env(echo: :command) do |env|
+  env.Library("usr2/libfrobulous.a", "two.c")
+end

build_tests/configure/check_lib_libpath2.rb

@@ -0,0 +1,8 @@
+configure do
+  check_lib "m", check_libpath: ["./usr1"]
+  check_lib "frobulous", check_libpath: ["./usr2"]
+end
+
+env(echo: :command) do |env|
+  env.Program("simple.exe", "simple.c")
+end

build_tests/configure/check_lib_success.rb

@@ -2,8 +2,6 @@ configure do
   check_lib "m"
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Program("simple.exe", "simple.c")
-    env.Program("simple.exe", "simple.c")
-  end
 end

build_tests/configure/check_lib_use.rb

@@ -2,14 +2,12 @@ configure do
   check_lib "m", use: :m
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Copy("test1.c", "simple.c")
-    env.Copy("test1.c", "simple.c")
+  env.Program("test2.exe", "test1.c")
-    env.Program("test2.exe", "test1.c")
+end
-  end
+
-
+env(echo: :command, use: %w[m]) do |env|
-  Environment.new(echo: :command, use: %w[m]) do |env|
+  env.Copy("test2.c", "simple.c")
-    env.Copy("test2.c", "simple.c")
+  env.Program("test2.exe", "test2.c")
-    env.Program("test2.exe", "test2.c")
-  end
 end

build_tests/configure/check_lib_use_false.rb

@@ -2,9 +2,7 @@ configure do
   check_lib "m", use: false
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Copy("test1.c", "simple.c")
-    env.Copy("test1.c", "simple.c")
+  env.Program("test2.exe", "test1.c")
-    env.Program("test2.exe", "test1.c")
-  end
 end

build_tests/configure/configure_with_top_level_env.rb

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

build_tests/configure/custom_config_check.rb

@@ -0,0 +1,28 @@
+configure do
+  custom_check("Checking 'grep' version") do |op|
+    stdout, stderr, status = op.log_and_test_command(%w[grep --version])
+    should_fail = true
+    if status != 0
+      fail_message = "error executing grep"
+    elsif stdout =~ /^grep \(GNU grep\) 1\./
+      fail_message = "too old!"
+      status = 1
+    elsif stdout =~ /^grep \(GNU grep\) 2\./
+      fail_message = "we'll work with it but you should upgrade"
+      status = 1
+      should_fail = false
+      op.store_merge("CPPDEFINES" => "GREP_WORKAROUND")
+    else
+      op.store_append("CPPDEFINES" => "GREP_FULL")
+    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
+
+env do |env|
+  puts env["CPPDEFINES"]
+end

build_tests/configure/error_env_construction_before_configure.rb

@@ -1,3 +0,0 @@
-Environment.new do |env|
-  env.Object("simple.o", "simple.cc")
-end

build_tests/configure/multiple_set_define.rb

@@ -3,8 +3,6 @@ configure do
   check_c_header "stdio.h", set_define: "HAVE_STDIO_H"
 end
 
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
-  end
 end

build_tests/configure/no_configure_output.rb

@@ -0,0 +1,3 @@
+default do
+  puts "default"
+end

build_tests/configure/on_fail.rb

@@ -0,0 +1,5 @@
+configure do
+  check_c_compiler "foo123c", fail: false, on_fail: "Install the foo123 package"
+  check_d_compiler "foo123d", fail: false
+  check_cxx_compiler "foo123cxx", on_fail: lambda {puts "Install the foo123cxx package"}
+end

build_tests/configure/simple.cc

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

build_tests/configure/simple.d

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

build_tests/configure/two.c

@@ -0,0 +1,4 @@
+int two(void)
+{
+    return 42;
+}

build_tests/custom_builder/Rsconscript

@@ -9,10 +9,8 @@ EOF
   end
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(MySource)
-    env.add_builder(MySource)
+  env.MySource('inc.h', [])
-    env.MySource('inc.h', [])
+  env.Program('program.exe', Dir['*.c'])
-    env.Program('program.exe', Dir['*.c'])
-  end
 end

build_tests/custom_builder/build_after.rb

@@ -1,12 +1,11 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Command("inc.c",
-    env.Command("inc.c",
+              [],
-                [],
+              "CMD" => %w[ruby gen.rb ${_TARGET}],
-                "CMD" => %w[ruby gen.rb ${_TARGET}],
+              "CMD_DESC" => "Generating")
-                "CMD_DESC" => "Generating")
+  env["build_root"] = env.build_root
-    env["build_root"] = env.build_root
+  env["inc_c"] = "inc.c"
-    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/cvar_expansion.rb

@@ -9,12 +9,10 @@ EOF
   end
 end
 
-build do
+env = env do |env|
-  env = Environment.new do |env|
+  env["hdr"] = "inc.h"
-    env["hdr"] = "inc.h"
+  env["src"] = "program.c"
-    env["src"] = "program.c"
+  env.add_builder(MySource)
-    env.add_builder(MySource)
+  env.MySource('${hdr}')
-    env.MySource('${hdr}')
+  env.Program('program.exe', "${src}")
-    env.Program('program.exe', "${src}")
-  end
 end

build_tests/custom_builder/cvar_lambda.rb

@@ -9,22 +9,20 @@ EOF
   end
 end
 
-build do
+e1 = env do |env|
-  e1 = Environment.new do |env|
+  env.add_builder(MySource)
-    env.add_builder(MySource)
+  env["one"] = "5"
-    env["one"] = "5"
+  env[:cfg] = {val: "9"}
-    env[:cfg] = {val: "9"}
+  env["two"] = lambda do |args|
-    env["two"] = lambda do |args|
+    args[:env][:cfg][:val]
-      args[:env][:cfg][:val]
-    end
-    env["the_value"] = lambda do |args|
-      "${one}${two}78"
-    end
   end
-
+  env["the_value"] = lambda do |args|
-  e1.clone do |env|
+    "${one}${two}78"
-    env[:cfg][:val] = "6"
-    env.MySource('inc.h', [])
-    env.Program('program.exe', Dir['*.c'])
   end
 end
+
+e1.clone do |env|
+  env[:cfg][:val] = "6"
+  env.MySource('inc.h', [])
+  env.Program('program.exe', Dir['*.c'])
+end

build_tests/custom_builder/error_run_return_value.rb

@@ -1,8 +1,6 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(:MyBuilder) do |options|
-    env.add_builder(:MyBuilder) do |options|
+    "hi"
-      "hi"
-    end
-    env.MyBuilder("foo")
   end
+  env.MyBuilder("foo")
 end

build_tests/custom_builder/error_wait_for.rb

@@ -1,8 +1,6 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(:MyBuilder) do |options|
-    env.add_builder(:MyBuilder) do |options|
+    wait_for(1)
-      wait_for(1)
-    end
-    env.MyBuilder("foo")
   end
+  env.MyBuilder("foo")
 end

build_tests/custom_builder/multiple_targets.rb

@@ -12,10 +12,8 @@ class CHGen < Rscons::Builder
   end
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(CHGen)
-    env.add_builder(CHGen)
+  env.CHGen("inc.c", ["program.c"])
-    env.CHGen("inc.c", ["program.c"])
+  env.Program("program.exe", %w[program.c inc.c])
-    env.Program("program.exe", %w[program.c inc.c])
-  end
 end

build_tests/custom_builder/produces.rb

@@ -1,16 +1,15 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["build_root"] = env.build_root
-    env["build_root"] = env.build_root
+  env["inc_h"] = "inc.h"
-    env["inc_h"] = "inc.h"
 
-    env.Copy("copy_inc.h", "${inc_h}")
+  env.Copy("copy_inc.h", "${inc_h}")
-    env.depends("${build_root}/program.o", "${inc_h}")
+  env.depends("program.o", "${inc_h}")
-    env.Program("program.exe", ["program.c", "inc.c"])
+  env.Object("program.o", "program.c")
+  env.Program("program.exe", ["program.o", "inc.c"])
 
-    inc_c = env.Command("inc.c",
+  inc_c = env.Command("inc.c",
-                        [],
+                      [],
-                        "CMD" => %w[ruby gen.rb ${_TARGET}],
+                      "CMD" => %w[ruby gen.rb ${_TARGET}],
-                        "CMD_DESC" => "Generating")
+                      "CMD_DESC" => "Generating")
-    inc_c.produces("inc.h")
+  inc_c.produces("inc.h")
-  end
 end

build_tests/custom_builder/produces_env.rb

@@ -1,16 +1,15 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["build_root"] = env.build_root
-    env["build_root"] = env.build_root
+  env["inc_h"] = "inc.h"
-    env["inc_h"] = "inc.h"
 
-    env.Copy("copy_inc.h", "${inc_h}")
+  env.Copy("copy_inc.h", "${inc_h}")
-    env.depends("${build_root}/program.o", "${inc_h}")
+  env.depends("program.o", "${inc_h}")
-    env.Program("program.exe", ["program.c", "inc.c"])
+  env.Object("program.o", "program.c")
+  env.Program("program.exe", ["program.o", "inc.c"])
 
-    env.Command("inc.c",
+  env.Command("inc.c",
-                [],
+              [],
-                "CMD" => %w[ruby gen.rb ${_TARGET}],
+              "CMD" => %w[ruby gen.rb ${_TARGET}],
-                "CMD_DESC" => "Generating")
+              "CMD_DESC" => "Generating")
-    env.produces("inc.c", "inc.h")
+  env.produces("inc.c", "inc.h")
-  end
 end

build_tests/custom_builder/wait_for_thread.rb

@@ -13,9 +13,7 @@ class MyBuilder < Rscons::Builder
   end
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(MyBuilder)
-    env.add_builder(MyBuilder)
+  env.MyBuilder("foo")
-    env.MyBuilder("foo")
-  end
 end

build_tests/d/Rsconscript

@@ -1,5 +1,7 @@
-build do
+configure do
-  Environment.new(echo: :command) do |env|
+  check_d_compiler "gdc"
-    env.Program("hello-d.exe", glob("*.d"))
+end
-  end
+
+env(echo: :command) do |env|
+  env.Program("hello-d.exe", glob("*.d"))
 end

build_tests/d/build-ldc2.rb

@@ -0,0 +1,7 @@
+configure do
+  check_d_compiler "ldc2"
+end
+
+env(echo: :command) do |env|
+  env.Program("hello-d.exe", glob("*.d"))
+end

build_tests/d/link_objects.rb

@@ -1,7 +1,5 @@
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env.Object("main.o", "main.d")
-    env.Object("main.o", "main.d")
+  env.Object("mod.o", "mod.d")
-    env.Object("mod.o", "mod.d")
+  env.Program("hello-d.exe", ["main.o", "mod.o"])
-    env.Program("hello-d.exe", ["main.o", "mod.o"])
-  end
 end

build_tests/direct/c_program.rb

@@ -1,5 +1,3 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Program("test.exe", glob("*.c"), direct: true)
-    env.Program("test.exe", glob("*.c"), direct: true)
-  end
 end

build_tests/direct/c_shared_library.rb

@@ -1,7 +1,5 @@
-build do
+env do |env|
-  Environment.new do |env|
+  lib = env.SharedLibrary("mylib", ["two.c", "three.c"], direct: true)
-    lib = env.SharedLibrary("mylib", ["two.c", "three.c"], direct: true)
+  program = env.Program("test.exe", "main.c", "LIBS" => ["mylib"], "LIBPATH" => ["."])
-    program = env.Program("test.exe", "main.c", "LIBS" => ["mylib"], "LIBPATH" => ["."])
+  env.depends(program, lib)
-    env.depends(program, lib)
-  end
 end

build_tests/header/Rsconscript

@@ -1,5 +1,3 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Program('header.exe', Dir['*.c'])
-    env.Program('header.exe', Dir['*.c'])
-  end
 end

build_tests/json_to_yaml/Rsconscript

@@ -1,17 +1,16 @@
-build do
+env do |env|
-  Environment.new do |env|
+  require 'json'
-    require 'json'
+  require 'yaml'
-    require 'yaml'
+  env.add_builder(:JsonToYaml) do |params|
-    env.add_builder(:JsonToYaml) do |params|
+    unless @cache.up_to_date?(@target, :JsonToYaml, @sources, @env)
-      unless @cache.up_to_date?(@target, :JsonToYaml, @sources, @env)
+      print_run_message("JsonToYaml #{@target}", nil)
-        @cache.mkdir_p(File.dirname(@target))
+      @cache.mkdir_p(File.dirname(@target))
-        File.open(@target, 'w') do |f|
+      File.open(@target, 'w') do |f|
-          f.write(YAML.dump(JSON.load(IO.read(@sources.first))))
+        f.write(YAML.dump(JSON.load(IO.read(@sources.first))))
-        end
-        @cache.register_build(@target, :JsonToYaml, @sources, @env)
       end
-      true
+      @cache.register_build(@target, :JsonToYaml, @sources, @env)
     end
-    env.JsonToYaml('foo.yml', 'foo.json')
+    true
   end
+  env.JsonToYaml('foo.yml', 'foo.json')
 end

build_tests/library/Rsconscript

@@ -1,6 +1,7 @@
-build do
+env(echo: :command) do |env|
-  Environment.new(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")
-  end
+  env.depends("library.exe", "libmylib.a")
+  env.Library("libmylib.a", ["two.c", "three.c"], "CPPFLAGS" => ["-Dmake_lib"])
 end

build_tests/library/library_from_object.rb

@@ -1,7 +1,5 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Program("library.exe", ["lib.a", "three.c"])
-    env.Program("library.exe", ["lib.a", "three.c"])
+  env.Object("two.o", "two.c")
-    env.Object("two.o", "two.c")
+  env.Library("lib.a", ["one.c", "two.o"], 'CPPFLAGS' => ['-Dmake_lib'])
-    env.Library("lib.a", ["one.c", "two.o"], 'CPPFLAGS' => ['-Dmake_lib'])
-  end
 end

build_tests/library/one.c

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

build_tests/library/override_arcmd.rb

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

build_tests/library/three.c

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

build_tests/library/two.c

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

build_tests/multiple_basename/Rsconscript

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

build_tests/multiple_basename/foo.c

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

build_tests/multiple_basename/foo.cc

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

build_tests/preprocess/Rsconscript

@@ -1,5 +1,3 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Preprocess("pp", "foo.h")
-    env.Preprocess("pp", "foo.h")
-  end
 end

build_tests/shared_library/Rsconscript

@@ -1,13 +1,11 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["CPPPATH"] << "src/lib"
-    env["CPPPATH"] << "src/lib"
+  libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
-    libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
+  env.Program("test-shared.exe",
-    env.Program("test-shared.exe",
+              glob("src/*.c"),
-                glob("src/*.c"),
+              "LIBPATH" => %w[.],
-                "LIBPATH" => %w[.],
+              "LIBS" => %w[mine])
-                "LIBS" => %w[mine])
+  env.build_after("test-shared.exe", libmine)
-    env.build_after("test-shared.exe", libmine)
+  env.Program("test-static.exe",
-    env.Program("test-static.exe",
+              glob("src/**/*.c"))
-                glob("src/**/*.c"))
-  end
 end

build_tests/shared_library/error_unknown_suffix.rb

@@ -1,8 +1,6 @@
-build do
+env do |env|
-  Environment.new do |env|
+  File.open("foo.xyz", "wb") do |fh|
-    File.open("foo.xyz", "wb") do |fh|
+    fh.puts("hi")
-      fh.puts("hi")
-    end
-    env.SharedObject("foo.o", "foo.xyz")
   end
+  env.SharedObject("foo.o", "foo.xyz")
 end

build_tests/shared_library/shared_library_as.rb

@@ -1,7 +1,5 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["CPPPATH"] << "src/lib"
-    env["CPPPATH"] << "src/lib"
+  env.Object("file.S", "src/lib/one.c", "CFLAGS" => env["CFLAGS"] + ["-S"])
-    env.Object("file.S", "src/lib/one.c", "CFLAGS" => env["CFLAGS"] + ["-S"])
+  libmine = env.SharedLibrary("mine", "file.S")
-    libmine = env.SharedLibrary("mine", "file.S")
-  end
 end

build_tests/shared_library/shared_library_cxx.rb

@@ -1,13 +1,11 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["CPPPATH"] << "src/lib"
-    env["CPPPATH"] << "src/lib"
+  libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))
-    libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))
+  env.Program("test-shared.exe",
-    env.Program("test-shared.exe",
+              glob("src/*.cc"),
-                glob("src/*.cc"),
+              "LIBPATH" => %w[.],
-                "LIBPATH" => %w[.],
+              "LIBS" => %w[mine])
-                "LIBS" => %w[mine])
+  env.build_after("test-shared.exe", libmine)
-    env.build_after("test-shared.exe", libmine)
+  env.Program("test-static.exe",
-    env.Program("test-static.exe",
+              glob("src/**/*.cc"))
-                glob("src/**/*.cc"))
-  end
 end

build_tests/shared_library/shared_library_d.rb

@@ -1,11 +1,9 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["CPPPATH"] << "src/lib"
-    env["CPPPATH"] << "src/lib"
+  libmine = env.SharedLibrary("mine", glob("src/lib/*.d"))
-    libmine = env.SharedLibrary("mine", glob("src/lib/*.d"))
+  env.Program("test-shared.exe",
-    env.Program("test-shared.exe",
+              glob("src/*.c"),
-                glob("src/*.c"),
+              "LIBPATH" => %w[.],
-                "LIBPATH" => %w[.],
+              "LIBS" => %w[mine])
-                "LIBS" => %w[mine])
+  env.build_after("test-shared.exe", libmine)
-    env.build_after("test-shared.exe", libmine)
-  end
 end

build_tests/shared_library/shared_library_from_object.rb

@@ -1,7 +1,5 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["CPPPATH"] << "src/lib"
-    env["CPPPATH"] << "src/lib"
+  env.SharedObject("one.o", "src/lib/one.c")
-    env.SharedObject("one.o", "src/lib/one.c")
+  libmine = env.SharedLibrary("mine", ["one.o", "src/lib/two.c"])
-    libmine = env.SharedLibrary("mine", ["one.o", "src/lib/two.c"])
-  end
 end

build_tests/shared_library/shared_library_set_shld.rb

@@ -1,14 +1,12 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["CPPPATH"] << "src/lib"
-    env["CPPPATH"] << "src/lib"
+  env["SHLD"] = "gcc"
-    env["SHLD"] = "gcc"
+  libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
-    libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
+  env.Program("test-shared.exe",
-    env.Program("test-shared.exe",
+              glob("src/*.c"),
-                glob("src/*.c"),
+              "LIBPATH" => %w[.],
-                "LIBPATH" => %w[.],
+              "LIBS" => %w[mine])
-                "LIBS" => %w[mine])
+  env.build_after("test-shared.exe", libmine)
-    env.build_after("test-shared.exe", libmine)
+  env.Program("test-static.exe",
-    env.Program("test-static.exe",
+              glob("src/**/*.c"))
-                glob("src/**/*.c"))
-  end
 end

build_tests/simple/Rsconscript

@@ -1,5 +1,3 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Program('simple.exe', Dir['*.c'])
-    env.Program('simple.exe', Dir['*.c'])
-  end
 end

build_tests/simple/absolute_source_path.rb

@@ -1,15 +1,13 @@
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
-    tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
+  source_file = File.join(tempdir, "abs.c")
-    source_file = File.join(tempdir, "abs.c")
+  File.open(source_file, "w") do |fh|
-    File.open(source_file, "w") do |fh|
+    fh.puts(<<-EOF)
-      fh.puts(<<-EOF)
+    int main()
-      int main()
+    {
-      {
+      return 29;
-        return 29;
+    }
-      }
+    EOF
-      EOF
-    end
-    env.Program("abs.exe", source_file)
   end
+  env.Program("abs.exe", source_file)
 end

build_tests/simple/barrier.rb

@@ -10,15 +10,13 @@ class ThreadedTestBuilder < Rscons::Builder
   end
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(ThreadedTestBuilder)
-    env.add_builder(ThreadedTestBuilder)
+  env.ThreadedTestBuilder("T3", [], "delay" => 3)
-    env.ThreadedTestBuilder("T3", [], "delay" => 3)
+  env.ThreadedTestBuilder("T2", [], "delay" => 1.0)
-    env.ThreadedTestBuilder("T2", [], "delay" => 1.0)
+  env.ThreadedTestBuilder("T1", [], "delay" => 0.5)
-    env.ThreadedTestBuilder("T1", [], "delay" => 0.5)
+  env.barrier
-    env.barrier
+  env.ThreadedTestBuilder("T6", [], "delay" => 1.5)
-    env.ThreadedTestBuilder("T6", [], "delay" => 1.5)
+  env.ThreadedTestBuilder("T5", [], "delay" => 1.0)
-    env.ThreadedTestBuilder("T5", [], "delay" => 1.0)
+  env.ThreadedTestBuilder("T4", [], "delay" => 0.5)
-    env.ThreadedTestBuilder("T4", [], "delay" => 0.5)
-  end
 end

build_tests/simple/builder_as_source.rb

@@ -1,6 +1,4 @@
-build do
+env do |env|
-  Environment.new do |env|
+  object = env.Object("simple.o", "simple.c")
-    object = env.Object("simple.o", "simple.c")
+  env.Program("simple.exe", object)
-    env.Program("simple.exe", object)
-  end
 end

build_tests/simple/builder_no_sources.rb

@@ -3,9 +3,8 @@ class TestBuilder < Rscons::Builder
     true
   end
 end
-build do
+
-  Environment.new do |env|
+env do |env|
-    env.add_builder(TestBuilder)
+  env.add_builder(TestBuilder)
-    env.TestBuilder("file")
+  env.TestBuilder("file")
-  end
 end

build_tests/simple/builder_wait_for_builder.rb

@@ -14,10 +14,8 @@ class MyObject < Rscons::Builder
   end
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(MyObject)
-    env.add_builder(MyObject)
+  env.MyObject("simple.o", "simple.c")
-    env.MyObject("simple.o", "simple.c")
+  env.Program("simple.exe", "simple.o")
-    env.Program("simple.exe", "simple.o")
-  end
 end

build_tests/simple/cache_command_change.rb

@@ -1,6 +1,4 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["LIBS"] += ["m"]
-    env["LIBS"] += ["c"]
+  env.Program('simple.exe', Dir['*.c'])
-    env.Program('simple.exe', Dir['*.c'])
-  end
 end

build_tests/simple/cache_debugging.rb

@@ -4,17 +4,17 @@ class DebugBuilder < Rscons::Builder
       finalize_command
     else
       @command = %W[gcc -c -o #{@target} #{@sources.first}]
-      if Rscons.vars["command_change"]
+      if ENV["test"] == "command_change"
         @command += %w[-Wall]
       end
-      if Rscons.vars["new_dep"]
+      if ENV["test"] == "new_dep"
         @sources += ["extra"]
       end
-      if Rscons.vars["strict_deps1"]
+      if ENV["test"] == "strict_deps1"
         @sources += ["extra"]
         strict_deps = true
       end
-      if Rscons.vars["strict_deps2"]
+      if ENV["test"] == "strict_deps2"
         @sources = ["extra"] + @sources
         strict_deps = true
       end
@@ -27,12 +27,10 @@ class DebugBuilder < Rscons::Builder
   end
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(DebugBuilder)
-    env.add_builder(DebugBuilder)
+  if ENV["test"] == "new_user_dep"
-    if Rscons.vars["new_user_dep"]
+    env.depends("foo.o", "new_dep")
-      env.depends("foo.o", "new_dep")
-    end
-    env.DebugBuilder("foo.o", "simple.c")
   end
+  env.DebugBuilder("foo.o", "simple.c")
 end

build_tests/simple/cache_dep_checksum_change.rb

@@ -1,5 +1,3 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Copy("simple.copy", "simple.c")
-    env.Copy("simple.copy", "simple.c")
-  end
 end

build_tests/simple/cache_new_dep1.rb

@@ -1,8 +1,6 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
+  env.process
-    env.process
+  env["LDCMD"] = %w[gcc -o ${_TARGET} simple.o]
-    env["LDCMD"] = %w[gcc -o ${_TARGET} simple.o]
+  env.Program('simple.exe', [])
-    env.Program('simple.exe', [])
-  end
 end

build_tests/simple/cache_new_dep2.rb

@@ -1,7 +1,5 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
+  env["LDCMD"] = %w[gcc -o ${_TARGET} simple.o]
-    env["LDCMD"] = %w[gcc -o ${_TARGET} simple.o]
+  env.Program('simple.exe', ["simple.o"])
-    env.Program('simple.exe', ["simple.o"])
-  end
 end

build_tests/simple/cache_successful_builds_when_one_fails.rb

@@ -1,6 +1,4 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
+  env.Object("two.o", "two.c")
-    env.Object("two.o", "two.c")
-  end
 end

build_tests/simple/cache_user_dep.rb

@@ -1,7 +1,5 @@
-build do
+env do |env|
-  Environment.new do |env|
+  target = env.Program("simple.exe", "simple.c")
-    target = env.Program("simple.exe", "simple.c")
+  user_deps = File.read("user_deps", mode: "rb").split(" ")
-    user_deps = File.read("user_deps", mode: "rb").split(" ")
+  target.depends(*user_deps)
-    target.depends(*user_deps)
-  end
 end

build_tests/simple/cache_varset.rb

@@ -13,9 +13,7 @@ class TestBuilder < Rscons::Builder
   end
 end
 
-build do
+env do |env|
-  Environment.new do |env|
+  env.add_builder(TestBuilder)
-    env.add_builder(TestBuilder)
+  env.TestBuilder("foo")
-    env.TestBuilder("foo")
-  end
 end

build_tests/simple/clean.rb

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

build_tests/simple/clear_targets.rb

@@ -1,6 +1,4 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Program("simple.exe", "simple.c")
-    env.Program("simple.exe", "simple.c")
+  env.clear_targets
-    env.clear_targets
-  end
 end

build_tests/simple/clone_n_threads.rb

@@ -1,9 +1,7 @@
-build do
+base_env = env do |env|
-  base_env = Environment.new do |env|
+  env.n_threads = 165
-    env.n_threads = 165
+end
-  end
+
-
+my_env = base_env.clone do |env|
-  my_env = base_env.clone
+  puts env.n_threads
-
-  puts my_env.n_threads
 end

build_tests/simple/command.rb

@@ -1,6 +1,4 @@
-build do
+env(echo: :command) do |env|
-  Environment.new(echo: :command) do |env|
+  env["LD"] = "gcc"
-    env["LD"] = "gcc"
+  env.Program('simple.exe', Dir['*.c'])
-    env.Program('simple.exe', Dir['*.c'])
-  end
 end

build_tests/simple/command_builder.rb

@@ -1,9 +1,7 @@
-build do
+env do |env|
-  Environment.new do |env|
+  command = %W[gcc -o ${_TARGET} ${_SOURCES}]
-    command = %W[gcc -o ${_TARGET} ${_SOURCES}]
+  env.Command("simple.exe",
-    env.Command("simple.exe",
+              "simple.c",
-                "simple.c",
+              "CMD" => command,
-                "CMD" => command,
+              "CMD_DESC" => "BuildIt")
-                "CMD_DESC" => "BuildIt")
-  end
 end

build_tests/simple/command_redirect.rb

@@ -1,10 +1,8 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
+  env.Command("simple.txt",
-    env.Command("simple.txt",
+              "simple.o",
-                "simple.o",
+              "CMD" => %w[objdump --disassemble --source ${_SOURCES}],
-                "CMD" => %w[objdump --disassemble --source ${_SOURCES}],
+              "CMD_STDOUT" => "${_TARGET}",
-                "CMD_STDOUT" => "${_TARGET}",
+              "CMD_DESC" => "My Disassemble")
-                "CMD_DESC" => "My Disassemble")
-  end
 end

build_tests/simple/cvar_array.rb

@@ -1,6 +1,4 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env["sources"] = glob("*.c")
-    env["sources"] = glob("*.c")
+  env.Program("simple.exe", "${sources}")
-    env.Program("simple.exe", "${sources}")
-  end
 end

build_tests/simple/directory.rb

@@ -1,5 +1,3 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Directory("teh_dir")
-    env.Directory("teh_dir")
-  end
 end

build_tests/simple/disassemble.rb

@@ -1,6 +1,4 @@
-build do
+env do |env|
-  Environment.new do |env|
+  env.Object("simple.o", "simple.c")
-    env.Object("simple.o", "simple.c")
+  env.Disassemble("simple.txt", "simple.o")
-    env.Disassemble("simple.txt", "simple.o")
-  end
 end