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

Commits on Nov 24, 2016

  1. Copy the full SHA
    af23d69 View commit details
  2. Copy the full SHA
    35f5076 View commit details
  3. Copy the full SHA
    d2150f6 View commit details
Showing with 6 additions and 16 deletions.
  1. +5 −15 mx.jruby/mx_jruby.py
  2. +1 −1 mx.jruby/suite.py
20 changes: 5 additions & 15 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -35,17 +35,6 @@ def deploy_binary_if_truffle_head(args):
mx.log('The active branch is "%s". Binaries are deployed only if the active branch is "%s".' % (active_branch, primary_branch))
return 0

def unittest_use_distribution_jars(config):
"""use the distribution jars instead of the class files"""
vmArgs, mainClass, mainClassArgs = config
cpIndex, _ = mx.find_classpath_arg(vmArgs)
junitCP = [mx.classpath("com.oracle.mxtool.junit")]
rubyCP = [mx.classpath(mx.distribution(distr)) for distr in rubyDists]
vmArgs[cpIndex] = ":".join(junitCP + rubyCP)
return (vmArgs, mainClass, mainClassArgs)

mx_unittest.add_config_participant(unittest_use_distribution_jars)

# Project and BuildTask classes

class ArchiveProject(mx.ArchivableProject):
@@ -239,14 +228,15 @@ def ruby_command(args):
vmArgs, rubyArgs, user_classpath, print_command, classic, main_class = extractArguments(args)
classpath = mx.classpath(['TRUFFLE_API', 'RUBY']).split(':')
truffle_api, classpath = classpath[0], classpath[1:]
classpath += user_classpath
assert os.path.basename(truffle_api) == "truffle-api.jar"
vmArgs = [
# Give precedence to graal classpath and VM options
classpath = user_classpath + classpath
vmArgs = vmArgs + [
# '-Xss2048k',
'-Xbootclasspath/a:' + truffle_api,
'-cp', ':'.join(classpath),
] + vmArgs
vmArgs = vmArgs + [main_class]
main_class
]
if not classic:
vmArgs = vmArgs + ['-X+T']
allArgs = vmArgs + rubyArgs
2 changes: 1 addition & 1 deletion mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ def mavenLib(mavenDep, sha1, sourceSha1, license):
}

suite = {
"mxversion": "5.51.3",
"mxversion": "5.59.0",
"name": "jrubytruffle",

"imports": {