なかだです。

At Mon, 13 May 2002 11:15:55 +0900,
Nobuyoshi-Nakada wrote:
> * RUBY_SO_NAMEがRUBY_INSTALL_NAMEから分離されたので、リソースファ
>   イル名に.dllを含める必要はなくなった

これだけだとリソースファイルのInternalNameとOriginalFilenameに
サフィックスが付かなくなるので、win32/resource.rbと煽りを受けて
cygwin/GNUmakefile.inも修正。


Index: cygwin/GNUmakefile.in =================================================================== RCS file: /cvs/ruby/src/ruby/cygwin/GNUmakefile.in,v retrieving revision 1.19 diff -u -2 -p -r1.19 GNUmakefile.in --- cygwin/GNUmakefile.in 2001/05/28 16:07:34 1.19 +++ cygwin/GNUmakefile.in 2002/05/14 11:33:08 @@ -17,8 +17,8 @@ endif WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_INSTALL_NAME).def -SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS) +SOLIBS := $(RUBY_SO_NAME).res.@OBJEXT@ $(SOLIBS) EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@) -$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ +$(LIBRUBY_SO): $(RUBYDEF) $(RUBY_SO_NAME).res.@OBJEXT@ $(LIBRUBY): $(LIBRUBY_SO) @@ -26,8 +26,8 @@ $(LIBRUBY): $(LIBRUBY_SO) @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb +$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb @@MINIRUBY@ $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ - -so_name=$(LIBRUBY_SO) \ + -so_name=$(RUBY_SO_NAME) \ . $(icondirs) $(srcdir)/win32 Index: win32/resource.rb =================================================================== RCS file: /cvs/ruby/src/ruby/win32/resource.rb,v retrieving revision 1.4 diff -u -2 -p -r1.4 resource.rb --- win32/resource.rb 2002/01/10 02:43:06 1.4 +++ win32/resource.rb 2002/05/14 13:05:30 @@ -9,5 +9,5 @@ fversion = "#{CONFIG['MAJOR']},#{CONFIG[ $ruby_name ||= CONFIG["RUBY_INSTALL_NAME"] $rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w') -$so_name ||= CONFIG["RUBY_SO_NAME"] + '.dll' +$so_name ||= CONFIG["RUBY_SO_NAME"] icons = {} @@ -50,5 +50,5 @@ end [$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', ruby_icon], [$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon], - [$so_name, '', 'VFT_DLL', dll_icons], + [$so_name, '.dll', 'VFT_DLL', dll_icons], ].each do |base, ext, type, icons| open(base + '.rc', "w") { |f|
-- --- 僕の前にBugはない。 --- 僕の後ろにBugはできる。 中田 伸悦