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

ruby-changes:32405

From: nobu <ko1@a...>
Date: Thu, 2 Jan 2014 11:41:13 +0900 (JST)
Subject: [ruby-changes:32405] nobu:r44484 (trunk): mkrunnable.rb: fix DLL path on Windows

nobu	2014-01-02 11:41:06 +0900 (Thu, 02 Jan 2014)

  New Revision: 44484

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

  Log:
    mkrunnable.rb: fix DLL path on Windows
    
    * tool/mkrunnable.rb: DLL needs placed at same directory as
      executables on Windows.

  Modified files:
    trunk/tool/mkrunnable.rb
Index: tool/mkrunnable.rb
===================================================================
--- tool/mkrunnable.rb	(revision 44483)
+++ tool/mkrunnable.rb	(revision 44484)
@@ -104,7 +104,13 @@ goruby_install_name = "go" + ruby_instal https://github.com/ruby/ruby/blob/trunk/tool/mkrunnable.rb#L104
     ln_relative(ruby, "#{bindir}/#{ruby}")
   end
 end
-libruby = config.values_at("LIBRUBY_A", "LIBRUBY_SO")
+so = config["LIBRUBY_SO"]
+libruby = [config["LIBRUBY_A"]]
+if /\.dll\z/i =~ so
+  ln_relative(so, "#{bindir}/#{so}")
+else
+  libruby << so
+end
 libruby.concat(config["LIBRUBY_ALIASES"].split)
 libruby.each {|lib|ln_relative(lib, "#{libdir}/#{lib}")}
 ln_dir_relative("#{extout}/common", rubylibdir)

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

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