1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* tool/mkconfig.rb: do not make the entries related to sitedir and

Browse Source 
verdordir if disabled by --without options.  [ruby-core:38922]
  [Bug #5187]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-08-13 13:17:30 +00:00
parent 75de442dd0
commit 31e1fce2a3
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Aug 13 22:17:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/mkconfig.rb: do not make the entries related to sitedir and
verdordir if disabled by --without options. [ruby-core:38922]
[Bug #5187]
Sat Aug 13 17:03:22 2011 Tadayoshi Funaba <tadf@dotrb.org> Sat Aug 13 17:03:22 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c: [ruby-core:38861] * ext/date/date_core.c: [ruby-core:38861]

18
tool/mkconfig.rb
View File

@ -175,14 +175,22 @@ end
print " CONFIG[#{v.dump}] = #{versions[v].dump}\n" print " CONFIG[#{v.dump}] = #{versions[v].dump}\n"
end end
dest = drive ? /= \"(?!\$[\(\{])(?:[a-z]:)?/i : /= \"(?!\$[\(\{])/ dest = drive ? %r'= "(?!\$[\(\{])(?i:[a-z]:)' : %r'= "(?!\$[\(\{])'
v_disabled = {}
v_others.collect! do |x| v_others.collect! do |x|
if /^\s*CONFIG\["(?!abs_|old)[a-z]+(?:_prefix|dir)"\]/ === x if /^\s*CONFIG\["((?!abs_|old)[a-z]+(?:_prefix|dir))"\]/ === x
name = $1
if /= "no"$/ =~ x
v_disabled[name] = true
v_others.delete(name)
next
end
x.sub(dest, '= "$(DESTDIR)') x.sub(dest, '= "$(DESTDIR)')
else else
x x
end end
end end
v_others.compact!
if $install_name if $install_name
v_fast << " CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n" v_fast << " CONFIG[\"ruby_install_name\"] = \"" + $install_name + "\"\n"
@ -197,10 +205,16 @@ print(*v_others)
print <<EOS print <<EOS
CONFIG["rubylibdir"] = "$(rubylibprefix)/$(ruby_version)" CONFIG["rubylibdir"] = "$(rubylibprefix)/$(ruby_version)"
CONFIG["archdir"] = "$(rubylibdir)/$(arch)" CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
EOS
print <<EOS unless v_disabled["sitedir"]
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
EOS
print <<EOS unless v_disabled["vendordir"]
CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
EOS
print <<EOS
CONFIG["topdir"] = File.dirname(__FILE__) CONFIG["topdir"] = File.dirname(__FILE__)
MAKEFILE_CONFIG = {} MAKEFILE_CONFIG = {}
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}