rislaed/icmtoolchain
0
Fork 0
Code Issues Pull Requests Releases Activity

Skipping java compilation when not needed

Browse Source
This commit is contained in:
MaXFeeD
2025-09-09 23:51:43 +03:00
parent c5684ef60c
commit 7b06579f7d
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/icmtoolchain/java_build.py
+20 -11
View File
@@ -3,6 +3,7 @@ import os
import platform import platform
import re import re
import subprocess import subprocess
from itertools import tee
from os.path import basename, exists, isdir, isfile, join, relpath, splitext from os.path import basename, exists, isdir, isfile, join, relpath, splitext
from typing import (Collection, Dict, Iterable, List, MutableSequence, from typing import (Collection, Dict, Iterable, List, MutableSequence,
NamedTuple) NamedTuple)
@@ -572,14 +573,6 @@ def compile_java(tool: str = "gradle") -> int:
ensure_directory(target_directory) ensure_directory(target_directory)
GLOBALS.MOD_STRUCTURE.cleanup_build_target("java") GLOBALS.MOD_STRUCTURE.cleanup_build_target("java")
from .output_directory import get_config_directory
r8_executable = join(get_config_directory(), "r8", "r8.jar")
if not isfile(r8_executable):
from .component import install_components
install_components("java")
if not isfile(r8_executable):
abort("Component 'java' is required for compilation, nothing to do.")
classpath_directories = list() classpath_directories = list()
classpath_directory = GLOBALS.TOOLCHAIN_CONFIG.get_relative_path("classpath") classpath_directory = GLOBALS.TOOLCHAIN_CONFIG.get_relative_path("classpath")
if not isdir(classpath_directory): if not isdir(classpath_directory):
@@ -591,11 +584,27 @@ def compile_java(tool: str = "gradle") -> int:
if exists(project_classpath_directory): if exists(project_classpath_directory):
classpath_directories.append(project_classpath_directory) classpath_directories.append(project_classpath_directory)
toolchain_config = None
if len(classpath_directories) > 0: if len(classpath_directories) > 0:
defaults = Config() toolchain_config = Config()
defaults.set_value("classpath", classpath_directories) toolchain_config.set_value("classpath", classpath_directories)
directories = GLOBALS.MAKE_CONFIG.iterate_java(defaults=toolchain_config)
directories, has_anything = tee(directories)
try:
next(has_anything)
except StopIteration:
GLOBALS.MOD_STRUCTURE.update_build_config_list("javaDirs")
return 0
from .output_directory import get_config_directory
r8_executable = join(get_config_directory(), "r8", "r8.jar")
if not isfile(r8_executable):
from .component import install_components
install_components("java")
if not isfile(r8_executable):
abort("Component 'java' is required for compilation, nothing to do.")
directories = GLOBALS.MAKE_CONFIG.iterate_java(defaults=defaults)
overall_result = build_java_directories(tool, directories, target_directory) overall_result = build_java_directories(tool, directories, target_directory)
GLOBALS.MOD_STRUCTURE.update_build_config_list("javaDirs") GLOBALS.MOD_STRUCTURE.update_build_config_list("javaDirs")