nobu	2016-01-09 11:46:31 +0900 (Sat, 09 Jan 2016)

  New Revision: 53480

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53480

  Log:
    fix rc files conflict in parallel build
    
    * cygwin/GNUmakefile.in (%.rc): generate .rc files separately to
      get rid of conflict in parallel build.

  Modified files:
    trunk/cygwin/GNUmakefile.in
    trunk/win32/resource.rb
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 53479)
+++ cygwin/GNUmakefile.in	(revision 53480)
@@ -54,11 +54,11 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NA https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L54
 	$(ECHO) compiling $@
 	$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 	$(ECHO) generating $@
 	$(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-	  -so_name=$(DLL_BASE_NAME) \
+	  -so_name=$(DLL_BASE_NAME) -output=$(*F) \
 	  . $(icondirs) $(srcdir)/win32
 
 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
Index: win32/resource.rb
===================================================================
--- win32/resource.rb	(revision 53479)
+++ win32/resource.rb	(revision 53480)
@@ -52,6 +52,7 @@ end https://github.com/ruby/ruby/blob/trunk/win32/resource.rb#L52
   [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon],
   [$so_name,     '.dll',           'VFT_DLL', 'DLL', dll_icons.join],
 ].each do |base, ext, type, desc, icon|
+  next if $output and $output != base
   open(base + '.rc', "w") { |f|
     f.binmode if /mingw/ =~ RUBY_PLATFORM
 

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