Permalink
Browse files

Make gem installation ignore GEM_HOME

  • Loading branch information...
1 parent 066c6db commit 308ffe9ca66fe0de94d0d96c5a0dfb6152c3f8a5 @enebo enebo committed Sep 24, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −1 antlib/dist.xml
  2. +3 −2 rakelib/gem_installers.rake
View
@@ -118,7 +118,7 @@
</copy>
<unzip-native-libs destination.dir="${dist.stage.bin.dir}/lib/native"/>
<fixEOLs dist-stage-dir="${dist.stage.bin.dir}"/>
- <rake task="install_dist_gems"/>
+ <rake task="install_dist_gems['${dist.stage.bin.dir}']"/>
<!-- wipe out jar and run jar-dist here to ensure it's the last thing before tarring
see JRUBY-5429. -->
@@ -13,8 +13,9 @@ task :install_dev_gems do
end
task :install_dist_gems, :temp_jruby_home do |t, args|
- gem_install(COMPLETE_JAR_GEMS, "--ignore-dependencies --env-shebang") do
- sysproperty :key => "jruby.home", :value => (args[:temp_jruby_home] || DIST_STAGE_BIN_DIR)
+ location = (args[:temp_jruby_home] || DIST_STAGE_BIN_DIR)
+ gem_install(COMPLETE_JAR_GEMS, "--ignore-dependencies --env-shebang --install-dir=#{location}/lib/ruby/gems") do
+ sysproperty :key => "jruby.home", :value => location
end
end

0 comments on commit 308ffe9

Please sign in to comment.