Add tasks - close #139

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

build_tests/cfile/error_unknown_extension.rb

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

build_tests/clone_env/Rsconscript

@@ -1,4 +1,4 @@
-build do
+default do
   debug = Environment.new(echo: :command) do |env|
     env['CFLAGS'] = '-O2'
     env['CPPFLAGS'] = '-DSTRING="Debug Version"'

build_tests/clone_env/clone_all.rb

@@ -1,4 +1,4 @@
-build do
+default do
   env1 = Environment.new(echo: :command) do |env|
     env['CFLAGS'] = '-O2'
     env.add_build_hook do |builder|

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
+Environment.new do |env|
+end

build_tests/configure/autoconf_rebuild.rb

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

build_tests/configure/check_c_compiler.rb

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

build_tests/configure/check_c_header_cpppath.rb

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

build_tests/configure/check_c_header_no_fail_set_define.rb

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

build_tests/configure/check_c_header_success_set_define.rb

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

build_tests/configure/check_cfg.rb

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

build_tests/configure/check_cfg_package.rb

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

build_tests/configure/check_cfg_use.rb

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

build_tests/configure/check_cxx_header_cpppath.rb

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

build_tests/configure/check_d_import_d_import_path.rb

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

build_tests/configure/check_lib_libpath1.rb

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

build_tests/configure/check_lib_libpath2.rb

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

build_tests/configure/check_lib_success.rb

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

build_tests/configure/check_lib_use.rb

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

build_tests/configure/check_lib_use_false.rb

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

build_tests/configure/custom_config_check.rb

@@ -23,7 +23,7 @@ configure do
   end
 end
 
-build do
+default do
   Environment.new 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,7 +3,7 @@ configure do
   check_c_header "stdio.h", set_define: "HAVE_STDIO_H"
 end
 
-build do
+default do
   Environment.new(echo: :command) do |env|
     env.Object("simple.o", "simple.c")
   end

build_tests/custom_builder/Rsconscript

@@ -9,7 +9,7 @@ EOF
   end
 end
 
-build do
+default do
   Environment.new do |env|
     env.add_builder(MySource)
     env.MySource('inc.h', [])

build_tests/custom_builder/build_after.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.Command("inc.c",
                 [],

build_tests/custom_builder/cvar_expansion.rb

@@ -9,7 +9,7 @@ EOF
   end
 end
 
-build do
+default do
   env = Environment.new do |env|
     env["hdr"] = "inc.h"
     env["src"] = "program.c"

build_tests/custom_builder/cvar_lambda.rb

@@ -9,7 +9,7 @@ EOF
   end
 end
 
-build do
+default do
   e1 = Environment.new do |env|
     env.add_builder(MySource)
     env["one"] = "5"

build_tests/custom_builder/error_run_return_value.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.add_builder(:MyBuilder) do |options|
       "hi"

build_tests/custom_builder/error_wait_for.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.add_builder(:MyBuilder) do |options|
       wait_for(1)

build_tests/custom_builder/multiple_targets.rb

@@ -12,7 +12,7 @@ class CHGen < Rscons::Builder
   end
 end
 
-build do
+default do
   Environment.new do |env|
     env.add_builder(CHGen)
     env.CHGen("inc.c", ["program.c"])

build_tests/custom_builder/produces.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["build_root"] = env.build_root
     env["inc_h"] = "inc.h"

build_tests/custom_builder/produces_env.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["build_root"] = env.build_root
     env["inc_h"] = "inc.h"

build_tests/custom_builder/wait_for_thread.rb

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

build_tests/d/Rsconscript

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

build_tests/d/build-ldc2.rb

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

build_tests/d/link_objects.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new(echo: :command) do |env|
     env.Object("main.o", "main.d")
     env.Object("mod.o", "mod.d")

build_tests/direct/c_program.rb

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

build_tests/direct/c_shared_library.rb

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

build_tests/header/Rsconscript

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

build_tests/json_to_yaml/Rsconscript

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     require 'json'
     require 'yaml'

build_tests/library/Rsconscript

@@ -1,4 +1,4 @@
-build do
+default 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'])

build_tests/library/library_from_object.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.Program("library.exe", ["lib.a", "three.c"])
     env.Object("two.o", "two.c")

build_tests/library/override_arcmd.rb

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

build_tests/multiple_basename/Rsconscript

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

build_tests/preprocess/Rsconscript

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

build_tests/sh/sh.rb

@@ -1,4 +1,4 @@
-build do
+default do
   sh "echo", "hi  there"
   sh(["echo  1  2"])
 end

build_tests/sh/sh_fail.rb

@@ -1,4 +1,4 @@
-build do
+default do
   sh "foobar42"
   sh "echo", "continued"
 end

build_tests/sh/sh_fail_continue.rb

@@ -1,4 +1,4 @@
-build do
+default do
   sh "foobar42", continue: true
   sh "echo", "continued"
 end

build_tests/shared_library/Rsconscript

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["CPPPATH"] << "src/lib"
     libmine = env.SharedLibrary("mine", glob("src/lib/*.c"))

build_tests/shared_library/error_unknown_suffix.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     File.open("foo.xyz", "wb") do |fh|
       fh.puts("hi")

build_tests/shared_library/shared_library_as.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["CPPPATH"] << "src/lib"
     env.Object("file.S", "src/lib/one.c", "CFLAGS" => env["CFLAGS"] + ["-S"])

build_tests/shared_library/shared_library_cxx.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["CPPPATH"] << "src/lib"
     libmine = env.SharedLibrary("mine", glob("src/lib/*.cc"))

build_tests/shared_library/shared_library_d.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["CPPPATH"] << "src/lib"
     libmine = env.SharedLibrary("mine", glob("src/lib/*.d"))

build_tests/shared_library/shared_library_from_object.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["CPPPATH"] << "src/lib"
     env.SharedObject("one.o", "src/lib/one.c")

build_tests/shared_library/shared_library_set_shld.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env["CPPPATH"] << "src/lib"
     env["SHLD"] = "gcc"

build_tests/simple/Rsconscript

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

build_tests/simple/absolute_source_path.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new(echo: :command) do |env|
     tempdir = ENV["TEMP"] || ENV["TMP"] || "/tmp"
     source_file = File.join(tempdir, "abs.c")

build_tests/simple/barrier.rb

@@ -10,7 +10,7 @@ class ThreadedTestBuilder < Rscons::Builder
   end
 end
 
-build do
+default do
   Environment.new do |env|
     env.add_builder(ThreadedTestBuilder)
     env.ThreadedTestBuilder("T3", [], "delay" => 3)

build_tests/simple/builder_as_source.rb

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

build_tests/simple/builder_no_sources.rb

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

build_tests/simple/builder_wait_for_builder.rb

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

build_tests/simple/cache_command_change.rb

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

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,10 +27,10 @@ class DebugBuilder < Rscons::Builder
   end
 end
 
-build do
+default do
   Environment.new 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")

build_tests/simple/cache_dep_checksum_change.rb

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

build_tests/simple/cache_new_dep1.rb

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

build_tests/simple/cache_new_dep2.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.Object("simple.o", "simple.c")
     env["LDCMD"] = %w[gcc -o ${_TARGET} simple.o]

build_tests/simple/cache_successful_builds_when_one_fails.rb

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

build_tests/simple/cache_user_dep.rb

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

build_tests/simple/cache_varset.rb

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

build_tests/simple/clear_targets.rb

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

build_tests/simple/clone_n_threads.rb

@@ -1,4 +1,4 @@
-build do
+default do
   base_env = Environment.new do |env|
     env.n_threads = 165
   end

build_tests/simple/command.rb

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

build_tests/simple/command_builder.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     command = %W[gcc -o ${_TARGET} ${_SOURCES}]
     env.Command("simple.exe",

build_tests/simple/command_redirect.rb

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

build_tests/simple/cvar_array.rb

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

build_tests/simple/directory.rb

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

build_tests/simple/disassemble.rb

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

build_tests/simple/distclean.rb

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

build_tests/simple/dump.rb

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

build_tests/simple/error_circular_dependency.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.Command("foo", "bar")
     env.Command("bar", "baz")

build_tests/simple/error_circular_dependency2.rb

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

build_tests/simple/error_produces_nonexistent_target.rb

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

build_tests/simple/error_unknown_suffix.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     File.open("foo.xyz", "wb") do |fh|
       fh.puts("hi")

build_tests/simple/link_flag_change.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new(echo: :command) do |env|
     env["LD"] = "gcc"
     env["LIBPATH"] += ["libdir"]

build_tests/simple/override_cccmd.rb

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

build_tests/simple/override_depfilesuffix.rb

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

build_tests/simple/pathing.rb

@@ -1,7 +1,7 @@
 path_prepend "path_prepend"
 path_append "path_append"
 
-build do
+default do
   Environment.new do |env|
     system("flex")
     system("foobar")

build_tests/simple/phony_target.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.add_builder(:Checker) do |params|
       unless @cache.up_to_date?(@target, :Checker, @sources, @env)

build_tests/simple/preprocess.rb

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

build_tests/simple/progsuffix.rb

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

build_tests/simple/progsuffix2.rb

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

build_tests/simple/progsuffix3.rb

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

build_tests/simple/register_target_in_build_hook.rb

@@ -1,4 +1,4 @@
-build do
+default do
   Environment.new do |env|
     env.Program("simple.exe", Dir["*.c"])
     env.add_build_hook do |builder|

build_tests/simple/size.rb

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

build_tests/simple/threading.rb

@@ -17,7 +17,7 @@ class NonThreadedTestBuilder < Rscons::Builder
   end
 end
 
-build do
+default do
   Environment.new do |env|
     env.add_builder(ThreadedTestBuilder)
     env.add_builder(NonThreadedTestBuilder)

build_tests/simple/user_dep_build_order.rb

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

build_tests/simple/user_dependencies.rb

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

build_tests/simple/user_dependencies_carat.rb

@@ -8,7 +8,7 @@ class FileBuilder < Builder
     true
   end
 end
-build do
+default do
   Environment.new do |env|
     env.add_builder(FileBuilder)
     env.File("^/file.txt")