Drop support for 5-argument form of Builder#run - #84

build_tests/custom_builder/Rsconscript

@@ -1,11 +1,11 @@
 class MySource < Rscons::Builder
-  def run(target, sources, cache, env, vars)
-    File.open(target, 'w') do |fh|
+  def run(options)
+    File.open(@target, 'w') do |fh|
       fh.puts <<EOF
 #define THE_VALUE 5678
 EOF
     end
-    target
+    @target
   end
 end
 

build_tests/custom_builder/cvar_expansion.rb

@@ -1,11 +1,11 @@
 class MySource < Rscons::Builder
-  def run(target, sources, cache, env, vars)
-    File.open(target, 'w') do |fh|
+  def run(options)
+    File.open(@target, 'w') do |fh|
       fh.puts <<EOF
 #define THE_VALUE 678
 EOF
     end
-    target
+    @target
   end
 end
 

build_tests/custom_builder/cvar_lambda.rb

@@ -1,11 +1,11 @@
 class MySource < Rscons::Builder
-  def run(target, sources, cache, env, vars)
-    File.open(target, 'w') do |fh|
+  def run(options)
+    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
+    @target
   end
 end
 

build_tests/custom_builder/multiple_targets.rb

@@ -1,5 +1,6 @@
 class CHGen < Rscons::Builder
-  def run(target, sources, cache, env, vars)
+  def run(options)
+    target, sources, cache, env, vars = options.values_at(:target, :sources, :cache, :env, :vars)
     c_fname = target
     h_fname = target.sub(/\.c$/, ".h")
     unless cache.up_to_date?([c_fname, h_fname], "", sources, env)

build_tests/simple/builder_no_sources.rb

@@ -1,5 +1,5 @@
 class TestBuilder < Rscons::Builder
-  def run(target, sources, cache, env, vars)
+  def run(options)
     target
   end
 end

build_tests/typical/backward_compatible_build_hooks.rb

@@ -1,5 +1,6 @@
 class MyObject < Rscons::Builder
-  def run(target, sources, cache, env, vars)
+  def run(options)
+    target, sources, cache, env, vars = options.values_at(:target, :sources, :cache, :env, :vars)
     env.run_builder(env.builders["Object"].new(target: target, sources: sources, cache: cache, env: env, vars: vars), target, sources, cache, vars)
   end
 end