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

ruby-changes:37470

From: nobu <ko1@a...>
Date: Mon, 9 Feb 2015 16:36:30 +0900 (JST)
Subject: [ruby-changes:37470] nobu:r49551 (trunk): make-snapshot: no loading unexpected libraries

nobu	2015-02-09 16:36:16 +0900 (Mon, 09 Feb 2015)

  New Revision: 49551

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

  Log:
    make-snapshot: no loading unexpected libraries
    
    * tool/make-snapshot (package): get rid of loading unbundled and
      unexpected libraries.  [ruby-core:67977] [Bug #10822]

  Modified files:
    trunk/ChangeLog
    trunk/tool/make-snapshot
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49550)
+++ ChangeLog	(revision 49551)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Feb  9 16:36:12 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/make-snapshot (package): get rid of loading unbundled and
+	  unexpected libraries.  [ruby-core:67977] [Bug #10822]
+
 Sun Feb  8 20:09:37 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* lib/net/http/header.rb: pass header names as symbols.
Index: tool/make-snapshot
===================================================================
--- tool/make-snapshot	(revision 49550)
+++ tool/make-snapshot	(revision 49551)
@@ -283,7 +283,10 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L283
       }
       FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
       File.open("#{hdrdir}/config.h", "w") {}
-      miniruby = ENV['MINIRUBY'] + " -I. -rcross"
+      FileUtils.mkpath(defaults = "#{extout}/rubygems/defaults")
+      File.open("#{defaults}/operating_system.rb", "w") {}
+      File.open("#{defaults}/ruby.rb", "w") {}
+      miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross"
       mk = IO.read("Makefile.in").gsub(/^@.*\n/, '').gsub(/@([A-Za-z_]\w*)@/) {ENV[$1]}
       mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
       cmd = %W[make -f -

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

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