ruby-dev

なかだです。

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はできる。
    中田 伸悦

Thread

Prev Next

In This Thread

Prev Next

[#16998] exit in extconf.rb — nobu.nakada@...

[#17002] strict prototype for c++ — Takaaki Tateishi <ttate@...>

[#17009] [PATCH] "unexpected return" for class C<1 — Minero Aoki <aamine@...>

[#17012] unbaranced PUSH_ITER/POP_ITER — Minero Aoki <aamine@...>

[#17013] building Ruby/DL takes forever — "Akinori MUSHA" <knu@...>

[#17016] proc{|a|}.arity again — Shin-ichiro HARA <sinara@...>

[#17017] 標準添付案 — Kazuhiro NISHIYAMA <zn@...>

[#17031] double acosh — WATANABE Hirofumi <eban@...>

[#17037] here document2 つで __LINE__ がずれる — Kazuhiro NISHIYAMA <zn@...>

[#17048] Dir.glob with escaped wildcard — nobu.nakada@...

[#17052] Re: [ruby-list:35051] Re: FILE_READPTR — nobu.nakada@...

[#17053] socket in Win32 — nobu.nakada@...

[#17054] — MAKISE Yoshitaro / 牧瀬 芳太郎 <makise@...>

[#17059] [PATCH] mswin32 configure — nobu.nakada@...

[#17060] rb_warn — Tadayoshi Funaba <tadf@...>

[#17081] #!ruby -v で二重表示 — Kazuhiro NISHIYAMA <zn@...>

[#17086] public, private — Wakou Aoyama <wakou@...>

[#17095] irb & jarh — Tanaka Akira <akr@...17n.org>

[#17108] Resource Database support on Ruby/Tk — nagai@...

[#17112] [Cleanup] rb_thread_select() — nobu.nakada@...

[#17122] Array#bsearch — Beyond <beyond@...>

[#17128] Thread: deadlock trouble — nagai@...

[#17134] argv[0] — Tanaka Akira <akr@...17n.org>

[#17144] Re: msvcrt — "U.Nakamura" <usa@...>

[#17154] [PATCH] IO#clone for duplex IO — nobu.nakada@...

[#17158] else without rescue — nobu.nakada@...

[#17161] [PATCH] font-lock on :something__ — nobu.nakada@...

[#17171] parsedate — Tadayoshi Funaba <tadf@...>

[#17179] コマンドラインオプションの順序制約 — Kazuhiro NISHIYAMA <zn@...>

[#17185] [PATCH] p(a <<- 2) — Minero Aoki <aamine@...>

[#17194] [RCR] Array#rotate{,!} — nobu.nakada@...

[#17208] Etc — Kazuhiro NISHIYAMA <zn@...>

[#17217] Re: load(filename, true) and global function — Wakou Aoyama <wakou@...>

[#17220] safe-level — nagai@...

[#17223] race condition on Queue#pop? — Tanaka Akira <akr@...17n.org>

[#17228] Re: [ruby-list:35305] Re: ((1.2)..(3.4)).to_a — matz@... (Yukihiro Matsumoto)

[#17238] Re: [ruby-list:35304] Re: ((1.2)..(3.4)).to_a — siena@... (Siena.)

[ruby-dev:17103] Re: [PATCH] mswin32 configure

Thread

In This Thread

[#17037] here document2 つで LINE がずれる — Kazuhiro NISHIYAMA <zn@...>

[#17054] — MAKISE Yoshitaro / 牧瀬芳太郎 <makise@...>