kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb: change instance variable to global.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-08-07 05:19:29 +00:00
parent a438fce7e3
commit c260a0c70c
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Aug 7 14:08:44 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/mkmf.rb: change instance variable to global.
Sat Aug 7 13:59:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Aug 7 13:59:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/pathname/pathname.c (path_sub_ext): don't clobber shared string. * ext/pathname/pathname.c (path_sub_ext): don't clobber shared string.

8
lib/mkmf.rb
View file

@ -17,6 +17,7 @@ SRC_EXT = %w[c m].concat(CXX_EXT)
$static = nil $static = nil
$config_h = '$(arch_hdrdir)/ruby/config.h' $config_h = '$(arch_hdrdir)/ruby/config.h'
$default_static = $static $default_static = $static
$ignore_error = $nmake ? '' : ' 2> /dev/null || true'
unless defined? $configure_args unless defined? $configure_args
$configure_args = {} $configure_args = {}
@ -1813,7 +1814,6 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
mfile.print "install: install-so install-rb\n\n" mfile.print "install: install-so install-rb\n\n"
sodir = (dir = "$(RUBYARCHDIR)").dup sodir = (dir = "$(RUBYARCHDIR)").dup
mfile.print("install-so: ") mfile.print("install-so: ")
@ignore_error = $nmake ? '' : ' 2> /dev/null || true'
if target if target
f = "$(DLLIB)" f = "$(DLLIB)"
dest = "#{dir}/#{f}" dest = "#{dir}/#{f}"
@ -1821,7 +1821,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
if $extout if $extout
mfile.print "clean-so::\n" mfile.print "clean-so::\n"
mfile.print "\t@-$(RM) #{fseprepl[dest]}\n" mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n" mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n"
else else
mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n" mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n"
mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n" mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n"
@ -1862,7 +1862,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
unless dirs.empty? unless dirs.empty?
mfile.print("clean-rb#{sfx}::\n") mfile.print("clean-rb#{sfx}::\n")
for dir in dirs.sort_by {|d| -d.count('/')} for dir in dirs.sort_by {|d| -d.count('/')}
mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n") mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n")
end end
end end
end end
@ -2096,7 +2096,7 @@ distclean-so::
distclean: clean distclean-so distclean-rb-default distclean-rb distclean: clean distclean-so distclean-rb-default distclean-rb
\t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
\t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep}) \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{@ignore_error} \t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{$ignore_error}
realclean: distclean realclean: distclean
" "