v3.0.2

Document variants

CHANGELOG.md

@@ -1,3 +1,40 @@
+## 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
@@ -7,7 +44,7 @@
 
 ### Fixes
 
-- #121 - env.depends() does not work with built-root-relative "^/" paths
+- #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

Gemfile.lock

@@ -1,32 +1,38 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.1.5)
-    json (2.5.1)
+    json (2.6.1)
+    psych (4.0.3)
+      stringio
     rake (13.0.6)
-    rdoc (6.3.2)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
     redcarpet (3.5.1)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      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.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.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.26)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
@@ -43,4 +49,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.1.4
+   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

@@ -4,7 +4,39 @@
 
 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

@@ -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.example_string)
+  Rake::Task["spec"].execute(args)
   ENV.delete("dist_specs")
   FileUtils.rm_f(Dir.glob(".rscons-*"))
 end
@@ -76,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

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
-  Environment.new do |env|
+env do |env|
   env.CFile("lexer.c", "lexer.l")
   env.CFile("parser.c", "parser.y")
 end
-end

build_tests/cfile/error_unknown_extension.rb

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

build_tests/clone_env/Rsconscript

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

build_tests/clone_env/clone_all.rb

@@ -1,5 +1,4 @@
-build do
-  env1 = Environment.new(echo: :command) do |env|
+env1 = env(echo: :command) do |env|
   env['CFLAGS'] = '-O2'
   env.add_build_hook do |builder|
     builder.vars['CPPFLAGS'] = '-DSTRING="Hello"'
@@ -13,4 +12,3 @@ build do
 env2 = env1.clone do |env|
   env.Program('program2.exe', Dir['src/*.c'])
 end
-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
-  Environment.new do |env|
+env do |env|
   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

@@ -3,8 +3,6 @@ configure do
   check_c_header "frobulous.h", check_cpppath: ["./usr2"]
 end
 
-build do
-  Environment.new do |env|
+env do |env|
   env.Object("test.o", "test.c")
 end
-end

build_tests/configure/check_c_header_no_fail_set_define.rb

@@ -2,8 +2,6 @@ configure do
   check_c_header "not___found.h", set_define: "HAVE_NOT___FOUND_H"
 end
 
-build do
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   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
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   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
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   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
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   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
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   env.Copy("myconfigtest1.c", "simple.c")
   env.Program("myconfigtest1.exe", "myconfigtest1.c")
 end
 
-  Environment.new(echo: :command, use: "myp") do |env|
+env(echo: :command, use: "myp") do |env|
   env.Copy("myconfigtest2.c", "simple.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

@@ -3,8 +3,6 @@ configure do
   check_cxx_header "frobulous.h", check_cpppath: ["./usr2"]
 end
 
-build do
-  Environment.new do |env|
+env do |env|
   env.Object("test.o", "test.cc")
 end
-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

@@ -4,8 +4,6 @@ configure do
   check_d_import "frobulous", check_d_import_path: ["./usr2"]
 end
 
-build do
-  Environment.new do |env|
+env do |env|
   env.Object("test.o", "test.d")
 end
-end

build_tests/configure/check_lib_libpath1.rb

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

build_tests/configure/check_lib_libpath2.rb

@@ -3,8 +3,6 @@ configure do
   check_lib "frobulous", check_libpath: ["./usr2"]
 end
 
-build do
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   env.Program("simple.exe", "simple.c")
 end
-end

build_tests/configure/check_lib_success.rb

@@ -2,8 +2,6 @@ configure do
   check_lib "m"
 end
 
-build do
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   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
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   env.Copy("test1.c", "simple.c")
   env.Program("test2.exe", "test1.c")
 end
 
-  Environment.new(echo: :command, use: %w[m]) do |env|
+env(echo: :command, use: %w[m]) do |env|
   env.Copy("test2.c", "simple.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
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   env.Copy("test1.c", "simple.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

@@ -23,8 +23,6 @@ configure do
   end
 end
 
-build do
-  Environment.new do |env|
+env do |env|
   puts env["CPPDEFINES"]
 end
-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
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   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/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/custom_builder/Rsconscript

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

build_tests/custom_builder/build_after.rb

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env.Command("inc.c",
               [],
               "CMD" => %w[ruby gen.rb ${_TARGET}],
@@ -10,4 +9,3 @@ build do
   env.build_after("program.o", "${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 = Environment.new do |env|
+env = env do |env|
   env["hdr"] = "inc.h"
   env["src"] = "program.c"
   env.add_builder(MySource)
   env.MySource('${hdr}')
   env.Program('program.exe', "${src}")
 end
-end

build_tests/custom_builder/cvar_lambda.rb

@@ -9,8 +9,7 @@ EOF
   end
 end
 
-build do
-  e1 = Environment.new do |env|
+e1 = env do |env|
   env.add_builder(MySource)
   env["one"] = "5"
   env[:cfg] = {val: "9"}
@@ -27,4 +26,3 @@ build do
   env.MySource('inc.h', [])
   env.Program('program.exe', Dir['*.c'])
 end
-end

build_tests/custom_builder/error_run_return_value.rb

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

build_tests/custom_builder/error_wait_for.rb

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

build_tests/custom_builder/multiple_targets.rb

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

build_tests/custom_builder/produces.rb

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env["build_root"] = env.build_root
   env["inc_h"] = "inc.h"
 
@@ -14,4 +13,3 @@ build do
                       "CMD_DESC" => "Generating")
   inc_c.produces("inc.h")
 end
-end

build_tests/custom_builder/produces_env.rb

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env["build_root"] = env.build_root
   env["inc_h"] = "inc.h"
 
@@ -14,4 +13,3 @@ build do
               "CMD_DESC" => "Generating")
   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
-  Environment.new do |env|
+env do |env|
   env.add_builder(MyBuilder)
   env.MyBuilder("foo")
 end
-end

build_tests/d/Rsconscript

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

build_tests/d/build-ldc2.rb

@@ -2,8 +2,6 @@ configure do
   check_d_compiler "ldc2"
 end
 
-build do
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   env.Program("hello-d.exe", glob("*.d"))
 end
-end

build_tests/d/link_objects.rb

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

build_tests/direct/c_program.rb

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

build_tests/direct/c_shared_library.rb

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

build_tests/header/Rsconscript

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

build_tests/json_to_yaml/Rsconscript

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   require 'json'
   require 'yaml'
   env.add_builder(:JsonToYaml) do |params|
@@ -15,4 +14,3 @@ build do
   end
   env.JsonToYaml('foo.yml', 'foo.json')
 end
-end

build_tests/library/Rsconscript

@@ -1,6 +1,7 @@
-build do
-  Environment.new(echo: :command) do |env|
-    env.Program('library.exe', ['lib.a', 'three.c'])
-    env.Library("lib.a", ['one.c', 'two.c'], 'CPPFLAGS' => ['-Dmake_lib'])
-  end
+env(echo: :command) do |env|
+  env["LIBS"] << "mylib"
+  env["LIBPATH"] << "."
+  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/library_from_object.rb

@@ -1,7 +1,5 @@
-build do
-  Environment.new do |env|
+env do |env|
   env.Program("library.exe", ["lib.a", "three.c"])
   env.Object("two.o", "two.c")
   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
-  Environment.new(echo: :command) do |env|
-    env["ARCMD"] = %w[ar rcf ${_TARGET} ${_SOURCES}]
+env(echo: :command) do |env|
+  env["ARCMD"] = %w[ar rc ${_TARGET} ${_SOURCES}]
   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

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

build_tests/preprocess/Rsconscript

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

build_tests/shared_library/Rsconscript

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env["CPPPATH"] << "src/lib"
   libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
   env.Program("test-shared.exe",
@@ -10,4 +9,3 @@ build do
   env.Program("test-static.exe",
               glob("src/**/*.c"))
 end
-end

build_tests/shared_library/error_unknown_suffix.rb

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

build_tests/shared_library/shared_library_as.rb

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

build_tests/shared_library/shared_library_cxx.rb

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env["CPPPATH"] << "src/lib"
   libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))
   env.Program("test-shared.exe",
@@ -10,4 +9,3 @@ build do
   env.Program("test-static.exe",
               glob("src/**/*.cc"))
 end
-end

build_tests/shared_library/shared_library_d.rb

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

build_tests/shared_library/shared_library_from_object.rb

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

build_tests/shared_library/shared_library_set_shld.rb

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env["CPPPATH"] << "src/lib"
   env["SHLD"] = "gcc"
   libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))
@@ -11,4 +10,3 @@ build do
   env.Program("test-static.exe",
               glob("src/**/*.c"))
 end
-end

build_tests/simple/Rsconscript

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

build_tests/simple/absolute_source_path.rb

@@ -1,5 +1,4 @@
-build do
-  Environment.new(echo: :command) do |env|
+env(echo: :command) do |env|
   tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
   source_file = File.join(tempdir, "abs.c")
   File.open(source_file, "w") do |fh|
@@ -12,4 +11,3 @@ build do
   end
   env.Program("abs.exe", source_file)
 end
-end

build_tests/simple/barrier.rb

@@ -10,8 +10,7 @@ class ThreadedTestBuilder < Rscons::Builder
   end
 end
 
-build do
-  Environment.new do |env|
+env do |env|
   env.add_builder(ThreadedTestBuilder)
   env.ThreadedTestBuilder("T3", [], "delay" => 3)
   env.ThreadedTestBuilder("T2", [], "delay" => 1.0)
@@ -21,4 +20,3 @@ build do
   env.ThreadedTestBuilder("T5", [], "delay" => 1.0)
   env.ThreadedTestBuilder("T4", [], "delay" => 0.5)
 end
-end

build_tests/simple/builder_as_source.rb

@@ -1,6 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   object = env.Object("simple.o", "simple.c")
   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.TestBuilder("file")
 end
-end

build_tests/simple/builder_wait_for_builder.rb

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

build_tests/simple/cache_command_change.rb

@@ -1,6 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env["LIBS"] += ["m"]
   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
-  Environment.new do |env|
+env do |env|
   env.add_builder(DebugBuilder)
-    if Rscons.vars["new_user_dep"]
+  if ENV["test"] == "new_user_dep"
     env.depends("foo.o", "new_dep")
   end
   env.DebugBuilder("foo.o", "simple.c")
 end
-end

build_tests/simple/cache_dep_checksum_change.rb

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

build_tests/simple/cache_new_dep1.rb

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

build_tests/simple/cache_new_dep2.rb

@@ -1,7 +1,5 @@
-build do
-  Environment.new do |env|
+env do |env|
   env.Object("simple.o", "simple.c")
   env["LDCMD"] = %w[gcc -o ${_TARGET} 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
-  Environment.new do |env|
+env do |env|
   env.Object("simple.o", "simple.c")
   env.Object("two.o", "two.c")
 end
-end

build_tests/simple/cache_user_dep.rb

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

build_tests/simple/cache_varset.rb

@@ -13,9 +13,7 @@ class TestBuilder < Rscons::Builder
   end
 end
 
-build do
-  Environment.new do |env|
+env do |env|
   env.add_builder(TestBuilder)
   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
-  Environment.new do |env|
+env do |env|
   env.Program("simple.exe", "simple.c")
   env.clear_targets
 end
-end

build_tests/simple/clone_n_threads.rb

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

build_tests/simple/command.rb

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

build_tests/simple/command_builder.rb

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

build_tests/simple/command_redirect.rb

@@ -1,5 +1,4 @@
-build do
-  Environment.new do |env|
+env do |env|
   env.Object("simple.o", "simple.c")
   env.Command("simple.txt",
               "simple.o",
@@ -7,4 +6,3 @@ build do
               "CMD_STDOUT" => "${_TARGET}",
               "CMD_DESC" => "My Disassemble")
 end
-end

build_tests/simple/cvar_array.rb

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

build_tests/simple/directory.rb

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

build_tests/simple/disassemble.rb

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

build_tests/simple/distclean.rb

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

build_tests/simple/dump.rb

@@ -1,5 +1,5 @@
-build do
-  env = Environment.new do |env|
+default do
+  env = env do |env|
     env["CFLAGS"] += %w[-O2 -fomit-frame-pointer]
     env[:foo] = :bar
   end

build_tests/simple/env_in_task.rb

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

build_tests/simple/error_circular_dependency.rb

@@ -1,7 +1,5 @@
-build do
-  Environment.new do |env|
+env do |env|
   env.Command("foo", "bar")
   env.Command("bar", "baz")
   env.Command("baz", "foo")
 end
-end

build_tests/simple/error_circular_dependency2.rb

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

build_tests/simple/error_produces_nonexistent_target.rb

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

build_tests/simple/error_unknown_suffix.rb

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