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

Commits on May 26, 2016

  1. Use special Maven local repository dir to isolate in parallel running…

    … mx builds
    Jaroslav Tulach committed May 26, 2016
    Copy the full SHA
    26a4fca View commit details
  2. Copy the full SHA
    6dbf62c View commit details
  3. Using maven_version_arg and maven_repo_arg instead of repeating the s…

    …trings
    Jaroslav Tulach committed May 26, 2016
    Copy the full SHA
    cbc6e91 View commit details
  4. Removing commented out code

    Jaroslav Tulach committed May 26, 2016
    Copy the full SHA
    e02a08f View commit details
  5. Merge pull request #3931 from jtulach/MavenRepo

    [Truffle] Use private maven repo instead of $HOME/.m2
    eregon committed May 26, 2016
    Copy the full SHA
    64ba959 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 mx.jruby/mx_jruby.py
12 changes: 7 additions & 5 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@ def build(self):
mx.log('...perform build of {}'.format(self.subject))

rubyDir = _suite.dir
mavenDir = os.path.join(rubyDir, 'mxbuild', 'mvn')

# HACK: since the maven executable plugin does not configure the
# java executable that is used we unfortunately need to append it to the PATH
@@ -80,23 +81,24 @@ def build(self):

truffle = mx.suite('truffle')
truffle_commit = truffle.vc.parent(truffle.dir)
maven_version_arg = '-Dtruffle.version=' + truffle_commit
maven_repo_arg = '-Dmaven.repo.local=' + mavenDir

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

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

# Build jruby-truffle

mx.run(['find', '.'], nonZeroIsFatal=False, cwd=rubyDir)
mx.run_maven(['--version'], nonZeroIsFatal=False, cwd=rubyDir)
mx.run_maven(['--version', maven_repo_arg], nonZeroIsFatal=False, cwd=rubyDir)

mx.log('Building without tests')

mx.run_maven(['-DskipTests', '-Dtruffle.version=' + truffle_commit], cwd=rubyDir)
mx.run_maven(['-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir)

mx.log('Building complete version')

mx.run_maven(['-Pcomplete', '-DskipTests', '-Dtruffle.version=' + truffle_commit], cwd=rubyDir)
mx.run_maven(['-Pcomplete', '-DskipTests', maven_version_arg, maven_repo_arg], 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))