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: bc9ae5b50a24
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ea8e4fb63b60
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 25, 2016

  1. Disable -X as there is too much verbosity in the build

    Jaroslav Tulach committed May 25, 2016
    Copy the full SHA
    127d73c View commit details
  2. Merging with most recent state of master branch

    Jaroslav Tulach committed May 25, 2016
    Copy the full SHA
    785aa61 View commit details
  3. Merge pull request #3925 from jtulach/MxWithoutDebug

    Disable -X as there is too much verbosity in the build
    eregon committed May 25, 2016
    Copy the full SHA
    ea8e4fb View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 mx.jruby/mx_jruby.py
1 change: 1 addition & 0 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -99,6 +99,7 @@ def build(self):
mx.run_maven(['-Pcomplete', '-DskipTests', '-Dtruffle.version=' + truffle_commit], cwd=rubyDir)
mx.run(['zip', '-d', 'maven/jruby-complete/target/jruby-complete-graal-vm.jar', 'META-INF/jruby.home/lib/*'], cwd=rubyDir)
mx.run(['bin/jruby', 'bin/gem', 'install', 'bundler', '-v', '1.10.6'], cwd=rubyDir)
mx.log('...finished build of {}'.format(self.subject))

def clean(self, forBuild=False):
if forBuild: