[ruby-dev:12673] patch for mswin32

なかだです。

  そろそろ Windows もいじり納めなので、mswin32 版環境関係を見直
してみました。とりあえずこの2点だけ。

  * VC は -o オプションを公式(?)にはサポートしていない(Alpha で
    は実際に動かない)ので、-Fe を使う。

  * win32/Makefile.sub の clean などで rm ではなく del を使う。

  あと出してないパッチは autoconf とかスクリプトの EXE 化とかあ
りますが、このへんになると果たして使う人がいるかどうか。


Index: ext/extmk.rb.in
===================================================================
RCS file: /cvs/ruby/src/ruby/ext/extmk.rb.in,v
retrieving revision 1.38
diff -u -2 -p -r1.38 extmk.rb.in
--- ext/extmk.rb.in	2001/02/26 05:29:02	1.38
+++ ext/extmk.rb.in	2001/03/25 03:42:16
@@ -69,5 +69,10 @@ else
   CFLAGS = "@CFLAGS@"
 end
-LINK = "@CC@ -o conftest -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@"
+if /mswin32/ =~ RUBY_PLATFORM
+  OUTFLAG = '-Fe'
+else
+  OUTFLAG = '-o '
+end
+LINK = "@CC@ #{OUTFLAG}conftest -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@"
 CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir %s %s %s conftest.c"
 
@@ -540,5 +545,5 @@ $(DLLIB): $(OBJS)
       end
     end
-    mfile.print "\t$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
+    mfile.print "\t$(LDSHARED) $(DLDFLAGS) #{OUTFLAG}$(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
   elsif RUBY_PLATFORM == "m68k-human"
     mfile.printf "\
Index: mkmf.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/mkmf.rb,v
retrieving revision 1.44
diff -u -2 -p -r1.44 mkmf.rb
--- lib/mkmf.rb	2001/03/13 05:45:11	1.44
+++ lib/mkmf.rb	2001/03/25 03:58:51
@@ -44,5 +44,10 @@ else
 end
 
-LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
+if /mswin32/ =~ RUBY_PLATFORM
+  OUTFLAG = '-Fe'
+else
+  OUTFLAG = '-o '
+end
+LINK = "#{CONFIG['CC']} #{OUTFLAG}conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
 CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c"
 
@@ -523,5 +528,5 @@ EOMF
       end
     end
-    mfile.print "\t$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
+    mfile.print "\t$(LDSHARED) $(DLDFLAGS) #{OUTFLAG}$(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
   elsif not File.exist?(target + ".c") and not File.exist?(target + ".cc")
     mfile.print "$(DLLIB): $(OBJS)\n"
Index: Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/win32/Makefile.sub,v
retrieving revision 1.9
diff -u -2 -p -r1.9 Makefile.sub
--- win32/Makefile.sub	2000/12/22 09:00:23	1.9
+++ win32/Makefile.sub	2001/03/25 09:40:58
@@ -122,13 +122,13 @@ miniruby$(EXEEXT):	$(OBJS) $(MAINOBJ) $(
 		@echo $(EXTOBJS)
 		@echo $(LIBS)
-		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(OBJS) $(LIBS) -o $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(OBJS) $(LIBS) -Fe$@
 
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $*.res
 		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $*.res \
-			-o $@ $(LIBRUBYARG) -link /STACK:$(STACK)
+			-Fe$@ $(LIBRUBYARG) -link /STACK:$(STACK)
 
 $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $*.res
 		$(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) $(WINMAINOBJ) $*.res \
-			-o $@ $(LIBRUBYARG) -link /STACK:$(STACK) /SUBSYSTEM:Windows
+			-Fe$@ $(LIBRUBYARG) -link /STACK:$(STACK) /SUBSYSTEM:Windows
 
 $(LIBRUBY_A):	$(OBJS) dmyext.obj
@@ -141,9 +141,9 @@ $(LIBRUBY_SO):	$(LIBRUBY_A) $(EXTOBJS) $
 		set LIB=./win32;$(ORGLIBPATH)
 		$(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $@.res $(LIBS) \
-			-o $@ -link /DLL /DEF:$(RUBYDEF)
+			-Fe$@ -link /DLL /DEF:$(RUBYDEF)
 
 !if "$(LIBRUBY_SO)" != "rubymw.dll"
 rubymw.dll:	$(LIBRUBY)
-		$(CC) -nologo $(EXTOBJS) $(LIBRUBY) -o $@ -link /DLL /DEF:$(RUBYDEF)
+		$(CC) -nologo $(EXTOBJS) $(LIBRUBY) -Fe$@ -link /DLL /DEF:$(RUBYDEF)
 !endif
 
@@ -154,19 +154,48 @@ install:	rbconfig.rb
 		.\miniruby.exe $(srcdir)/instruby.rb $(DESTDIR)
 
-clean:;		@rm -f $(OBJS) $(LIBRUBY_A) $(MAINOBJ) rbconfig.rb
-		@rm -f ext/extinit.c ext/extinit.obj ext/vc*.pdb *.obj *.res
+clean:
+		@if exist $(LIBRUBY_A) del $(LIBRUBY_A)
+		@if exist $(MAINOBJ) del $(MAINOBJ)
+		@if exist rbconfig.rb del rbconfig.rb
+		@if exist ext\extinit.c del ext\extinit.c
+		@if exist ext\extinit.obj del ext\extinit.obj
+		@if exist ext\vc*.pdb del ext\vc*.pdb
+		@if exist *.obj del *.obj
+		@if exist *.res del *.res
 		@-.\miniruby$(EXEEXT) -Cext extmk.rb clean
 
 distclean:	clean
-		@rm -f Makefile ext/extmk.rb config.h
-		@rm -f ext/config.cache config.cache config.log config.status
-		@rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp
-		@rm -f *.map *.pdb *.ilk *.exp $(RUBYDEF)
-		@rm -f $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc
-		@rm -f $(PROGRAM) $(WPROGRAM) $(LIBRUBY_SO) $(LIBRUBY) miniruby$(EXEEXT)
+		@if exist Makefile del Makefile
+		@if exist ext\extmk.rb del ext\extmk.rb
+		@if exist config.h del config.h
+		@if exist ext\config.cache del ext\config.cache
+		@if exist config.cache del config.cache
+		@if exist config.log del config.log
+		@if exist config.status del config.status
+		@if exist *~ del *~
+		@if exist *.bak del *.bak
+		@if exist *.stackdump del *.stackdump
+		@if exist *.core del *.core
+		@if exist gmon.out del gmon.out
+		@if exist y.tab.c del y.tab.c
+		@if exist y.output del y.output
+		@if exist *.map del *.map
+		@if exist *.pdb del *.pdb
+		@if exist *.ilk del *.ilk
+		@if exist *.exp del *.exp
+		@if exist $(RUBYDEF) del $(RUBYDEF)
+		@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
+		@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
+		@if exist $(LIBRUBY_SO).rc del $(LIBRUBY_SO).rc
+		@if exist $(PROGRAM) del $(PROGRAM)
+		@if exist $(WPROGRAM) del $(WPROGRAM)
+		@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
+		@if exist $(LIBRUBY) del $(LIBRUBY)
+		@if exist ext\nul if not exist ext\* rmdir ext
+		@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
 
 realclean:	distclean
-		@rm -f parse.c
-		@rm -f lex.c
+		@if exist parse.c del parse.c
+		@if exist lex.c del lex.c
 
 test:		miniruby$(EXEEXT)


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