k0kubun	2018-10-12 00:01:56 +0900 (Fri, 12 Oct 2018)

  New Revision: 65000

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

  Log:
    win32/Makefile.sub: install MJIT header and object
    
    to prefix. This is a retry of r64947. So this doesn't still make mswin MJIT
    on install directory succeed. One more step required.
    
    tool/rbinstall.rb: This change is needed to install headers correctly since
    the extensions are .obj and .pch, not .h

  Modified files:
    trunk/tool/rbinstall.rb
    trunk/win32/Makefile.sub
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 64999)
+++ tool/rbinstall.rb	(revision 65000)
@@ -404,6 +404,8 @@ end https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L404
 install?(:ext, :arch, :hdr, :'arch-hdr', :'hdr-arch') do
   prepare "extension headers", archhdrdir
   install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode)
+  install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "rb_mjit_header-*.obj", :mode => $data_mode)
+  install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "rb_mjit_header-*.pch", :mode => $data_mode)
 end
 install?(:ext, :comm, :'ext-comm') do
   prepare "extension scripts", rubylibdir
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 64999)
+++ win32/Makefile.sub	(revision 65000)
@@ -1277,6 +1277,8 @@ clean-local:: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1277
 	$(Q)$(RM) $(MJIT_HEADER_INSTALL_DIR)/rb_mjit_header-*.pch
 	$(Q)$(RM) $(MJIT_HEADER_INSTALL_DIR)/rb_mjit_header-*.$(OBJEXT)
 	-$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) 2> $(NULL) || exit 0
+	$(Q)$(RM) $(arch_hdrdir)/rb_mjit_header-*.pch
+	$(Q)$(RM) $(arch_hdrdir)/rb_mjit_header-*.$(OBJEXT)
 
 # Non-mswin environment is not using prebuilt precompiled header because upgrading compiler
 # or changing compiler options may break MJIT so build (currently only by --jit-debug though).
@@ -1299,6 +1301,9 @@ $(MJIT_PRECOMPILED_HEADER): $(MJIT_PRECO https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1301
 	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
 	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME) $@
 	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT) $(MJIT_HEADER_INSTALL_DIR)/$(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT)
+	$(Q) $(MAKEDIRS) $(arch_hdrdir)
+	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME) $(arch_hdrdir)/$(MJIT_PRECOMPILED_HEADER_NAME)
+	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT) $(arch_hdrdir)/$(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT)
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc mjit_compile.inc

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