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

Commits on Jun 28, 2016

  1. [Truffle] Fix race condition in mx build.

    @chumer
    chumer committed Jun 28, 2016
    Copy the full SHA
    82deb4a View commit details

  2. Merge pull request #3982 from chumer/fix_mx_ruby_build2 

    [Truffle] Fix race condition in mx build.
    @chrisseaton
    chrisseaton authored Jun 28, 2016
    Copy the full SHA
    4c69fe4 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 mx.jruby/mx_jruby.py
  2. +1 −1 mx.jruby/suite.py
4 changes: 2 additions & 2 deletions mx.jruby/mx_jruby.py
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ def __init__(self, suite, name, deps, workingSets, theLicense, **args):
def source_dirs(self):
return []

def output_dir(self):
def output_dir(self, relative=False):
dir = os.path.join(_suite.dir, self.prefix)
return dir.rstrip('/')

@@ -101,7 +101,7 @@ def build(self):
maven_version_arg = '-Dtruffle.version=' + truffle_commit
maven_repo_arg = '-Dmaven.repo.local=' + mavenDir

mx.run_mx(['maven-install', '--repo', mavenDir], suite=truffle)
mx.run_mx(['maven-install', '--repo', mavenDir, '--only', 'TRUFFLE_API,TRUFFLE_DEBUG'], suite=truffle)

open(os.path.join(rubyDir, 'VERSION'), 'w').write('graal-vm\n')

2 changes: 1 addition & 1 deletion mx.jruby/suite.py
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
# GNU Lesser General Public License version 2.1

suite = {
"mxversion": "5.6.6",
"mxversion": "5.31.4",
"name": "jrubytruffle",
"defaultLicense": "EPL",