pass env to Cache#up_to_date?() and #register_build() instead of user_deps

lib/rscons/builder.rb

@@ -22,12 +22,12 @@ module Rscons
     # Check if the cache is up to date for the target and if not execute the
     # build command.
     # Return the name of the target or false on failure.
-    def standard_build(short_cmd_string, target, command, sources, user_deps, env, cache)
-      unless cache.up_to_date?(target, command, sources, user_deps)
+    def standard_build(short_cmd_string, target, command, sources, env, cache)
+      unless cache.up_to_date?(target, command, sources, env)
         cache.mkdir_p(File.dirname(target))
         FileUtils.rm_f(target)
         return false unless env.execute(short_cmd_string, command)
-        cache.register_build(target, command, sources, user_deps)
+        cache.register_build(target, command, sources, env)
       end
       target
     end

lib/rscons/builders/library.rb

@@ -12,7 +12,7 @@ module Rscons
       }
     end
 
-    def run(target, sources, user_deps, cache, env, vars)
+    def run(target, sources, cache, env, vars)
       # build sources to linkable objects
       objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
       if objects
@@ -21,7 +21,7 @@ module Rscons
           '_SOURCES' => objects,
         })
         command = env.build_command(env['ARCMD'], vars)
-        standard_build("AR #{target}", target, command, objects, user_deps, env, cache)
+        standard_build("AR #{target}", target, command, objects, env, cache)
       end
     end
   end

lib/rscons/builders/object.rb

@@ -50,7 +50,7 @@ module Rscons
       end
     end
 
-    def run(target, sources, user_deps, cache, env, vars)
+    def run(target, sources, cache, env, vars)
       vars = vars.merge({
         '_TARGET' => target,
         '_SOURCES' => sources,
@@ -62,7 +62,7 @@ module Rscons
         v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}"
       end.first
       command = env.build_command(env["#{com_prefix}CMD"], vars)
-      unless cache.up_to_date?(target, command, sources, user_deps)
+      unless cache.up_to_date?(target, command, sources, env)
         cache.mkdir_p(File.dirname(target))
         FileUtils.rm_f(target)
         return false unless env.execute("#{com_prefix} #{target}", command)
@@ -71,7 +71,7 @@ module Rscons
           deps += Environment.parse_makefile_deps(vars['_DEPFILE'], target)
           FileUtils.rm_f(vars['_DEPFILE'])
         end
-        cache.register_build(target, command, deps.uniq, user_deps)
+        cache.register_build(target, command, deps.uniq, env)
       end
       target
     end

lib/rscons/builders/program.rb

@@ -14,7 +14,7 @@ module Rscons
       }
     end
 
-    def run(target, sources, user_deps, cache, env, vars)
+    def run(target, sources, cache, env, vars)
       # build sources to linkable objects
       objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
       return false unless objects
@@ -33,7 +33,7 @@ module Rscons
         'LD' => ld,
       })
       command = env.build_command(env['LDCMD'], vars)
-      standard_build("LD #{target}", target, command, objects, user_deps, env, cache)
+      standard_build("LD #{target}", target, command, objects, env, cache)
     end
   end
 end

lib/rscons/cache.rb

@@ -89,7 +89,7 @@ module Rscons
     # @param target [String] The name of the target file.
     # @param command [Array] The command used to build the target.
     # @param deps [Array] List of the target's dependency files.
-    # @param user_deps [Array] List of user-specified extra dependencies.
+    # @param env [Environment] The Rscons::Environment.
     # @param options [Hash] Optional options. Can contain the following keys:
     #   :strict_deps::
     #     Only consider a target up to date if its list of dependencies is
@@ -104,7 +104,7 @@ module Rscons
     #     exactly equal to those cached
     #   - each cached dependency file's current checksum matches the checksum
     #     stored in the cache file
-    def up_to_date?(target, command, deps, user_deps, options = {})
+    def up_to_date?(target, command, deps, env, options = {})
       # target file must exist on disk
       return false unless File.exists?(target)
 
@@ -117,20 +117,24 @@ module Rscons
       # command used to build target must be identical
       return false unless @cache[:targets][target][:command] == command
 
-      cached_deps = @cache[:targets][target][:deps].map { |dc| dc[:fname] }
+      cached_deps = @cache[:targets][target][:deps] or []
+      cached_deps_fnames = cached_deps.map { |dc| dc[:fname] }
       if options[:strict_deps]
         # depedencies passed in must exactly equal those in the cache
-        return false unless deps == cached_deps
+        return false unless deps == cached_deps_fnames
       else
         # all dependencies passed in must exist in cache (but cache may have more)
-        return false unless (Set.new(deps) - Set.new(cached_deps)).empty?
+        return false unless (Set.new(deps) - Set.new(cached_deps_fnames)).empty?
       end
 
       # set of user dependencies must match
-      return false unless user_deps == @cache[:targets][target][:user_deps].map { |dc| dc[:fname] }
+      user_deps = env.get_user_deps(target) || []
+      cached_user_deps = @cache[:targets][target][:user_deps] or []
+      cached_user_deps_fnames = cached_user_deps.map { |dc| dc[:fname] }
+      return false unless user_deps == cached_user_deps_fnames
 
       # all cached dependencies must have their checksums match
-      (@cache[:targets][target][:deps] + @cache[:targets][target][:user_deps]).each do |dep_cache|
+      (cached_deps + cached_user_deps).each do |dep_cache|
         return false unless dep_cache[:checksum] == lookup_checksum(dep_cache[:fname])
       end
 
@@ -141,8 +145,8 @@ module Rscons
     # @param target [String] The name of the target.
     # @param command [Array] The command used to build the target.
     # @param deps [Array] List of dependencies for the target.
-    # @param user_deps [Array] List of user-specified extra dependencies.
-    def register_build(target, command, deps, user_deps)
+    # @param env [Environment] The Rscons::Environment.
+    def register_build(target, command, deps, env)
       @cache[:targets][target.encode(__ENCODING__)] = {
         command: command,
         checksum: calculate_checksum(target),
@@ -152,7 +156,7 @@ module Rscons
             checksum: lookup_checksum(dep),
           }
         end,
-        user_deps: user_deps.map do |dep|
+        user_deps: (env.get_user_deps(target) || []).map do |dep|
           {
             fname: dep.encode(__ENCODING__),
             checksum: lookup_checksum(dep),

lib/rscons/environment.rb

@@ -151,7 +151,6 @@ module Rscons
           result = run_builder(@targets[target][:builder],
                                target,
                                @targets[target][:source],
-                               @user_deps[target] || [],
                                cache,
                                @targets[target][:vars] || {})
           unless result
@@ -232,6 +231,12 @@ module Rscons
       @user_deps[target] = (@user_deps[target] + user_deps).uniq
     end
 
+    # Return the list of user dependencies for a given target, or +nil+ for
+    # none.
+    def get_user_deps(target)
+      @user_deps[target]
+    end
+
     # Build a list of source files into files containing one of the suffixes
     # given by suffixes.
     # This method is used internally by RScons builders.
@@ -250,7 +255,7 @@ module Rscons
             converted_fname = get_build_fname(source, suffix)
             builder = @builders.values.find { |b| b.produces?(converted_fname, source, self) }
             if builder
-              converted = run_builder(builder, converted_fname, [source], [], cache, vars)
+              converted = run_builder(builder, converted_fname, [source], cache, vars)
               return nil unless converted
               break
             end
@@ -267,19 +272,18 @@ module Rscons
     # @param cache [Cache] The Cache.
     # @param vars [Hash] Extra variables to pass to the builder.
     # Return the result of the builder's run() method.
-    def run_builder(builder, target, sources, user_deps, cache, vars)
+    def run_builder(builder, target, sources, cache, vars)
       vars = @varset.merge(vars)
       @build_hooks.each do |build_hook_block|
         build_operation = {
           builder: builder,
           target: target,
           sources: sources,
-          user_deps: user_deps,
           vars: vars,
         }
         build_hook_block.call(build_operation)
       end
-      builder.run(target, sources, user_deps, cache, self, vars)
+      builder.run(target, sources, cache, self, vars)
     end
 
     # Parse dependencies for a given target from a Makefile.