Revision

3180

Author

eloy.de.enige@gmail.com

Date

2009-12-31 03:11:44 -0800 (Thu, 31 Dec 2009)

Log Message

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.

For now just hacked it in, need to check upstream why this isn't the default.

Modified Paths

• MacRuby/trunk/lib/rubygems/commands/install_command.rb
• MacRuby/trunk/lib/rubygems/dependency_installer.rb
• MacRuby/trunk/lib/rubygems/installer.rb

Diff

--- MacRuby/trunk/lib/rubygems/commands/install_command.rb	2009-12-31 06:36:08 UTC (rev 3179)
+++ MacRuby/trunk/lib/rubygems/commands/install_command.rb	2009-12-31 11:11:44 UTC (rev 3180)
@@ -16,7 +16,7 @@
     defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
       :generate_rdoc => false,
       :generate_ri   => false,
-      :format_executable => false,
+      :format_executable => true, # MacRuby addition
       :test => false,
       :version => Gem::Requirement.default,
     })

--- MacRuby/trunk/lib/rubygems/dependency_installer.rb	2009-12-31 06:36:08 UTC (rev 3179)
+++ MacRuby/trunk/lib/rubygems/dependency_installer.rb	2009-12-31 11:11:44 UTC (rev 3180)
@@ -18,7 +18,7 @@
     :env_shebang => false,
     :domain => :both, # HACK dup
     :force => false,
-    :format_executable => false, # HACK dup
+    :format_executable => true, # MacRuby addition
     :ignore_dependencies => false,
     :security_policy => nil, # HACK NoSecurity requires OpenSSL.  AlmostNo? Low?
     :wrappers => true

--- MacRuby/trunk/lib/rubygems/installer.rb	2009-12-31 06:36:08 UTC (rev 3179)
+++ MacRuby/trunk/lib/rubygems/installer.rb	2009-12-31 11:11:44 UTC (rev 3180)
@@ -90,12 +90,13 @@
     @gem = gem
 
     options = {
-      :bin_dir      => nil,
-      :env_shebang  => false,
-      :exec_format  => false,
-      :force        => false,
-      :install_dir  => Gem.dir,
-      :source_index => Gem.source_index,
+      :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,
     }.merge options
 
     @env_shebang = options[:env_shebang]