lib/rscons/builders/library.rb in rscons-0.0.6 vs lib/rscons/builders/library.rb in rscons-0.0.7

@@ -6,28 +6,23 @@
     def default_variables(env)
       {
         'AR' => 'ar',
         'LIBSUFFIX' => '.a',
         'ARFLAGS' => [],
-        'ARCOM' => ['$AR', 'rcs', '$ARFLAGS', '$TARGET', '$SOURCES']
+        'ARCOM' => ['$AR', 'rcs', '$ARFLAGS', '$_TARGET', '$_SOURCES']
       }
     end
 
     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
         vars = vars.merge({
-          'TARGET' => target,
-          'SOURCES' => objects,
+          '_TARGET' => target,
+          '_SOURCES' => objects,
         })
         command = env.build_command(env['ARCOM'], vars)
-        unless cache.up_to_date?(target, command, objects)
-          FileUtils.rm_f(target)
-          return false unless env.execute("AR #{target}", command)
-          cache.register_build(target, command, objects)
-        end
-        target
+        standard_build("AR #{target}", target, command, objects, env, cache)
       end
     end
   end
 end