[ruby-dev:13572] [PATCH] icondirs on Windows

なかだです。

  今まで気づいてませんでしたが、Windows で icondirs を指定する
とリソースのコンパイルに失敗します。


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	2001/06/11 11:29:59
@@ -24,5 +24,5 @@ $(LIBRUBY): $(LIBRUBY_SO)
 
 %.res.@OBJEXT@: %.rc
-	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+	@WINDRES@ $< $@
 
 $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
Index: win32/Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/win32/Makefile.sub,v
retrieving revision 1.12
diff -u -2 -p -r1.12 Makefile.sub
--- win32/Makefile.sub	2001/06/09 07:41:44	1.12
+++ win32/Makefile.sub	2001/06/11 16:22:13
@@ -24,5 +24,4 @@ icondirs=$(ICONDIRS)
 !if defined(icondirs)
 icondirs=$(icondirs:\=/)
-iconinc=-I$(icondirs)
 !endif
 ###############
@@ -237,5 +236,5 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_
 
 .rc.res:
-	$(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/)
+	$(RC) $(RFLAGS) -fo$@ $(<:\=/)
 
 {$(srcdir)}.y.c:
Index: win32/resource.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/win32/resource.rb,v
retrieving revision 1.3
diff -u -2 -p -r1.3 resource.rb
--- win32/resource.rb	2001/05/13 14:51:45	1.3
+++ win32/resource.rb	2001/06/11 11:29:18
@@ -14,6 +14,7 @@ icons = {}
 def icons.find(path)
   if File.directory?(path)
-    Dir.open(File.expand_path(path)) do |d|
-      d.grep(/\.ico$/i) {|i| self[$`] = i}
+    path = File.expand_path(path)
+    Dir.open(path) do |d|
+      d.grep(/\.ico$/i) {|i| self[$`] = File.join(path, i)}
     end
   else
@@ -49,5 +50,5 @@ end
 [ # base name    extension         file type  icons
   [$ruby_name,   CONFIG["EXEEXT"], 'VFT_APP', ruby_icon],
-  [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon],
+  [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon || ruby_icon],
   [$so_name,     '',               'VFT_DLL', dll_icons],
 ].each do |base, ext, type, icons|


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦