diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2025-01-16 20:00:53 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2025-01-16 21:21:51 +0300 |
| commit | eeb6444e9c9887c23106a80d7652a80dd26422a1 (patch) | |
| tree | 556940d9bf390c5eb3ec6757eaca37f7bbba3431 | |
| parent | f52fde8834ba3495bddec14e987924eda26b73ca (diff) | |
| download | ydb-eeb6444e9c9887c23106a80d7652a80dd26422a1.tar.gz | |
Handle generated source dirs in the script collecting sources lists
One step closer to hanlde jsrcs trasport in the _JAR_LIBRARY.
commit_hash:9be21757cf6bd47f590b970e234f002771035230
| -rw-r--r-- | build/conf/java.conf | 9 | ||||
| -rw-r--r-- | build/scripts/make_java_srclists.py | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 74d5a9d52d..90fa5d35ca 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -831,15 +831,18 @@ MAVEN_EXPORT_CMD= JAVA_COVERAGE_SRCLIST_FLAG=--coverage ${output;pre=${MODULE_PREFIX};suf=.cpsf:REALPRJNAME} --source-root ${ARCADIA_ROOT} JAVA_COVERAGE_SRCLIST= PREPARE_JAVA_BUILD_DIRS=$FS_TOOLS md ${BINDIR}/cls && $FS_TOOLS md ${BINDIR}/misc -EXTRACT_GENDIRS=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --unpack --ext .gentar ${ext=.gentar:AUTO_INPUT} -COLLECT_JAVA_SRCLIST=${YMAKE_PYTHON} ${input:"build/scripts/make_java_srclists.py"} ${hide;input:"build/scripts/process_command_files.py"} ${hide;input:"build/scripts/java_pack_to_file.py"} --moddir ${CURDIR} --java ${BINDIR}/all-java.srclst ${KT_SRSCLIST} ${JAVA_COVERAGE_SRCLIST} --ya-start-command-file ${ALL_JAR_SOURCES} ${ext=.java:AUTO_INPUT} ${ext=.kt:AUTO_INPUT} --ya-end-command-file +COLLECT_JAVA_SRCLIST=${YMAKE_PYTHON} ${input:"build/scripts/make_java_srclists.py"} \ + --moddir ${CURDIR} --java ${BINDIR}/all-java.srclst ${KT_SRSCLIST} ${JAVA_COVERAGE_SRCLIST} \ + --ya-start-command-file ${ext=.gentar:AUTO_INPUT} ${ALL_JAR_SOURCES} ${ext=.java:AUTO_INPUT} ${ext=.kt:AUTO_INPUT} --ya-end-command-file \ + ${hide;input:"build/scripts/process_command_files.py"} \ + ${hide;input:"build/scripts/java_pack_to_file.py"} \ + ${hide;input:"build/scripts/autotar_gendirs.py"} COLLECT_CLASSPATH=${WRITER_PY} --file ${BINDIR}/bfg.txt -m --ya-start-command-file ${rootrel:MANAGED_PEERS_CLOSURE} $KT_CLASSPATH_ITEM --ya-end-command-file LINK_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/bfg.txt ${ARCADIA_BUILD_ROOT}/bfg.jar COMPILE_JAVA_SRCLIST=$_JAVAC_RUN_HELPER($JAVAC_CMD) PACK_JAR=$_PACK_JAR_HELPER($TARGET) LINK_JAR=${hide:JAVA_FAKEID} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:2"} \ && $PREPARE_JAVA_BUILD_DIRS \ - && $EXTRACT_GENDIRS \ && $COLLECT_JAVA_SRCLIST \ && $JAR_GEN_SRCS \ && $ALL_KT_COMMANDS \ diff --git a/build/scripts/make_java_srclists.py b/build/scripts/make_java_srclists.py index d08088ef57..f5227f1dd0 100644 --- a/build/scripts/make_java_srclists.py +++ b/build/scripts/make_java_srclists.py @@ -7,7 +7,7 @@ import argparse sys.path.append(os.path.dirname(os.path.abspath(__file__))) import process_command_files as pcf import java_pack_to_file as jcov - +from autotar_gendirs import unpack_dir def writelines(f, rng): f.writelines(item + '\n' for item in rng) @@ -100,6 +100,12 @@ def main(): src_sorter = SourcesSorter(args.moddir) for src in src_sorter.sort_args(remaining_args): + # Handle archived sources here + if src.endswith(".gentar"): + unpack_dir(src, os.path.dirname(src)) + continue + + # Handle regular souce files there if src.endswith(".java"): java.append(src) kotlin.append(src) |