Bug 1398966 - Suggest checking JAVA_HOME if javac is out of date. r=nalexander draft
authorBotond Ballo <botond@mozilla.com>
Mon, 11 Sep 2017 19:06:26 -0400
changeset 662704 758b365905202ece86154e52bf88e6096a11b817
parent 662474 02c78441c03d5d004e57596a130856861a30188a
child 665808 efecec38efc855ca9a9a84250a66366267996de3
push id79163
push userbballo@mozilla.com
push dateMon, 11 Sep 2017 23:45:59 +0000
reviewersnalexander
bugs1398966
milestone57.0a1
Bug 1398966 - Suggest checking JAVA_HOME if javac is out of date. r=nalexander MozReview-Commit-ID: FJDrLsTxwIr
build/moz.configure/java.configure
python/mozbuild/mozbuild/test/configure/test_checks_configure.py
--- a/build/moz.configure/java.configure
+++ b/build/moz.configure/java.configure
@@ -51,12 +51,12 @@ javac = check_java_tool('javac')
 @checking('for javac version')
 @imports('subprocess')
 def javac_version(javac):
     try:
         output = subprocess.check_output([javac, '-version'],
                                          stderr=subprocess.STDOUT).rstrip()
         version = Version(output.split(' ')[-1])
         if version < '1.8':
-            die('javac 1.8 or higher is required (found %s)' % version)
+            die('javac 1.8 or higher is required (found %s). Check the JAVA_HOME environment variable.' % version)
         return version
     except subprocess.CalledProcessError as e:
         die('Failed to get javac version: %s', e.output)
--- a/python/mozbuild/mozbuild/test/configure/test_checks_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_checks_configure.py
@@ -650,17 +650,17 @@ class TestChecksConfigure(unittest.TestC
         self.assertEqual(out, textwrap.dedent('''\
              checking for java... %s
              checking for javah... %s
              checking for jar... %s
              checking for jarsigner... %s
              checking for keytool... %s
              checking for javac... %s
              checking for javac version... 
-             ERROR: javac 1.8 or higher is required (found 1.6.9)
+             ERROR: javac 1.8 or higher is required (found 1.6.9). Check the JAVA_HOME environment variable.
         ''' % (java, javah, jar, jarsigner, keytool, javac)))
 
         # Any missing tool is fatal when these checks run.
         del paths[jarsigner]
         config, out, status = self.get_result(includes=includes,
                                               extra_paths=paths,
                                               environ={
                                                   'PATH': mozpath.dirname(java)