From 8a1d0f7a5a8ae7c53b60c4c4bc99373c4028a539 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 27 Nov 2024 16:00:59 +0100 Subject: [PATCH] makepanda: use javac from JAVA_HOME, check for deprecations --- makepanda/makepanda.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 9162ba0415..0faf692e58 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2072,7 +2072,16 @@ def CompileJava(target, src, opts): if GetHost() == 'android': cmd = "ecj " else: - cmd = "javac -bootclasspath " + BracketNameWithQuotes(SDK["ANDROID_JAR"]) + " " + cmd = "javac " + home = os.environ.get('JAVA_HOME') + if home: + javac_path = os.path.join(home, 'bin', 'javac') + if GetHost() == 'windows': + javac_path += '.exe' + if os.path.isfile(javac_path): + cmd = BracketNameWithQuotes(javac_path) + " " + + cmd += "-Xlint:deprecation " optlevel = GetOptimizeOption(opts) if optlevel >= 4: