yugui	2009-04-12 23:02:09 +0900 (Sun, 12 Apr 2009)

  New Revision: 23175

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

  Log:
    merges r22777 from trunk into ruby_1_9_1.
    --
    * win32/Makefile.sub (miniruby.exe): workaround for a failure of
      mt.exe on Windows 7 beta.  [ruby-talk:330284]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/win32/Makefile.sub

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23174)
+++ ruby_1_9_1/ChangeLog	(revision 23175)
@@ -1,3 +1,8 @@
+Thu Mar  5 11:27:16 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/Makefile.sub (miniruby.exe): workaround for a failure of
+	  mt.exe on Windows 7 beta.  [ruby-talk:330284]
+
 Wed Mar  4 21:21:51 2009  Yusuke Endoh  <mame@t...>
 
 	* lib/thread.rb (SizedQueue#push): fix limit condition.
Index: ruby_1_9_1/win32/Makefile.sub
===================================================================
--- ruby_1_9_1/win32/Makefile.sub	(revision 23174)
+++ ruby_1_9_1/win32/Makefile.sub	(revision 23175)
@@ -264,7 +264,7 @@
 !if !defined(WINMAINOBJ)
 WINMAINOBJ    = winmain.$(OBJEXT)
 !endif
-ARCHMINIOBJS  = dmydln.$(OBJEXT)
+ARCHMINIOBJS  = dmydln.$(OBJEXT) miniruby.res
 LIBOBJS       = $(MISSING) $(LIBOBJS)
 
 !ifndef COMMON_LIBS
@@ -664,6 +664,9 @@
 		$(LDSHARED_1)
 		$(LDSHARED_2)
 
+miniruby.rc:
+		@exit > $@
+
 !if "$(PROGRAM)" != ""
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \
@@ -716,7 +719,7 @@
 
 distclean-local::
 		@$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
-		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+		@$(RM) miniruby.rc $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 		@-$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h
 		@-$(RMDIRS) $(arch_hdrdir:/=\)\ruby
 

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