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: 4110f35b230a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 85bccc7d1657
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 20, 2016

  1. Copy the full SHA
    6cb258e View commit details
  2. Copy the full SHA
    85bccc7 View commit details
Showing with 8 additions and 0 deletions.
  1. +3 −0 mx.jruby/mx_jruby.py
  2. +5 −0 mx.jruby/suite.py
3 changes: 3 additions & 0 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -92,6 +92,9 @@ def get_source_path(self, resolve):
version = f.readline().strip()
return join(_suite.dir, 'core/target/jruby-core-' + version + '-shaded-sources.jar')

def extended_java_packages(self):
return []

class JRubyCoreBuildTask(mx.BuildTask):
def __str__(self):
return 'Building {} with Maven'.format(self.subject)
5 changes: 5 additions & 0 deletions mx.jruby/suite.py
100755 → 100644
Original file line number Diff line number Diff line change
@@ -90,6 +90,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"annotationProcessors": ["truffle:TRUFFLE_DSL_PROCESSOR"],
"javaCompliance": "1.8",
"workingSets": "JRubyTruffle",
"checkPackagePrefix": "false",
},

"jruby-truffle-ruby": {
@@ -107,6 +108,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"mx:JUNIT",
],
"javaCompliance": "1.8",
"checkPackagePrefix": "false",
},

"jruby-truffle-ruby-test": {
@@ -169,6 +171,9 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"jruby-lib-ruby",
"jruby-licences",
],
"overlaps": [
"RUBY",
],
"description": "JRuby+Truffle Native Libs",
"license": "EPL"
},