kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/Makefile.sub (scriptbin.mk): fix generated rules.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-29 13:53:16 +00:00
parent 8fba2b63ec
commit f0a2b08b44
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,4 +1,6 @@
Mon Nov 29 22:52:23 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Nov 29 22:53:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (scriptbin.mk): fix generated rules.
* win32/win32.c (rb_w32_write_console): fix argument type. * win32/win32.c (rb_w32_write_console): fix argument type.

8
win32/Makefile.sub
View file

@ -361,8 +361,8 @@ stub: $(STUBPROGRAM)
!endif !endif
!if [for %I in ($(srcdir:/=\)\bin\*) do @for %J in (\ !if [for %I in ($(srcdir:/=\)\bin\*) do @for %J in (\
"%~nI.exe: $$(srcdir)/bin/%~nI" \ "%~nI.exe: $$(srcdir)/bin/%~nI" \
" @echo generating $$@" \ " @echo generating $$(@)" \
" @copy /b $$(STUBPROGRAM) +<< +$$(srcdir:/=\)\bin\%~nI $$@ > nul" \ " @copy /b $$(STUBPROGRAM) +<< +$$(srcdir:/=\)\bin\%~nI $$(@) > nul" \
"" "<<" "" \ "" "<<" "" \
) do @echo.%~J>>scriptbin.mk] ) do @echo.%~J>>scriptbin.mk]
!else !else
@ -404,7 +404,7 @@ test-rubyspec-precheck:
@exit 1 @exit 1
!endif !endif
$(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in $(MKFILES): $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in
$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args) $(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
@echo $(MKFILES) should be updated, re-run $(MAKE). @echo $(MKFILES) should be updated, re-run $(MAKE).
@exit 1 @exit 1
@ -843,7 +843,7 @@ $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
!endif !endif
!if "$(STUBPROGRAM)" != "" !if "$(STUBPROGRAM)" != ""
$(STUBPROGRAM): stub.$(OBJEXT) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(STUBPROGRAM): stub.$(OBJEXT) $(LIBRUBY) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(ECHO) linking $(@:\=/) $(ECHO) linking $(@:\=/)
$(Q) $(PURIFY) $(CC) stub.$(OBJEXT) $(RUBY_INSTALL_NAME).res \ $(Q) $(PURIFY) $(CC) stub.$(OBJEXT) $(RUBY_INSTALL_NAME).res \
$(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS) $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS)