wip

It really wasn't necessary since Cache#write is not called often.

.gitignore

@@ -3,5 +3,7 @@
 /_yardoc/
 /build_test_run/
 /coverage/
+/dist/
 /doc/
 /pkg/
+/test/

CHANGELOG.md

@@ -1,28 +1,5 @@
 ## ChangeLog
 
-### v1.19.0
-
-#### New Features
-
-- #117 - ruby 2.7 compatibility
-
-#### Fixes
-
-- #115 - Check that user dependencies exist before running builders.
-
-### v1.18.0
-
-#### Performance Improvements
-
-- Backport 2.x VarSet performance improvements to 1.x branch.
-- Remove Cache dirty-tracking
-- Reduce recursion of VarSet#expand_varref by expanding vars earlier.
-
-#### Fixes
-
-- #73 - fix inconsistent type handling in VarSet#expand_varref
-- #75 - avoid mkdir() race conditions
-
 ### v1.17.0
 
 #### New Features

Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rscons.gemspec
+gem "json"
-gemspec
+gem "rspec"
+gem "rake"
+gem "simplecov"
+gem "yard"
+gem "rdoc"

Gemfile.lock

@@ -1,48 +1,42 @@
-PATH
-  remote: .
-  specs:
-    rscons (1.19.0)
-      json (>= 1.8, < 3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
     docile (1.1.5)
-    json (2.3.0)
+    json (2.1.0)
-    rake (13.0.1)
+    rake (12.3.1)
-    rdoc (6.2.1)
+    rdoc (5.1.0)
-    rspec (3.9.0)
+    rspec (3.6.0)
-      rspec-core (~> 3.9.0)
+      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.9.0)
+      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.9.0)
+      rspec-mocks (~> 3.6.0)
-    rspec-core (3.9.1)
+    rspec-core (3.6.0)
-      rspec-support (~> 3.9.1)
+      rspec-support (~> 3.6.0)
-    rspec-expectations (3.9.1)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.6.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.6.0)
-    rspec-support (3.9.2)
+    rspec-support (3.6.0)
-    simplecov (0.15.1)
+    simplecov (0.15.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    yard (0.9.24)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
+  json
   rake
   rdoc
-  rscons!
   rspec
-  simplecov (~> 0.15.0)
+  simplecov
   yard
 
 BUNDLED WITH
-   2.1.4
+   1.16.2

README.md

@@ -1,13 +1,13 @@
 # Rscons
 
 Rscons (https://github.com/holtrop/rscons) is a software construction framework
-inspired by SCons and implemented in Ruby.
+inspired by SCons and waf but implemented in Ruby.
-
-[![Gem Version](https://badge.fury.io/rb/rscons.png)](http://badge.fury.io/rb/rscons)
 
 ## Installation
 
-    $ gem install rscons
+Rscons is distributed as a standalone Ruby script named ``rscons``. This file
+(containing the complete rscons build system) can be checked into your project
+and versioned along with your project.
 
 ## Usage
 

Rakefile.rb

@@ -5,13 +5,17 @@ rescue Bundler::BundlerError => e
   raise LoadError.new("Unable to setup Bundler; you might need to `bundle install`: #{e.message}")
 end
 
-require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "yard"
 require "rake/clean"
+require "fileutils"
 
-CLEAN.include %w[build_test_run .yardoc doc coverage]
+CLEAN.include %w[build_test_run .yardoc doc coverage test]
-CLOBBER.include %w[pkg]
+CLOBBER.include %w[dist pkg]
+
+task :build_dist do
+  sh "ruby rb/build_dist.rb"
+end
 
 RSpec::Core::RakeTask.new(:spec, :example_string) do |task, args|
   if args.example_string
@@ -19,6 +23,19 @@ RSpec::Core::RakeTask.new(:spec, :example_string) do |task, args|
     task.rspec_opts = %W[-e "#{args.example_string}" -f documentation]
   end
 end
+task :spec => :build_dist
+
+# dspec task is useful to test the distributable release script, but is not
+# useful for coverage information.
+desc "Dist Specs"
+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)
+  ENV.delete("dist_specs")
+  FileUtils.rm_f(Dir.glob(".rscons-*"))
+end
 
 YARD::Rake::YardocTask.new do |yard|
   yard.files = ['lib/**/*.rb']

bin/rscons

@@ -2,4 +2,6 @@
 
 require "rscons/cli"
 
-Rscons::Cli.run(ARGV)
+if __FILE__ == $0
+  Rscons::Cli.run(ARGV)
+end

build_tests/build_dir/Rsconsfile

@@ -1,5 +0,0 @@
-Rscons::Environment.new do |env|
-  env.append('CPPPATH' => Rscons.glob('src/**'))
-  env.build_dir(%r{^src/([^/]+)/}, 'build_\\1/')
-  env.Program('build_dir.exe', Rscons.glob('src/**/*.c'))
-end

build_tests/build_dir/backward_compatible_build_hooks.rb

@@ -1,22 +0,0 @@
-class MyObject < Rscons::Builder
-  def run(target, sources, cache, env, vars)
-    env.run_builder(env.builders["Object"], target, sources, cache, vars)
-  end
-end
-
-Rscons::Environment.new(echo: :command) do |env|
-  env.add_builder(MyObject.new)
-  env.append('CPPPATH' => Rscons.glob('src/**'))
-  env.add_build_hook do |build_op|
-    if build_op[:builder].name == "MyObject" && build_op[:sources].first =~ %r{one\.c}
-      build_op[:vars]["CFLAGS"] << "-O1"
-      build_op[:sources] = ['src/two/two.c']
-    elsif build_op[:builder].name == "MyObject" && build_op[:target] =~ %r{two\.o}
-      new_vars = build_op[:vars].clone
-      new_vars["CFLAGS"] << "-O2"
-      build_op[:vars] = new_vars
-    end
-  end
-  env.MyObject('one.o', 'src/one/one.c')
-  env.MyObject('two.o', 'src/two/two.c')
-end

build_tests/build_dir/build_dirs_and_root.rb

@@ -1,6 +0,0 @@
-env = Rscons::Environment.new do |env|
-  env.append('CPPPATH' => Rscons.glob('src/**/*/'))
-  env.build_dir("src", "build")
-  env.build_root = "build_root"
-  env.Program('build_dir.exe', Rscons.glob('src/**/*.c'))
-end

build_tests/build_dir/build_hooks.rb

@@ -1,12 +0,0 @@
-Rscons::Environment.new(echo: :command) do |env|
-  env.append('CPPPATH' => Rscons.glob('src/**/*/'))
-  env.build_dir(%r{^src/([^/]+)/}, 'build_\\1/')
-  env.add_build_hook do |build_op|
-    if build_op[:target] =~ %r{build_one/.*\.o}
-      build_op[:vars]["CFLAGS"] << "-O1"
-    elsif build_op[:target] =~ %r{build_two/.*\.o}
-      build_op[:vars]["CFLAGS"] << "-O2"
-    end
-  end
-  env.Program('build_hook.exe', Rscons.glob('src/**/*.c'))
-end

build_tests/build_dir/carat.rb

@@ -1,8 +0,0 @@
-Rscons::Environment.new(echo: :command) do |env|
-  env.append('CPPPATH' => Rscons.glob('src/**').sort)
-  env.build_root = "build_root"
-  FileUtils.mkdir_p(env.build_root)
-  FileUtils.mv("src/one/one.c", "build_root")
-  env.Object("^/one.o", "^/one.c")
-  env.Program("build_dir.exe", Rscons.glob('src/**/*.c') + ["^/one.o"])
-end

build_tests/build_dir/copy.rb

@@ -1,3 +0,0 @@
-Rscons::Environment.new do |env|
-  env.Copy("inst.exe", "copy.rb")
-end

build_tests/build_dir/csuffix.rb

@@ -1,6 +0,0 @@
-Rscons::Environment.new do |env|
-  env["CSUFFIX"] = %w[.yargh .c]
-  env["CFLAGS"] += %w[-x c]
-  env["CPPPATH"] += Rscons.glob("src/**")
-  env.Program("build_dir.exe", Rscons.glob("src/**/*.{c,yargh}"))
-end

build_tests/build_dir/echo_command_ruby_builder.rb

@@ -1,5 +0,0 @@
-Rscons::Environment.new do |env|
-  env.echo = :command
-  env.Install("inst.exe", "install.rb")
-end
-

build_tests/build_dir/echo_command_string.rb

@@ -1,13 +0,0 @@
-class MyBuilder < Rscons::Builder
-  def run(options)
-    env, target = options.values_at(:env, :target)
-    env.print_builder_run_message("MyBuilder #{target}", "MyBuilder #{target} command")
-    target
-  end
-end
-
-Rscons::Environment.new do |env|
-  env.echo = :command
-  env.add_builder(MyBuilder.new)
-  env.MyBuilder("foo")
-end

build_tests/build_dir/install.rb

@@ -1,3 +0,0 @@
-Rscons::Environment.new do |env|
-  env.Install("inst.exe", "install.rb")
-end

build_tests/build_dir/install_directory.rb

@@ -1,9 +0,0 @@
-Rscons::Environment.new do |env|
-  env.Directory("inst")
-  env.Install("inst", "install_directory.rb")
-
-  env.Install("noexist/src", "src")
-
-  env.Directory("exist/src")
-  env.Install("exist/src", "src")
-end

build_tests/build_dir/multiple_targets_same_name.rb

@@ -1,5 +0,0 @@
-Rscons::Environment.new do |env|
-  env["CPPPATH"] << "src/two"
-  env.Object("one.o", "src/one/one.c")
-  env.Object("one.o", "src/two/two.c")
-end

build_tests/build_dir/no_match_build_dir.rb

@@ -1,6 +0,0 @@
-Rscons::Environment.new do |env|
-  env.append('CPPPATH' => Rscons.glob('src/**'))
-  env.build_dir("src2", "build")
-  env.build_root = "build_root"
-  env.Program('build_dir.exe', Rscons.glob('src/**/*.c'))
-end

build_tests/build_dir/post_build_hook_expansion.rb

@@ -1,10 +0,0 @@
-Rscons::Environment.new do |env|
-  env["CPPPATH"] << "src/two"
-  env.Object("one.o", "src/one/one.c")
-  env.add_post_build_hook do |build_op|
-    if build_op[:target] == "one.o"
-      env["MODULE"] = "two"
-      env.Object("${MODULE}.o", "src/${MODULE}/${MODULE}.c")
-    end
-  end
-end

build_tests/build_dir/slashes.rb

@@ -1,6 +0,0 @@
-Rscons::Environment.new do |env|
-  env.append("CPPPATH" => Rscons.glob("src/**"))
-  env.build_dir("src/one/", "build_one/")
-  env.build_dir("src/two", "build_two")
-  env.Program("build_dir.exe", Rscons.glob("src/**/*.c"))
-end

build_tests/cfile/Rsconscript

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

build_tests/cfile/Rsconsfile

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

build_tests/cfile/error_unknown_extension.rb

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

build_tests/clone_env/Rsconscript

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

build_tests/clone_env/Rsconsfile

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

build_tests/clone_env/clone_all.rb

@@ -1,15 +1,16 @@
-env1 = Rscons::Environment.new(echo: :command) do |env|
+build do
-  env.build_dir('src', 'build')
+  env1 = Environment.new(echo: :command) do |env|
-  env['CFLAGS'] = '-O2'
+    env['CFLAGS'] = '-O2'
-  env.add_build_hook do |build_op|
+    env.add_build_hook do |builder|
-    build_op[: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 |build_op|
-    $stdout.puts "post #{build_op[: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_fail.rb

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

build_tests/configure/autoconf_false.rb

@@ -0,0 +1 @@
+autoconf false

build_tests/configure/autoconf_rebuild.rb

@@ -0,0 +1,10 @@
+configure do
+  check_c_compiler
+  check_c_header "stdio.h"
+end
+
+build do
+  Environment.new do |env|
+    env.Program("simple.exe", "simple.c")
+  end
+end

build_tests/configure/check_c_compiler.rb

@@ -0,0 +1,3 @@
+configure do
+  check_c_compiler
+end

build_tests/configure/check_c_compiler_custom.rb

@@ -0,0 +1,3 @@
+configure do
+  check_c_compiler "mycompiler"
+end

build_tests/configure/check_c_compiler_find_first.rb

@@ -0,0 +1,3 @@
+configure do
+  check_c_compiler "gcc", "clang"
+end

build_tests/configure/check_c_header_failure.rb

@@ -0,0 +1,3 @@
+configure do
+  check_c_header "not___found.h"
+end

build_tests/configure/check_c_header_no_fail.rb

@@ -0,0 +1,3 @@
+configure do
+  check_c_header "not___found.h", fail: false
+end

build_tests/configure/check_c_header_no_fail_set_define.rb

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

build_tests/configure/check_c_header_success.rb

@@ -0,0 +1,3 @@
+configure do
+  check_c_header "string.h"
+end

build_tests/configure/check_c_header_success_set_define.rb

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

build_tests/configure/check_cfg.rb

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

build_tests/configure/check_cfg_package.rb

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

build_tests/configure/check_cfg_use.rb

@@ -0,0 +1,15 @@
+configure do
+  check_cfg package: "mypackage", use: "myp"
+end
+
+build do
+  Environment.new(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.Copy("myconfigtest2.c", "simple.c")
+    env.Program("myconfigtest2.exe", "myconfigtest2.c")
+  end
+end

build_tests/configure/check_cxx_compiler.rb

@@ -0,0 +1,3 @@
+configure do
+  check_cxx_compiler
+end

build_tests/configure/check_cxx_compiler_custom.rb

@@ -0,0 +1,3 @@
+configure do
+  check_cxx_compiler "mycompiler"
+end

build_tests/configure/check_cxx_compiler_find_first.rb

@@ -0,0 +1,3 @@
+configure do
+  check_cxx_compiler "g++", "clang++"
+end

build_tests/configure/check_cxx_header_failure.rb

@@ -0,0 +1,3 @@
+configure do
+  check_cxx_header "not___found.h"
+end

build_tests/configure/check_cxx_header_no_fail.rb

@@ -0,0 +1,3 @@
+configure do
+  check_cxx_header "not___found.h", fail: false
+end

build_tests/configure/check_cxx_header_success.rb

@@ -0,0 +1,3 @@
+configure do
+  check_cxx_header "string.h"
+end

build_tests/configure/check_d_compiler.rb

@@ -0,0 +1,3 @@
+configure do
+  check_d_compiler
+end

build_tests/configure/check_d_compiler_custom.rb

@@ -0,0 +1,3 @@
+configure do
+  check_d_compiler "mycompiler"
+end

build_tests/configure/check_d_compiler_find_first.rb

@@ -0,0 +1,3 @@
+configure do
+  check_d_compiler "gdc", "ldc2"
+end

build_tests/configure/check_d_import_failure.rb

@@ -0,0 +1,3 @@
+configure do
+  check_d_import "not.found"
+end

build_tests/configure/check_d_import_no_fail.rb

@@ -0,0 +1,3 @@
+configure do
+  check_d_import "not.found", fail: false
+end

build_tests/configure/check_d_import_success.rb

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

build_tests/configure/check_lib_failure.rb

@@ -0,0 +1,3 @@
+configure do
+  check_lib "mfoofoo"
+end

build_tests/configure/check_lib_no_fail.rb

@@ -0,0 +1,3 @@
+configure do
+  check_lib "mfoofoo", fail: false
+end

build_tests/configure/check_lib_success.rb

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

build_tests/configure/check_lib_use.rb

@@ -0,0 +1,15 @@
+configure do
+  check_lib "m", use: :m
+end
+
+build do
+  Environment.new(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.Copy("test2.c", "simple.c")
+    env.Program("test2.exe", "test2.c")
+  end
+end

build_tests/configure/check_lib_use_false.rb

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

build_tests/configure/check_program_failure.rb

@@ -0,0 +1,3 @@
+configure do
+  check_program "program-that-is-not-found"
+end

build_tests/configure/check_program_no_fail.rb

@@ -0,0 +1,3 @@
+configure do
+  check_program "program-that-is-not-found", fail: false
+end

build_tests/configure/check_program_success.rb

@@ -0,0 +1,3 @@
+configure do
+  check_program "find"
+end

build_tests/configure/error_env_construction_before_configure.rb

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

build_tests/configure/everything.rb

@@ -0,0 +1,13 @@
+project_name "configure test"
+autoconf false
+configure do
+  check_c_compiler
+  check_cxx_compiler
+  check_d_compiler
+  check_cfg package: "mypackage"
+  check_c_header "stdio.h"
+  check_cxx_header "iostream"
+  check_d_import "std.stdio"
+  check_lib "m"
+  check_program "ls"
+end

build_tests/configure/multiple_set_define.rb

@@ -0,0 +1,10 @@
+configure do
+  check_c_header "math.h", set_define: "HAVE_MATH_H"
+  check_c_header "stdio.h", set_define: "HAVE_STDIO_H"
+end
+
+build do
+  Environment.new(echo: :command) do |env|
+    env.Object("simple.o", "simple.c")
+  end
+end

build_tests/configure/scope.rb

@@ -0,0 +1 @@
+check_c_compiler "gcc"

build_tests/configure/simple.c

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+    printf("This is a simple C program\n");
+}

build_tests/custom_builder/Rsconscript

@@ -0,0 +1,18 @@
+class MySource < Rscons::Builder
+  def run(options)
+    File.open(@target, 'w') do |fh|
+      fh.puts <<EOF
+#define THE_VALUE 5678
+EOF
+    end
+    true
+  end
+end
+
+build do
+  Environment.new do |env|
+    env.add_builder(MySource)
+    env.MySource('inc.h', [])
+    env.Program('program.exe', Dir['*.c'])
+  end
+end

build_tests/custom_builder/Rsconsfile

@@ -1,16 +0,0 @@
-class MySource < Rscons::Builder
-  def run(target, sources, cache, env, vars)
-    File.open(target, 'w') do |fh|
-      fh.puts <<EOF
-#define THE_VALUE 5678
-EOF
-    end
-    target
-  end
-end
-
-Rscons::Environment.new do |env|
-  env.add_builder(MySource.new)
-  env.MySource('inc.h', [])
-  env.Program('program.exe', Dir['*.c'])
-end

build_tests/custom_builder/build_after.rb

@@ -1,10 +1,12 @@
-Rscons::Environment.new do |env|
+build 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.build_after("${build_root}/program.o", "${inc_c}")
+    env["inc_c"] = "inc.c"
-  env.Program("program.exe", ["program.c", "inc.c"])
+    env.build_after("${build_root}/program.o", "${inc_c}")
+    env.Program("program.exe", ["program.c", "inc.c"])
+  end
 end

build_tests/custom_builder/cvar_expansion.rb

@@ -1,18 +1,20 @@
 class MySource < Rscons::Builder
-  def run(target, sources, cache, env, vars)
+  def run(options)
-    File.open(target, 'w') do |fh|
+    File.open(@target, 'w') do |fh|
       fh.puts <<EOF
 #define THE_VALUE 678
 EOF
     end
-    target
+    true
   end
 end
 
-env = Rscons::Environment.new do |env|
+build do
-  env["hdr"] = "inc.h"
+  env = Environment.new do |env|
-  env["src"] = "program.c"
+    env["hdr"] = "inc.h"
-  env.add_builder(MySource.new)
+    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

@@ -1,28 +1,30 @@
 class MySource < Rscons::Builder
-  def run(target, sources, cache, env, vars)
+  def run(options)
-    File.open(target, 'w') do |fh|
+    File.open(@target, 'w') do |fh|
       fh.puts <<EOF
-#define THE_VALUE #{env.expand_varref("${the_value}")}
+#define THE_VALUE #{@env.expand_varref("${the_value}")}
 EOF
     end
-    target
+    true
   end
 end
 
-e1 = Rscons::Environment.new do |env|
+build do
-  env.add_builder(MySource.new)
+  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

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

build_tests/custom_builder/error_wait_for.rb

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

build_tests/custom_builder/multiple_targets.rb

@@ -1,19 +1,21 @@
 class CHGen < Rscons::Builder
-  def run(target, sources, cache, env, vars)
+  def run(options)
-    c_fname = target
+    c_fname = @target
-    h_fname = target.sub(/\.c$/, ".h")
+    h_fname = @target.sub(/\.c$/, ".h")
-    unless cache.up_to_date?([c_fname, h_fname], "", sources, env)
+    unless @cache.up_to_date?([c_fname, h_fname], "", @sources, @env)
       puts "CHGen #{c_fname}"
       File.open(c_fname, "w") {|fh| fh.puts "int THE_VALUE = 42;"}
       File.open(h_fname, "w") {|fh| fh.puts "extern int THE_VALUE;"}
-      cache.register_build([c_fname, h_fname], "", sources, env)
+      @cache.register_build([c_fname, h_fname], "", @sources, @env)
     end
-    target
+    true
   end
 end
 
-Rscons::Environment.new do |env|
+build do
-  env.add_builder(CHGen.new)
+  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,14 +1,16 @@
-Rscons::Environment.new do |env|
+build 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("${build_root}/program.o", "${inc_h}")
+    env.depends("${build_root}/program.o", "${inc_h}")
-  env.Program("program.exe", ["program.c", "inc.c"])
+    env.Program("program.exe", ["program.c", "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

@@ -0,0 +1,21 @@
+class MyBuilder < Rscons::Builder
+  def run(options)
+    if @thread
+      true
+    else
+      print_run_message("#{name} #{target}", nil)
+      @thread = Thread.new do
+        sleep 2
+        FileUtils.touch(@target)
+      end
+      wait_for(@thread)
+    end
+  end
+end
+
+build do
+  Environment.new do |env|
+    env.add_builder(MyBuilder)
+    env.MyBuilder("foo")
+  end
+end

build_tests/d/Rsconscript

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

build_tests/d/Rsconsfile

@@ -1,3 +0,0 @@
-Rscons::Environment.new(echo: :command) do |env|
-  env.Program("hello-d.exe", Rscons.glob("*.d"))
-end

build_tests/d/link_objects.rb

@@ -0,0 +1,7 @@
+build do
+  Environment.new(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

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

build_tests/direct/c_shared_library.rb

@@ -0,0 +1,7 @@
+build 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" => ["."])
+    env.depends(program, lib)
+  end
+end

build_tests/direct/main.c

@@ -0,0 +1,7 @@
+#include "two.h"
+
+int main(int argc, char * argv[])
+{
+    two();
+    return 0;
+}

build_tests/direct/three.c

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

build_tests/direct/three.h

@@ -0,0 +1 @@
+void three(void);

build_tests/direct/two.c

@@ -0,0 +1,7 @@
+#include "two.h"
+#include "three.h"
+
+void two(void)
+{
+    three();
+}

build_tests/direct/two.h

@@ -0,0 +1 @@
+void two(void);

build_tests/header/Rsconscript

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

build_tests/header/Rsconsfile

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

build_tests/json_to_yaml/Rsconscript

@@ -0,0 +1,17 @@
+build do
+  Environment.new do |env|
+    require 'json'
+    require 'yaml'
+    env.add_builder(:JsonToYaml) do |params|
+      unless @cache.up_to_date?(@target, :JsonToYaml, @sources, @env)
+        @cache.mkdir_p(File.dirname(@target))
+        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
+      true
+    end
+    env.JsonToYaml('foo.yml', 'foo.json')
+  end
+end

build_tests/json_to_yaml/Rsconsfile

@@ -1,15 +0,0 @@
-Rscons::Environment.new do |env|
-  require 'json'
-  require 'yaml'
-  env.add_builder(:JsonToYaml) do |target, sources, cache, env, vars|
-    unless cache.up_to_date?(target, :JsonToYaml, sources, env)
-      cache.mkdir_p(File.dirname(target))
-      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
-    target
-  end
-  env.JsonToYaml('foo.yml', 'foo.json')
-end

build_tests/library/Rsconscript

@@ -0,0 +1,6 @@
+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
+end

build_tests/library/Rsconsfile

@@ -1,4 +0,0 @@
-Rscons::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

build_tests/library/library_from_object.rb

@@ -0,0 +1,7 @@
+build do
+  Environment.new 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/override_arcmd.rb

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

build_tests/preprocess/Rsconscript

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

build_tests/preprocess/Rsconsfile

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

build_tests/shared_library/Rsconscript

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

build_tests/shared_library/Rsconsfile

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

build_tests/shared_library/error_unknown_suffix.rb

@@ -1,6 +1,8 @@
-Rscons::Environment.new do |env|
+build 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