Remove Rscons.application.vars
This commit is contained in:
1 parent
b1b94595f6
commit
dbd764749b
5 files changed
+16
-31
No files matched your search
@@ -50,13 +50,6 @@ module Rscons
|
||||
@application ||= Application.new
|
||||
end
|
||||
|
||||
# Access any variables set on the rscons command-line.
|
||||
#
|
||||
# @return [VarSet]
|
||||
def vars(*args)
|
||||
application.vars(*args)
|
||||
end
|
||||
|
||||
# Return whether the given target is a phony target.
|
||||
#
|
||||
# @param target [Symbol, String] Target name.
|
||||
|
||||
@@ -21,16 +21,11 @@ module Rscons
|
||||
# Whether to run verbosely.
|
||||
attr_accessor :verbose
|
||||
|
||||
# @return [VarSet]
|
||||
# Access any variables set on the rscons command-line.
|
||||
attr_reader :vars
|
||||
|
||||
# Create Application instance.
|
||||
def initialize
|
||||
@build_dir = ENV["RSCONS_BUILD_DIR"] || "build"
|
||||
ENV.delete("RSCONS_BUILD_DIR")
|
||||
@n_threads = Util.determine_n_threads
|
||||
@vars = VarSet.new
|
||||
@build_step = 0
|
||||
end
|
||||
|
||||
|
||||
@@ -111,14 +111,6 @@ module Rscons
|
||||
|
||||
end.order!(argv)
|
||||
|
||||
# Set vars before loading the build script so the build script can
|
||||
# refer to them.
|
||||
argv.each do |arg|
|
||||
if arg =~ /^([^=]+)=(.*)$/
|
||||
Rscons.application.vars[$1] = $2
|
||||
end
|
||||
end
|
||||
|
||||
# Find the build script.
|
||||
if rsconscript
|
||||
unless File.exists?(rsconscript)
|
||||
|
||||
Reference in new issue
Block a user