Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1aba62533d78
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac9eec26cdab
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 27, 2016

  1. Copy the full SHA
    9faf535 View commit details
  2. Copy the full SHA
    ac9eec2 View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 mx.jruby/mx_jruby.py
9 changes: 7 additions & 2 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -225,9 +225,14 @@ def build(self):
env['JRUBY_BUILD_MORE_QUIET'] = 'true'

mx.log("Building jruby-core with Maven")
mx.run_maven(['-q', '-DskipTests', maven_repo_arg, '-pl', 'core'], cwd=cwd, env=env)
# Also build lib for the gems which end in stdlib (like psych)
mx.run_maven(['-q', '-DskipTests', maven_repo_arg, '-pl', 'core,lib'], cwd=cwd, env=env)

# mx.run(['bin/jruby', 'bin/gem', 'install', 'bundler', '-v', '1.10.6'], cwd=cwd)
env = os.environ.copy()
gem_home = join(_suite.dir, 'lib', 'ruby', 'gems', 'shared')
env['GEM_HOME'] = gem_home
env['GEM_PATH'] = gem_home
mx.run(['bin/jruby', 'bin/gem', 'install', 'bundler', '-v', '1.10.6'], cwd=cwd, env=env)

mx.log('...finished build of {}'.format(self.subject))