diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2025-01-28 09:14:19 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2025-01-28 09:34:14 +0300 |
| commit | 54d7987cb11a25bb9811bba6a01d0d8a6942af59 (patch) | |
| tree | b8ec3f9d082e5de800305fcb6e8c10e9c2fefb53 /build/plugins/java.py | |
| parent | 77d9db7a95c6ae81393fe72ed4b79768346c63f8 (diff) | |
| download | ydb-54d7987cb11a25bb9811bba6a01d0d8a6942af59.tar.gz | |
All java sources sorting/preparation in a single python script
NOTE: there is still some kotlin source preparation remains in a separate call for
`build/scripts/resolve_java_srcs.py` which is going to be joined into
`prepare_jar_build.py` later.
commit_hash:239933cba6b1a7090a9327d659bb8be3722db916
Diffstat (limited to 'build/plugins/java.py')
| -rw-r--r-- | build/plugins/java.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build/plugins/java.py b/build/plugins/java.py index a424b16350..d58b5f9d6c 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -256,18 +256,19 @@ def on_fill_jar_gen_srcs(unit, *args): resolved_srcdir = unit.resolve_arc_path(srcdir) if not resolved_srcdir.startswith('$') or resolved_srcdir.startswith('$S'): return + if jar_type == 'SRC_JAR' and unit.get('SOURCES_JAR') != 'yes': + return + args_delim = unit.get('JAR_BUILD_SCRIPT_FLAGS_DELIM') exclude_pos = args.index('EXCLUDE') - globs = args[7:exclude_pos] - excludes = args[exclude_pos + 1 :] + globs = ' '.join(args[7:exclude_pos]) + excludes = ' '.join(args[exclude_pos + 1 :]) var = unit.get(varname) - var += ' && ${{cwd:BINDIR}} $YMAKE_PYTHON ${{input:"build/scripts/resolve_java_srcs.py"}} --append -d {} -s {} -k {} -r {} --include-patterns {}'.format( - srcdir, java_list, kt_list, res_list, ' '.join(globs) - ) + var += f' {args_delim} --append -d {srcdir} -s {java_list} -k {kt_list} -r {res_list} --include-patterns {globs}' if jar_type == 'SRC_JAR': var += ' --all-resources' if len(excludes) > 0: - var += ' --exclude-patterns {}'.format(' '.join(excludes)) + var += f' --exclude-patterns {excludes}' if unit.get('WITH_KOTLIN_VALUE') == 'yes': var += ' --resolve-kotlin' unit.set([varname, var]) |