[config] Remove unnecessary -classpath option

Reviewed By: jeremydubreil

Differential Revision: D4159965

fbshipit-source-id: 74a99ba
master
Josh Berdine 8 years ago committed by Facebook Github Bot
parent 7a04ed32f5
commit a739931c92

@ -290,32 +290,8 @@ class AnalyzerWithFrontendWrapper(analyze.AnalyzerWrapper):
return self.stats return self.stats
# create a classpath to pass to the frontend
def _create_frontend_classpath(self):
classes_out = '.'
if self.javac.args.classes_out is not None:
classes_out = self.javac.args.classes_out
classes_out = os.path.abspath(classes_out)
original_classpath = []
if self.javac.args.bootclasspath is not None:
original_classpath = self.javac.args.bootclasspath.split(':')
if self.javac.args.classpath is not None:
original_classpath += self.javac.args.classpath.split(':')
if len(original_classpath) > 0:
# add classes_out, unless it's already in the classpath
classpath = [os.path.abspath(p) for p in original_classpath]
if classes_out not in classpath:
classpath = [classes_out] + classpath
# remove models.jar; it's added by the frontend
models_jar = os.path.abspath(config.MODELS_JAR)
if models_jar in classpath:
classpath.remove(models_jar)
return ':'.join(classpath)
return classes_out
def _run_infer_frontend(self): def _run_infer_frontend(self):
infer_cmd = [utils.get_cmd_in_bin_dir('InferJava')] infer_cmd = [utils.get_cmd_in_bin_dir('InferJava')]
infer_cmd += ['-classpath', self._create_frontend_classpath()]
infer_cmd += [ infer_cmd += [
'-results_dir', self.args.infer_out, '-results_dir', self.args.infer_out,

@ -692,10 +692,6 @@ and clang_include_to_override =
location of internal compiler headers. This option should specify the path to those headers \ location of internal compiler headers. This option should specify the path to those headers \
so that infer can use its own clang internal headers instead." so that infer can use its own clang internal headers instead."
and _ =
CLOpt.mk_string_opt ~deprecated:["classpath"] ~long:"classpath"
~meta:"path" "Specify where to find user class files and annotation processors"
and cluster = and cluster =
CLOpt.mk_path_opt ~deprecated:["cluster"] ~long:"cluster" CLOpt.mk_path_opt ~deprecated:["cluster"] ~long:"cluster"
~meta:"file" "Specify a .cluster file to be analyzed" ~meta:"file" "Specify a .cluster file to be analyzed"

Loading…
Cancel
Save