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

Commits on Oct 28, 2016

  1. Copy the full SHA
    77750b9 View commit details
  2. Copy the full SHA
    d791c11 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 mx.jruby/mx_jruby.py
10 changes: 7 additions & 3 deletions mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -80,7 +80,8 @@ def mavenSetup():
mavenDir = buildPack if isdir(buildPack) else join(_suite.dir, 'mxbuild/mvn')
maven_repo_arg = '-Dmaven.repo.local=' + mavenDir
env = os.environ.copy()
env['JRUBY_BUILD_MORE_QUIET'] = 'true'
if not mx.get_opts().verbose:
env['JRUBY_BUILD_MORE_QUIET'] = 'true'
# HACK: since the maven executable plugin does not configure the
# java executable that is used we unfortunately need to prepend it to the PATH
javaHome = os.getenv('JAVA_HOME')
@@ -146,7 +147,8 @@ def build(self):
cwd = _suite.dir
maven_repo_arg, env = mavenSetup()
mx.log("Building jruby-core with Maven")
mx.run_maven(['-q', '-DskipTests', maven_repo_arg, '-Dcreate.sources.jar', '-pl', 'core,lib'], cwd=cwd, env=env)
quiet = [] if mx.get_opts().verbose else ['-q']
mx.run_maven(quiet + ['-DskipTests', maven_repo_arg, '-Dcreate.sources.jar', '-pl', 'core,lib'], cwd=cwd, env=env)
# Install Bundler
gem_home = join(_suite.dir, 'lib', 'ruby', 'gems', 'shared')
env['GEM_HOME'] = gem_home
@@ -156,7 +158,9 @@ def build(self):
def clean(self, forBuild=False):
if forBuild:
return
mx.run_maven(['-q', 'clean'], nonZeroIsFatal=False, cwd=_suite.dir)
maven_repo_arg, env = mavenSetup()
quiet = [] if mx.get_opts().verbose else ['-q']
mx.run_maven(quiet + [maven_repo_arg, 'clean'], nonZeroIsFatal=False, cwd=_suite.dir, env=env)
jar = self.newestOutput()
if jar.exists():
os.remove(jar.path)