diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2025-01-25 20:00:37 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2025-01-25 21:06:48 +0300 |
| commit | 6e1f47f893f8862bd40822c79ef6834e3d8ff7bb (patch) | |
| tree | f27fdebcf5fa9cfd78fbb6aff4789e5cfe0772ce | |
| parent | 111885081055f2abf3980dd5cf39be60a378e3f5 (diff) | |
| download | ydb-6e1f47f893f8862bd40822c79ef6834e3d8ff7bb.tar.gz | |
Split sources-jar file list processing and packing
commit_hash:08afe93c213a73bd277c45a08561c5bd81894b36
| -rw-r--r-- | build/conf/java.conf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index d0a93eeddb..9426ecd918 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -751,10 +751,9 @@ when ($BUILD_TYPE == "DEBUG" && $NO_DEBUGINFO != "yes") { SOURCES_JAR=yes } -_PACK_SRC_JAR_IMPL=\ - && $JAR_GEN_JSRCS \ - && $LINK_JAR_JSOURCES \ - && ${cwd;suf=/src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/${MODULE_PREFIX};suf=-sources.jar:REALPRJNAME} $VCS_JAVA . +_PREPARE_SRC_JAR= +_PREPARE_SRC_JAR_IMPL=&& $JAR_GEN_JSRCS && $LINK_JAR_JSOURCES +_PACK_SRC_JAR_IMPL=&& ${cwd;suf=/src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/${MODULE_PREFIX};suf=-sources.jar:REALPRJNAME} $VCS_JAVA . _PACK_SRC_JAR= # tag:java-specific @@ -856,6 +855,7 @@ LINK_JAR=${hide:JAVA_FAKEID} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide && $COMPILE_JAVA_SRCLIST \ && $LINK_JAR_RESOURCES \ && ${cwd;suf=/cls:BINDIR} $GENERATE_VCS_JAVA_INFO_NODEP . \ + && $_PREPARE_SRC_JAR \ && $_PACK_SRC_JAR \ && $_PACK_JNI \ && $PACK_JAR \ @@ -1114,6 +1114,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE { } when ($SOURCES_JAR == "yes") { + _PREPARE_SRC_JAR=$_PREPARE_SRC_JAR_IMPL _PACK_SRC_JAR=$_PACK_SRC_JAR_IMPL JAR_BUILD_SCRIPT_FLAGS=--with-sources-jar MAVEN_DEPLOY_SOURCES=-Dsources=${output;pre=${BINDIR}/${MODULE_PREFIX};suf=-sources.jar:REALPRJNAME} |