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

Commits on Jun 29, 2016

  1. [Truffle] Make ruby output verbose again; add truffle-dsl and TCK as … 

    …dependent distributions.
    @chumer
    chumer committed Jun 29, 2016
    Copy the full SHA
    cdc8e76 View commit details

  2. Merge pull request #3985 from chumer/jrubychagnes 

    [Truffle] Make ruby output verbose again; add truffle-dsl and TCK as …
    @chrisseaton
    chrisseaton authored Jun 29, 2016
    Copy the full SHA
    66c53bf View commit details
Showing with 12 additions and 4 deletions.
  1. +4 −4 mx.jruby/mx_jruby.py
  2. +8 −0 mx.jruby/suite.py
8 changes: 4 additions & 4 deletions mx.jruby/mx_jruby.py
View file
Original file line number Diff line number Diff line change
@@ -101,23 +101,23 @@ def build(self):
maven_version_arg = '-Dtruffle.version=' + truffle_commit
maven_repo_arg = '-Dmaven.repo.local=' + mavenDir

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

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

# Build jruby-truffle

env = {'JRUBY_BUILD_MORE_QUIET': 'true'}

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

mx.log('Building without tests')

mx.run_maven(['-q', '-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)
mx.run_maven(['-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)

mx.log('Building complete version')

mx.run_maven(['-q', '-Pcomplete', '-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)
mx.run_maven(['-Pcomplete', '-DskipTests', maven_version_arg, maven_repo_arg], cwd=rubyDir, env=env)
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))
8 changes: 8 additions & 0 deletions mx.jruby/suite.py
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,8 @@
"dependencies": [
"truffle:TRUFFLE_API",
"truffle:TRUFFLE_DEBUG",
"truffle:TRUFFLE_DSL_PROCESSOR",
"truffle:TRUFFLE_TCK",
],
},
"jruby-lib-jni": {
@@ -59,6 +61,8 @@
"dependencies": [
"truffle:TRUFFLE_API",
"truffle:TRUFFLE_DEBUG",
"truffle:TRUFFLE_DSL_PROCESSOR",
"truffle:TRUFFLE_TCK",
],
},
},
@@ -85,6 +89,8 @@
"RUBY-ZIP",
"truffle:TRUFFLE_API",
"truffle:TRUFFLE_DEBUG",
"truffle:TRUFFLE_DSL_PROCESSOR",
"truffle:TRUFFLE_TCK",
],
"description": "JRuby+Truffle",
"license": "EPL"
@@ -100,6 +106,8 @@
"distDependencies": [
"truffle:TRUFFLE_API",
"truffle:TRUFFLE_DEBUG",
"truffle:TRUFFLE_DSL_PROCESSOR",
"truffle:TRUFFLE_TCK",
],
"description": "JRuby+Truffle Native Libs",
"license": "EPL"