From: "Nobuyoshi.Nakada" <nobu.nakada@...>
Date: 2000-08-02T23:03:03+09:00
Subject: [ruby-dev:10509] Re: environment variables

なかだです。

At Wed, 2 Aug 2000 22:29:04 +0900
Katsuyuki Komatsu <komatsu@sarion.co.jp> wrote:
> >   RUBY_SO_NAME のデフォルトを cygwin に合わせたのと ruby.c の変更もあっ
> > たので新しいのを出します。
> 
> Makefile.subのrubywとかのエントリはなかなかいいですね。

  なんかめんどくさくなって。(^^;

> win32/README.win32の、
> 
> (2) Change ((|RUBY_INSTALL_NAME|)), ((|RUBYW_INSTALL_NAME|)) and
>     ((|RUBY_SO_NAME|)) in (({Makefile})) if you want to change the name
>     of the executable files.
> 
> ですが、RUBYW_INSTALL_NAMEはMakefileに出力されていないから、
> ちょっとうそかな？

  たしかに。

> ところで、cygwinで出るこのwarningは気にしなくていいですか？
> 
> bash-2.04$ make rubyw15.exe
> windres --include-dir . --include-dir . --include-dir /src/ruby-1.5.5/win32 rubyw15.rc rubyw15.res.o
> gcc -mwindows -g -O2    main.o  rubyw15.res.o -L. -lruby15 -lcrypt   -o rubyw15.exe
> /usr/bin/ld: warning: cannot find entry symbol _WinMainCRTStartup; defaulting to 00401000
> bash-2.04$ 

  能條さんのとこから持ってきました。


diff -pu devel/cygwin/GNUmakefile.in~ devel/cygwin/GNUmakefile.in
--- devel/cygwin/GNUmakefile.in~	Wed Aug  2 20:11:34 2000
+++ devel/cygwin/GNUmakefile.in	Wed Aug  2 22:51:42 2000
@@ -31,7 +31,8 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_
 $(PROGRAM): $(RUBY_INSTALL_NAME).res.o
 $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.o
 	@rm -f $@
-	$(PURIFY) $(CC) -mwindows $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
+	$(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
+	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 $(RUBYDEF): $(LIBRUBY_A)
 	echo EXPORTS > $(RUBYDEF)
diff -pu devel/win32/README.win32~ devel/win32/README.win32
--- devel/win32/README.win32~	Wed Aug  2 21:04:30 2000
+++ devel/win32/README.win32	Wed Aug  2 22:45:31 2000
@@ -24,9 +24,10 @@
 
 (1) Execute win32\configure.bat on your build directory.
 
-(2) Change ((|RUBY_INSTALL_NAME|)), ((|RUBYW_INSTALL_NAME|)) and
-    ((|RUBY_SO_NAME|)) in (({Makefile})) if you want to change the name
-    of the executable files.
+(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
+    if you want to change the name of the executable files. 
+    And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
+    executable without console window if also you want.
 
 (3) Run `((%nmake%))'
 
@@ -53,9 +54,9 @@ Any icon files(*.ico) in the build direc
 ((|icondirs|)) make variable and (({win32})) directory under the ruby
 source directory will be included in DLL or executable files, according
 to their base names.
-    $(RUBY_INSTALL_NAME).ico  --> $(RUBY_INSTALL_NAME).exe
-    $(RUBYW_INSTALL_NAME).ico --> $(RUBYW_INSTALL_NAME).exe
-    the others                --> $(RUBY_SO_NAME).dll
+    $(RUBY_INSTALL_NAME).ico, ruby.ico   --> $(RUBY_INSTALL_NAME).exe
+    $(RUBYW_INSTALL_NAME).ico, rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
+    the others                           --> $(RUBY_SO_NAME).dll
 
 == Build examples
 
diff -pu devel/win32/resource.rb~ devel/win32/resource.rb
--- devel/win32/resource.rb~	Tue Aug  1 11:44:01 2000
+++ devel/win32/resource.rb	Wed Aug  2 22:30:16 2000
@@ -28,11 +28,18 @@ else
   ARGV.each {|i| icons.find(i)}
 end
 
-if ruby_icon = icons.delete($ruby_name)
-  ruby_icon = "1 ICON DISCARDABLE "+ruby_icon.dump+"\n"
+ruby_icon = rubyw_icon = nil
+[$ruby_name, 'ruby'].each do |i|
+  if i = icons.delete(i)
+    ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
+    break
+  end
 end
-if rubyw_icon = icons.delete($rubyw_name)
-  rubyw_icon = "1 ICON DISCARDABLE "+rubyw_icon.dump+"\n"
+[$rubyw_name, 'rubyw'].each do |i|
+  if i = icons.delete(i)
+    rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
+    break
+  end
 end
 dll_icons = []
 icons.keys.sort.each do |i|
diff -pu devel/win32/setup.mak~ devel/win32/setup.mak
--- devel/win32/setup.mak~	Wed Aug  2 18:12:28 2000
+++ devel/win32/setup.mak	Wed Aug  2 22:02:05 2000
@@ -18,7 +18,7 @@ Makefile:
 	@echo> $@ ### makefile for ruby $(OS) ###
 	@echo>> $@ srcdir = $(srcdir:\=/)
 	@echo>> $@ RUBY_INSTALL_NAME = ruby
-	@echo>> $@ RUBY_SO_NAME = ruby.$(OS)
+	@echo>> $@ RUBY_SO_NAME = $$(RUBY_INSTALL_NAME).$(OS)
 	@echo>> $@ !INCLUDE $$(srcdir)/win32/Makefile.sub
 
 config.h config.status: $(srcdir)/win32/$$@.in


http://www.geocities.co.jp/SiliconValley-Bay/4076/archive/win-20000802-2.patch.gz
Last-Modified: Wed, 02 Aug 2000 13:33:47 GMT
Content-Length: 12377

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