change "vars" parameters to be required

This commit is contained in:
josh committed 2013-12-27 13:53:40 -05:00
1 parent e667046da8
commit a28cef9eb7
4 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -12,7 +12,7 @@ module Rscons
} }
end end
def run(target, sources, cache, env, vars = {}) def run(target, sources, cache, env, vars)
# build sources to linkable objects # build sources to linkable objects
objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars) objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
if objects if objects
+1 -1
View File
@@ -50,7 +50,7 @@ module Rscons
end end
end end
def run(target, sources, cache, env, vars = {}) def run(target, sources, cache, env, vars)
vars = vars.merge({ vars = vars.merge({
'_TARGET' => target, '_TARGET' => target,
'_SOURCES' => sources, '_SOURCES' => sources,
+1 -1
View File
@@ -14,7 +14,7 @@ module Rscons
} }
end end
def run(target, sources, cache, env, vars = {}) def run(target, sources, cache, env, vars)
# build sources to linkable objects # build sources to linkable objects
objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars) objects = env.build_sources(sources, [env['OBJSUFFIX'], env['LIBSUFFIX']].flatten, cache, vars)
return false unless objects return false unless objects
+1 -1
View File
@@ -228,7 +228,7 @@ module Rscons
# @param cache [Cache] The Cache. # @param cache [Cache] The Cache.
# @param vars [Hash] Extra variables to pass to the builder. # @param vars [Hash] Extra variables to pass to the builder.
# Return a list of the converted file names. # Return a list of the converted file names.
def build_sources(sources, suffixes, cache, vars = {}) def build_sources(sources, suffixes, cache, vars)
sources.map do |source| sources.map do |source|
if source.has_suffix?(suffixes) if source.has_suffix?(suffixes)
source source