Backed out changeset aae4f349fa58 (bug 1479503) per developer's request on IRC a=backout

--HG--
rename : taskcluster/docker/static-analysis-build/Dockerfile => taskcluster/docker/infer-build/Dockerfile

Author: shindli

.flake8

@@ -22,4 +22,3 @@ exclude =
     testing/mochitest/pywebsocket,
     tools/lint/test/files,
     build/build-infer/build-infer.py,
-    tools/infer/test/*.configure,

.hgignore

@@ -74,7 +74,6 @@ _OPT\.OBJ/
 
 # Gradle cache.
 ^.gradle/
-^tools/infer/test/.gradle/
 
 # Local Gradle configuration properties.
 ^local.properties$

build/moz.configure/java.configure

@@ -4,7 +4,53 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('java_common.configure')
+
+# Java detection
+# ========================================================
+option('--with-java-bin-path', nargs=1,
+       help='Location of Java binaries (java, javac, jar)')
+
+
+@depends('--with-java-bin-path')
+@imports(_from='os', _import='environ')
+def java_search_paths(path):
+    if path:
+        # Look for javac and jar in the specified path.
+        return path
+    # With no path specified, look for javac and jar in $JAVA_HOME (if set)
+    # and $PATH.
+    if 'JAVA_HOME' in environ:
+        return [os.path.join(environ['JAVA_HOME'], 'bin'),
+                environ.get('PATH', '')]
+    return [environ.get('PATH')]
+
+# Finds the given java tool, failing with a custom error message if we can't
+# find it.
+
+
+@template
+def check_java_tool(tool):
+    check = check_prog(tool.upper(), (tool,), paths=java_search_paths,
+                       allow_missing=True)
+
+    @depends(check)
+    def require_tool(result):
+        if result is None:
+            die("The program %s was not found.  Set $JAVA_HOME to your Java "
+                "SDK directory or use '--with-java-bin-path={java-bin-dir}'"
+                % tool)
+        return result
+
+    return require_tool
+
+
+check_java_tool('java')
+check_java_tool('javah')
+check_java_tool('jar')
+check_java_tool('jarsigner')
+check_java_tool('keytool')
+javac = check_java_tool('javac')
+
 
 @depends(javac)
 @checking('for javac version')

build/moz.configure/java_common.configure

@@ -567,21 +567,6 @@ set_config('MAKENSISU_FLAGS', nsis_flags)
 
 check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)
 
-@depends(target, host, check_build_environment, '--help')
-@imports('os')
-def include_infer_autotest(target, host, build_env, help):
-    # Do not include autotest configuration on Windows or macos
-    # because infer is not available there
-    if target.kernel in ['Linux'] and host.kernel in ['Linux']:
-        path = os.path.join(build_env.topsrcdir, 'tools', 'infer', 'test', 'moz.configure')
-        # on some builds, this path won't exists, in which case we can just
-        # ignore the infer autotest
-        if os.path.exists(path):
-            return path
-    return None
-
-include(include_infer_autotest)
-
 # Fallthrough to autoconf-based configure
 include('build/moz.configure/old.configure')