nobu	2016-08-19 17:32:16 +0900 (Fri, 19 Aug 2016)

  New Revision: 55969

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55969

  Log:
    Revert r55968 "scriptbin on cygwin"
    
    win32/stub.c only works with malloced argv as win32/win32.c, to
    realloc it.

  Modified files:
    trunk/cygwin/GNUmakefile.in
    trunk/win32/stub.c
Index: win32/stub.c
===================================================================
--- win32/stub.c	(revision 55968)
+++ win32/stub.c	(revision 55969)
@@ -1,5 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/win32/stub.c#L1
 #include <ruby.h>
-#include <windows.h>
 static void stub_sysinit(int *argc, char ***argv);
 #define ruby_sysinit stub_sysinit
 #include <main.c>
Index: cygwin/GNUmakefile.in
===================================================================
--- cygwin/GNUmakefile.in	(revision 55968)
+++ cygwin/GNUmakefile.in	(revision 55969)
@@ -13,6 +13,9 @@ else https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L13
   DLL_BASE_NAME := $(RUBY_SO_NAME)
   DLLWRAP += -mno-cygwin
   VPATH := $(VPATH):$(srcdir)/win32
+  STUBPROGRAM = rubystub$(EXEEXT)
+  IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
+  SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*))))
 endif
 
 ifneq ($(ENABLE_SHARED),yes)
@@ -29,9 +32,6 @@ else https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L32
 endif
 
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-STUBPROGRAM = rubystub$(EXEEXT)
-IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
-SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*))))
 
 -include uncommon.mk
 
@@ -116,17 +116,6 @@ ifeq (@target_os@,cygwin) https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L116
 cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF)
 	$(ECHO) generating $@
 	$(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
-
-win32/stub.@OBJEXT@: $(TIMESTAMPDIR)/.win32.time
-
-$(TIMESTAMPDIR)/.win32.time:
-	$(Q) $(MAKEDIRS) win32 $(@D)
-	@exit > $@
-
-clean-platform: clean-win32
-clean-win32:
-	$(Q) $(RM) $(TIMESTAMPDIR)/.win32.time
-	-$(Q) $(RMDIR) win32 2> $(NULL) || exit 0
 endif
 
 clean-local::

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/