[前][次][番号順一覧][スレッド一覧]

ruby-changes:43895

From: nobu <ko1@a...>
Date: Fri, 19 Aug 2016 17:01:29 +0900 (JST)
Subject: [ruby-changes:43895] nobu:r55968 (trunk): scriptbin on cygwin

nobu	2016-08-19 17:01:20 +0900 (Fri, 19 Aug 2016)

  New Revision: 55968

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

  Log:
    scriptbin on cygwin
    
    * cygwin/GNUmakefile.in (scriptbin): enable on cygwin.

  Modified files:
    trunk/cygwin/GNUmakefile.in
    trunk/win32/stub.c
Index: win32/stub.c
===================================================================
--- win32/stub.c	(revision 55967)
+++ win32/stub.c	(revision 55968)
@@ -1,4 +1,5 @@ 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 55967)
+++ cygwin/GNUmakefile.in	(revision 55968)
@@ -13,9 +13,6 @@ 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)
@@ -32,6 +29,9 @@ else https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L29
 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,6 +116,17 @@ 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/

[前][次][番号順一覧][スレッド一覧]