[前][次][番号順一覧][スレッド一覧]

ruby-changes:16901

From: naruse <ko1@a...>
Date: Sat, 7 Aug 2010 14:30:44 +0900 (JST)
Subject: [ruby-changes:16901] Ruby:r28897 (trunk): * lib/mkmf.rb: change instance variable to global.

naruse	2010-08-07 14:19:29 +0900 (Sat, 07 Aug 2010)

  New Revision: 28897

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28897

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

  Modified files:
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28896)
+++ ChangeLog	(revision 28897)
@@ -1,3 +1,7 @@
+Sat Aug  7 14:08:44 2010  NARUSE, Yui  <naruse@r...>
+
+	* lib/mkmf.rb: change instance variable to global.
+
 Sat Aug  7 13:59:19 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/pathname/pathname.c (path_sub_ext): don't clobber shared string.
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 28896)
+++ lib/mkmf.rb	(revision 28897)
@@ -17,6 +17,7 @@
 $static = nil
 $config_h = '$(arch_hdrdir)/ruby/config.h'
 $default_static = $static
+$ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 
 unless defined? $configure_args
   $configure_args = {}
@@ -1813,7 +1814,6 @@
   mfile.print "install: install-so install-rb\n\n"
   sodir = (dir = "$(RUBYARCHDIR)").dup
   mfile.print("install-so: ")
-  @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
   if target
     f = "$(DLLIB)"
     dest = "#{dir}/#{f}"
@@ -1821,7 +1821,7 @@
     if $extout
       mfile.print "clean-so::\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
       mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n"
       mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n"
@@ -1862,7 +1862,7 @@
       unless dirs.empty?
         mfile.print("clean-rb#{sfx}::\n")
         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
@@ -2096,7 +2096,7 @@
 distclean: clean distclean-so distclean-rb-default distclean-rb
 \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})
-\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{@ignore_error}
+\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{$ignore_error}
 
 realclean: distclean
 "

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]