[macruby-changes] [3313] MacRuby/trunk/lib/rubygems

[source_changes at macosforge.org]

Revision: 3313
          http://trac.macosforge.org/projects/ruby/changeset/3313
Author:   eloy.de.enige at gmail.com
Date:     2010-01-20 13:32:34 -0800 (Wed, 20 Jan 2010)
Log Message:
-----------
Revert "Make RubyGems use ?\226?\128?\152--format-executable?\226?\128?\153 by default, so binaries get installed with the ?\226?\128?\152mac?\226?\128?\153 prefix."

This reverts commit 3180.

Modified Paths:
--------------
    MacRuby/trunk/lib/rubygems/commands/install_command.rb
    MacRuby/trunk/lib/rubygems/dependency_installer.rb
    MacRuby/trunk/lib/rubygems/installer.rb

Modified: MacRuby/trunk/lib/rubygems/commands/install_command.rb
===================================================================
--- MacRuby/trunk/lib/rubygems/commands/install_command.rb	2010-01-20 12:20:38 UTC (rev 3312)
+++ MacRuby/trunk/lib/rubygems/commands/install_command.rb	2010-01-20 21:32:34 UTC (rev 3313)
@@ -16,7 +16,7 @@
     defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
       :generate_rdoc => false,
       :generate_ri   => false,
-      :format_executable => true, # MacRuby addition
+      :format_executable => false,
       :test => false,
       :version => Gem::Requirement.default,
     })

Modified: MacRuby/trunk/lib/rubygems/dependency_installer.rb
===================================================================
--- MacRuby/trunk/lib/rubygems/dependency_installer.rb	2010-01-20 12:20:38 UTC (rev 3312)
+++ MacRuby/trunk/lib/rubygems/dependency_installer.rb	2010-01-20 21:32:34 UTC (rev 3313)
@@ -18,7 +18,7 @@
     :env_shebang => false,
     :domain => :both, # HACK dup
     :force => false,
-    :format_executable => true, # MacRuby addition
+    :format_executable => false, # HACK dup
     :ignore_dependencies => false,
     :security_policy => nil, # HACK NoSecurity requires OpenSSL.  AlmostNo? Low?
     :wrappers => true

Modified: MacRuby/trunk/lib/rubygems/installer.rb
===================================================================
--- MacRuby/trunk/lib/rubygems/installer.rb	2010-01-20 12:20:38 UTC (rev 3312)
+++ MacRuby/trunk/lib/rubygems/installer.rb	2010-01-20 21:32:34 UTC (rev 3313)
@@ -90,13 +90,12 @@
     @gem = gem
 
     options = {
-      :bin_dir           => nil,
-      :env_shebang       => false,
-      :exec_format       => false,
-      :force             => false,
-      :format_executable => true, # MacRuby addition
-      :install_dir       => Gem.dir,
-      :source_index      => Gem.source_index,
+      :bin_dir      => nil,
+      :env_shebang  => false,
+      :exec_format  => false,
+      :force        => false,
+      :install_dir  => Gem.dir,
+      :source_index => Gem.source_index,
     }.merge options
 
     @env_shebang = options[:env_shebang]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100120/86592ca6/attachment.html>