wip

build_tests/cfile/Rsconscript

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

build_tests/cfile/error_unknown_extension.rb

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

build_tests/clone_env/Rsconscript

@@ -1,10 +1,12 @@
-debug = env(echo: :command) do |env|
+default do
-  env['CFLAGS'] = '-O2'
+  debug = Environment.new(echo: :command) do |env|
-  env['CPPFLAGS'] = '-DSTRING="Debug Version"'
+    env['CFLAGS'] = '-O2'
-  env.Program('program-debug.exe', Dir['src/*.c'])
+    env['CPPFLAGS'] = '-DSTRING="Debug Version"'
-end
+    env.Program('program-debug.exe', Dir['src/*.c'])
+  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,14 +1,16 @@
-env1 = env(echo: :command) do |env|
+default do
-  env['CFLAGS'] = '-O2'
+  env1 = Environment.new(echo: :command) do |env|
-  env.add_build_hook do |builder|
+    env['CFLAGS'] = '-O2'
-    builder.vars['CPPFLAGS'] = '-DSTRING="Hello"'
+    env.add_build_hook do |builder|
+      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|
-    $stdout.puts "post #{builder.target}"
-  end
-  env.Program('program.exe', Dir['src/*.c'])
-end
 
-env2 = env1.clone do |env|
+  env2 = env1.clone do |env|
-  env.Program('program2.exe', Dir['src/*.c'])
+    env.Program('program2.exe', Dir['src/*.c'])
+  end
 end

build_tests/configure/autoconf_false.rb

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

build_tests/configure/autoconf_rebuild.rb

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

build_tests/configure/check_c_compiler_non_default.rb

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

build_tests/configure/check_c_header_cpppath.rb

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

build_tests/configure/check_c_header_no_fail_set_define.rb

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

build_tests/configure/check_c_header_success_set_define.rb

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

build_tests/configure/check_cfg.rb

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

build_tests/configure/check_cfg_package.rb

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

build_tests/configure/check_cfg_use.rb

@@ -2,12 +2,14 @@ configure do
   check_cfg package: "mypackage", use: "myp"
 end
 
-env(echo: :command) do |env|
+default do
-  env.Copy("myconfigtest1.c", "simple.c")
+  Environment.new(echo: :command) do |env|
-  env.Program("myconfigtest1.exe", "myconfigtest1.c")
+    env.Copy("myconfigtest1.c", "simple.c")
-end
+    env.Program("myconfigtest1.exe", "myconfigtest1.c")
+  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_header_cpppath.rb

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

build_tests/configure/check_d_import_d_import_path.rb

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

build_tests/configure/check_lib_libpath1.rb

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

build_tests/configure/check_lib_libpath2.rb

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

build_tests/configure/check_lib_success.rb

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

build_tests/configure/check_lib_use.rb

@@ -2,12 +2,14 @@ configure do
   check_lib "m", use: :m
 end
 
-env(echo: :command) do |env|
+default do
-  env.Copy("test1.c", "simple.c")
+  Environment.new(echo: :command) do |env|
-  env.Program("test2.exe", "test1.c")
+    env.Copy("test1.c", "simple.c")
-end
+    env.Program("test2.exe", "test1.c")
+  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,7 +2,9 @@ configure do
   check_lib "m", use: false
 end
 
-env(echo: :command) do |env|
+default do
-  env.Copy("test1.c", "simple.c")
+  Environment.new(echo: :command) do |env|
-  env.Program("test2.exe", "test1.c")
+    env.Copy("test1.c", "simple.c")
+    env.Program("test2.exe", "test1.c")
+  end
 end

build_tests/configure/custom_config_check.rb

@@ -23,6 +23,8 @@ configure do
   end
 end
 
-env do |env|
+default do
-  puts env["CPPDEFINES"]
+  Environment.new do |env|
+    puts env["CPPDEFINES"]
+  end
 end

build_tests/configure/multiple_set_define.rb

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

build_tests/configure/no_configure_output.rb

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

build_tests/custom_builder/Rsconscript

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

build_tests/custom_builder/build_after.rb

@@ -1,11 +1,13 @@
-env do |env|
+default do
-  env.Command("inc.c",
+  Environment.new do |env|
-              [],
+    env.Command("inc.c",
-              "CMD" => %w[ruby gen.rb ${_TARGET}],
+                [],
-              "CMD_DESC" => "Generating")
+                "CMD" => %w[ruby gen.rb ${_TARGET}],
-  env["build_root"] = env.build_root
+                "CMD_DESC" => "Generating")
-  env["inc_c"] = "inc.c"
+    env["build_root"] = env.build_root
-  env.Object("program.o", "program.c")
+    env["inc_c"] = "inc.c"
-  env.build_after("program.o", "${inc_c}")
+    env.Object("program.o", "program.c")
-  env.Program("program.exe", ["program.o", "inc.c"])
+    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,10 +9,12 @@ EOF
   end
 end
 
-env = env do |env|
+default do
-  env["hdr"] = "inc.h"
+  env = Environment.new do |env|
-  env["src"] = "program.c"
+    env["hdr"] = "inc.h"
-  env.add_builder(MySource)
+    env["src"] = "program.c"
-  env.MySource('${hdr}')
+    env.add_builder(MySource)
-  env.Program('program.exe', "${src}")
+    env.MySource('${hdr}')
+    env.Program('program.exe', "${src}")
+  end
 end

build_tests/custom_builder/cvar_lambda.rb

@@ -9,20 +9,22 @@ EOF
   end
 end
 
-e1 = env do |env|
+default do
-  env.add_builder(MySource)
+  e1 = Environment.new do |env|
-  env["one"] = "5"
+    env.add_builder(MySource)
-  env[:cfg] = {val: "9"}
+    env["one"] = "5"
-  env["two"] = lambda do |args|
+    env[:cfg] = {val: "9"}
-    args[:env][:cfg][:val]
+    env["two"] = lambda do |args|
+      args[:env][:cfg][:val]
+    end
+    env["the_value"] = lambda do |args|
+      "${one}${two}78"
+    end
   end
-  env["the_value"] = lambda do |args|
-    "${one}${two}78"
-  end
-end
 
-e1.clone do |env|
+  e1.clone do |env|
-  env[:cfg][:val] = "6"
+    env[:cfg][:val] = "6"
-  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/error_run_return_value.rb

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

build_tests/custom_builder/error_wait_for.rb

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

build_tests/custom_builder/multiple_targets.rb

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

build_tests/custom_builder/produces.rb

@@ -1,15 +1,17 @@
-env do |env|
+default do
-  env["build_root"] = env.build_root
+  Environment.new do |env|
-  env["inc_h"] = "inc.h"
+    env["build_root"] = env.build_root
+    env["inc_h"] = "inc.h"
 
-  env.Copy("copy_inc.h", "${inc_h}")
+    env.Copy("copy_inc.h", "${inc_h}")
-  env.depends("program.o", "${inc_h}")
+    env.depends("program.o", "${inc_h}")
-  env.Object("program.o", "program.c")
+    env.Object("program.o", "program.c")
-  env.Program("program.exe", ["program.o", "inc.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,15 +1,17 @@
-env do |env|
+default do
-  env["build_root"] = env.build_root
+  Environment.new do |env|
-  env["inc_h"] = "inc.h"
+    env["build_root"] = env.build_root
+    env["inc_h"] = "inc.h"
 
-  env.Copy("copy_inc.h", "${inc_h}")
+    env.Copy("copy_inc.h", "${inc_h}")
-  env.depends("program.o", "${inc_h}")
+    env.depends("program.o", "${inc_h}")
-  env.Object("program.o", "program.c")
+    env.Object("program.o", "program.c")
-  env.Program("program.exe", ["program.o", "inc.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,7 +13,9 @@ class MyBuilder < Rscons::Builder
   end
 end
 
-env do |env|
+default do
-  env.add_builder(MyBuilder)
+  Environment.new do |env|
-  env.MyBuilder("foo")
+    env.add_builder(MyBuilder)
+    env.MyBuilder("foo")
+  end
 end

build_tests/d/Rsconscript

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

build_tests/d/build-ldc2.rb

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

build_tests/d/link_objects.rb

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

build_tests/direct/c_program.rb

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

build_tests/direct/c_shared_library.rb

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

build_tests/header/Rsconscript

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

build_tests/json_to_yaml/Rsconscript

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

build_tests/library/Rsconscript

@@ -1,4 +1,6 @@
-env(echo: :command) do |env|
+default do
-  env.Program('library.exe', ['lib.a', 'three.c'])
+  Environment.new(echo: :command) do |env|
-  env.Library("lib.a", ['one.c', 'two.c'], 'CPPFLAGS' => ['-Dmake_lib'])
+    env.Program('library.exe', ['lib.a', 'three.c'])
+    env.Library("lib.a", ['one.c', 'two.c'], 'CPPFLAGS' => ['-Dmake_lib'])
+  end
 end

build_tests/library/library_from_object.rb

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

build_tests/library/override_arcmd.rb

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

build_tests/multiple_basename/Rsconscript

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

build_tests/preprocess/Rsconscript

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

build_tests/shared_library/Rsconscript

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

build_tests/shared_library/error_unknown_suffix.rb

@@ -1,6 +1,8 @@
-env do |env|
+default do
-  File.open("foo.xyz", "wb") do |fh|
+  Environment.new do |env|
-    fh.puts("hi")
+    File.open("foo.xyz", "wb") do |fh|
+      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,5 +1,7 @@
-env do |env|
+default do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  env.Object("file.S", "src/lib/one.c", "CFLAGS" => env["CFLAGS"] + ["-S"])
+    env["CPPPATH"] << "src/lib"
-  libmine = env.SharedLibrary("mine", "file.S")
+    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,11 +1,13 @@
-env do |env|
+default do
-  env["CPPPATH"] << "src/lib"
+  Environment.new do |env|
-  libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))
+    env["CPPPATH"] << "src/lib"
-  env.Program("test-shared.exe",
+    libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))
-              glob("src/*.cc"),
+    env.Program("test-shared.exe",
-              "LIBPATH" => %w[.],
+                glob("src/*.cc"),
-              "LIBS" => %w[mine])
+                "LIBPATH" => %w[.],
-  env.build_after("test-shared.exe", libmine)
+                "LIBS" => %w[mine])
-  env.Program("test-static.exe",
+    env.build_after("test-shared.exe", libmine)
-              glob("src/**/*.cc"))
+    env.Program("test-static.exe",
+                glob("src/**/*.cc"))
+  end
 end

build_tests/shared_library/shared_library_d.rb

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

build_tests/shared_library/shared_library_from_object.rb

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

build_tests/simple/Rsconscript

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

build_tests/simple/absolute_source_path.rb

@@ -1,13 +1,15 @@
-env(echo: :command) do |env|
+default do
-  tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
+  Environment.new(echo: :command) do |env|
-  source_file = File.join(tempdir, "abs.c")
+    tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
-  File.open(source_file, "w") do |fh|
+    source_file = File.join(tempdir, "abs.c")
-    fh.puts(<<-EOF)
+    File.open(source_file, "w") do |fh|
-    int main()
+      fh.puts(<<-EOF)
-    {
+      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,13 +10,15 @@ class ThreadedTestBuilder < Rscons::Builder
   end
 end
 
-env do |env|
+default do
-  env.add_builder(ThreadedTestBuilder)
+  Environment.new do |env|
-  env.ThreadedTestBuilder("T3", [], "delay" => 3)
+    env.add_builder(ThreadedTestBuilder)
-  env.ThreadedTestBuilder("T2", [], "delay" => 1.0)
+    env.ThreadedTestBuilder("T3", [], "delay" => 3)
-  env.ThreadedTestBuilder("T1", [], "delay" => 0.5)
+    env.ThreadedTestBuilder("T2", [], "delay" => 1.0)
-  env.barrier
+    env.ThreadedTestBuilder("T1", [], "delay" => 0.5)
-  env.ThreadedTestBuilder("T6", [], "delay" => 1.5)
+    env.barrier
-  env.ThreadedTestBuilder("T5", [], "delay" => 1.0)
+    env.ThreadedTestBuilder("T6", [], "delay" => 1.5)
-  env.ThreadedTestBuilder("T4", [], "delay" => 0.5)
+    env.ThreadedTestBuilder("T5", [], "delay" => 1.0)
+    env.ThreadedTestBuilder("T4", [], "delay" => 0.5)
+  end
 end

build_tests/simple/builder_as_source.rb

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

build_tests/simple/builder_no_sources.rb

@@ -3,8 +3,9 @@ class TestBuilder < Rscons::Builder
     true
   end
 end
-
+default do
-env do |env|
+  Environment.new 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,8 +14,10 @@ class MyObject < Rscons::Builder
   end
 end
 
-env do |env|
+default do
-  env.add_builder(MyObject)
+  Environment.new do |env|
-  env.MyObject("simple.o", "simple.c")
+    env.add_builder(MyObject)
-  env.Program("simple.exe", "simple.o")
+    env.MyObject("simple.o", "simple.c")
+    env.Program("simple.exe", "simple.o")
+  end
 end

build_tests/simple/cache_command_change.rb

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

build_tests/simple/cache_debugging.rb

@@ -27,10 +27,12 @@ class DebugBuilder < Rscons::Builder
   end
 end
 
-env do |env|
+default do
-  env.add_builder(DebugBuilder)
+  Environment.new do |env|
-  if ENV["test"] == "new_user_dep"
+    env.add_builder(DebugBuilder)
-    env.depends("foo.o", "new_dep")
+    if ENV["test"] == "new_user_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,3 +1,5 @@
-env do |env|
+default do
-  env.Copy("simple.copy", "simple.c")
+  Environment.new do |env|
+    env.Copy("simple.copy", "simple.c")
+  end
 end

build_tests/simple/cache_new_dep1.rb

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

build_tests/simple/cache_new_dep2.rb

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

build_tests/simple/cache_user_dep.rb

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

build_tests/simple/cache_varset.rb

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

build_tests/simple/clear_targets.rb

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

build_tests/simple/clone_n_threads.rb

@@ -1,7 +1,9 @@
-base_env = env do |env|
+default do
-  env.n_threads = 165
+  base_env = Environment.new do |env|
-end
+    env.n_threads = 165
+  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,4 +1,6 @@
-env(echo: :command) do |env|
+default do
-  env["LD"] = "gcc"
+  Environment.new(echo: :command) do |env|
-  env.Program('simple.exe', Dir['*.c'])
+    env["LD"] = "gcc"
+    env.Program('simple.exe', Dir['*.c'])
+  end
 end

build_tests/simple/command_builder.rb

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

build_tests/simple/command_redirect.rb

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

build_tests/simple/cvar_array.rb

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

build_tests/simple/directory.rb

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

build_tests/simple/disassemble.rb

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

build_tests/simple/distclean.rb

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

build_tests/simple/dump.rb

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

build_tests/simple/error_circular_dependency.rb

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

build_tests/simple/error_circular_dependency2.rb

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

build_tests/simple/error_produces_nonexistent_target.rb

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

build_tests/simple/error_unknown_suffix.rb

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

build_tests/simple/link_flag_change.rb

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

build_tests/simple/override_cccmd.rb

@@ -1,4 +1,6 @@
-env(echo: :command) do |env|
+default do
-  env.Object("simple.o", "simple.c",
+  Environment.new(echo: :command) do |env|
-             "CCCMD" => %w[${CC} -c -o ${_TARGET} -Dfoobar ${_SOURCES}])
+    env.Object("simple.o", "simple.c",
+               "CCCMD" => %w[${CC} -c -o ${_TARGET} -Dfoobar ${_SOURCES}])
+  end
 end

build_tests/simple/override_depfilesuffix.rb

@@ -1,4 +1,6 @@
-env(echo: :command) do |env|
+default do
-  env["DEPFILESUFFIX"] = ".deppy"
+  Environment.new(echo: :command) do |env|
-  env.Object("simple.o", "simple.c")
+    env["DEPFILESUFFIX"] = ".deppy"
+    env.Object("simple.o", "simple.c")
+  end
 end

build_tests/simple/pathing.rb

@@ -1,8 +1,10 @@
 path_prepend "path_prepend"
 path_append "path_append"
 
-env do |env|
+default do
-  system("flex")
+  Environment.new do |env|
-  system("foobar")
+    system("flex")
-  env.Object("simple.o", "simple.c")
+    system("foobar")
+    env.Object("simple.o", "simple.c")
+  end
 end

build_tests/simple/phony_target.rb

@@ -1,11 +1,13 @@
-env do |env|
+default do
-  env.add_builder(:Checker) do |params|
+  Environment.new do |env|
-    unless @cache.up_to_date?(@target, :Checker, @sources, @env)
+    env.add_builder(:Checker) do |params|
-      puts "Checker #{@sources.first}" if @env.echo != :off
+      unless @cache.up_to_date?(@target, :Checker, @sources, @env)
-      @cache.register_build(@target, :Checker, @sources, @env)
+        puts "Checker #{@sources.first}" if @env.echo != :off
+        @cache.register_build(@target, :Checker, @sources, @env)
+      end
+      true
     end
-    true
+    env.Program("simple.exe", "simple.c")
+    env.Checker(:checker, "simple.exe")
   end
-  env.Program("simple.exe", "simple.c")
-  env.Checker(:checker, "simple.exe")
 end

build_tests/simple/preprocess.rb

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

build_tests/simple/progsuffix.rb

@@ -1,4 +1,6 @@
-env do |env|
+default do
-  env["PROGSUFFIX"] = ".out"
+  Environment.new do |env|
-  env.Program("simple", Dir["*.c"])
+    env["PROGSUFFIX"] = ".out"
+    env.Program("simple", Dir["*.c"])
+  end
 end

build_tests/simple/progsuffix2.rb

@@ -1,4 +1,6 @@
-env do |env|
+default do
-  env["MYSUFFIX"] = ".out"
+  Environment.new do |env|
-  env.Program("simple${MYSUFFIX}", Dir["*.c"])
+    env["MYSUFFIX"] = ".out"
+    env.Program("simple${MYSUFFIX}", Dir["*.c"])
+  end
 end

build_tests/simple/progsuffix3.rb

@@ -1,3 +1,5 @@
-env do |env|
+default do
-  env.Program("simple", Dir["*.c"], "PROGSUFFIX" => ".xyz")
+  Environment.new do |env|
+    env.Program("simple", Dir["*.c"], "PROGSUFFIX" => ".xyz")
+  end
 end

build_tests/simple/register_target_in_build_hook.rb

@@ -1,8 +1,10 @@
-env do |env|
+default do
-  env.Program("simple.exe", Dir["*.c"])
+  Environment.new do |env|
-  env.add_build_hook do |builder|
+    env.Program("simple.exe", Dir["*.c"])
-    if builder.target.end_with?(".o")
+    env.add_build_hook do |builder|
-      env.Disassemble("#{builder.target}.txt", builder.target)
+      if builder.target.end_with?(".o")
+        env.Disassemble("#{builder.target}.txt", builder.target)
+      end
     end
   end
 end

build_tests/simple/size.rb

@@ -1,4 +1,6 @@
-env do |env|
+default do
-  env.Program("simple.exe", glob("*.c"))
+  Environment.new do |env|
-  env.Size("simple.size", "simple.exe")
+    env.Program("simple.exe", glob("*.c"))
+    env.Size("simple.size", "simple.exe")
+  end
 end

build_tests/simple/threading.rb

@@ -17,11 +17,13 @@ class NonThreadedTestBuilder < Rscons::Builder
   end
 end
 
-env do |env|
+default do
-  env.add_builder(ThreadedTestBuilder)
+  Environment.new do |env|
-  env.add_builder(NonThreadedTestBuilder)
+    env.add_builder(ThreadedTestBuilder)
-  env.ThreadedTestBuilder("a")
+    env.add_builder(NonThreadedTestBuilder)
-  env.ThreadedTestBuilder("b")
+    env.ThreadedTestBuilder("a")
-  env.ThreadedTestBuilder("c")
+    env.ThreadedTestBuilder("b")
-  env.NonThreadedTestBuilder("d")
+    env.ThreadedTestBuilder("c")
+    env.NonThreadedTestBuilder("d")
+  end
 end

build_tests/simple/user_dep_build_order.rb

@@ -13,9 +13,11 @@ class TestBuilder < Rscons::Builder
   end
 end
 
-env do |env|
+default do
-  env.add_builder(TestBuilder)
+  Environment.new do |env|
-  one = env.TestBuilder("one", [], "wait_time" => "3")
+    env.add_builder(TestBuilder)
-  two = env.TestBuilder("two", [], "wait_time" => "0")
+    one = env.TestBuilder("one", [], "wait_time" => "3")
-  env.depends(two, one)
+    two = env.TestBuilder("two", [], "wait_time" => "0")
+    env.depends(two, one)
+  end
 end

build_tests/simple/user_dependencies.rb

@@ -1,4 +1,6 @@
-env do |env|
+default do
-  program = env.Program("simple.exe", Dir["*.c"])
+  Environment.new do |env|
-  env.depends(program, "program.ld")
+    program = env.Program("simple.exe", Dir["*.c"])
+    env.depends(program, "program.ld")
+  end
 end

build_tests/simple/user_dependencies_carat.rb

@@ -8,10 +8,11 @@ class FileBuilder < Builder
     true
   end
 end
-
+default do
-env do |env|
+  Environment.new do |env|
-  env.add_builder(FileBuilder)
+    env.add_builder(FileBuilder)
-  env.File("^/file.txt")
+    env.File("^/file.txt")
-  program = env.Program("^/simple.exe", Dir["*.c"])
+    program = env.Program("^/simple.exe", Dir["*.c"])
-  env.depends("^/simple.exe", "^/file.txt")
+    env.depends("^/simple.exe", "^/file.txt")
+  end
 end

build_tests/simple/wait_for_builds_on_failure.rb

@@ -11,10 +11,12 @@ class Fail < Rscons::Builder
   end
 end
 
-env do |env|
+default do
-  env.add_builder(Fail)
+  Environment.new do |env|
-  4.times do |i|
+    env.add_builder(Fail)
-    wait_time = i + 1
+    4.times do |i|
-    env.Fail("foo_#{wait_time}", [], "wait_time" => wait_time.to_s)
+      wait_time = i + 1
+      env.Fail("foo_#{wait_time}", [], "wait_time" => wait_time.to_s)
+    end
   end
 end

build_tests/simple_cc/Rsconscript

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