setup.rb in reap-9.3.3 vs setup.rb in reap-9.3.4
- old
+ new
@@ -63,10 +63,11 @@
[:rbdir , :path, 'directory for ruby scripts'],
[:sodir , :path, 'directory for ruby extentions'],
[:rubypath , :prog, 'path to set to #! line'],
[:rubyprog , :prog, 'ruby program using for installation'],
[:makeprog , :prog, 'make program to compile ruby extentions'],
+ [:extconfopt , :name, 'options to pass-thru to extconf.rb'],
[:without_ext , :bool, 'do not compile/install ruby extentions'],
[:without_doc , :bool, 'do not generate html documentation'],
[:shebang , :pick, 'shebang line (#!) editing mode (all,ruby,never)'],
[:doctemplate , :pick, 'document template to use (html|xml)'],
[:testrunner , :pick, 'Runner to use for testing (auto|console|tk|gtk|gtk2)'],
@@ -271,10 +272,11 @@
self.rbdir = '$siterubyver'
self.sodir = '$siterubyverarch'
self.rubypath = rubypath
self.rubyprog = rubypath
self.makeprog = makeprog
+ self.extconfopt = ''
self.shebang = 'ruby'
self.without_ext = 'no'
self.without_doc = 'yes'
self.doctemplate = 'html'
self.testrunner = 'auto'
@@ -316,14 +318,14 @@
def show
fmt = "%-20s %s\n"
OPTIONS.each do |name|
value = self[name]
- printf fmt, name, __send__(name) if value
+ reslv = __send__(name)
+ reslv = "(none)" if String===reslv && reslv.empty?
+ printf fmt, name, reslv if value
end
- #printf fmt, 'verbose', verbose? ? 'yes' : 'no'
- #printf fmt, 'no-write', no_harm? ? 'yes' : 'no'
end
#
def extconfs
@@ -514,13 +516,13 @@
#
def exec_config
config.env_config
config.save_config
- exec_task_traverse 'config'
config.show unless quiet?
puts("Configuration saved.") unless quiet?
+ exec_task_traverse 'config'
end
alias config_dir_bin noop
alias config_dir_lib noop
@@ -532,10 +534,10 @@
alias config_dir_conf noop
alias config_dir_man noop
alias config_dir_doc noop
def extconf
- ruby "#{curr_srcdir()}/extconf.rb", config_opt
+ ruby "#{curr_srcdir()}/extconf.rb", config.extconfopt
end
#
# TASK show
#