aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsvidyuk <svidyuk@yandex-team.com>2025-01-24 20:00:29 +0300
committersvidyuk <svidyuk@yandex-team.com>2025-01-24 20:56:31 +0300
commit19ef56ab1ad568c9c4677fc22a042f84403053eb (patch)
tree88085433969cce39aa2d742bf6a7ddd4fc280e0b
parentaf1629abf3a88888faadae60ca72b8c78b331530 (diff)
downloadydb-19ef56ab1ad568c9c4677fc22a042f84403053eb.tar.gz
Move source-jar preparation steps to common script
commit_hash:0fc4b385e7c45b0b8cbc4446c4a61f6232a00ed9
-rw-r--r--build/conf/java.conf4
-rw-r--r--build/scripts/prepare_jar_build.py10
2 files changed, 10 insertions, 4 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index fa9bef9810..d0a93eeddb 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -752,7 +752,6 @@ when ($BUILD_TYPE == "DEBUG" && $NO_DEBUGINFO != "yes") {
}
_PACK_SRC_JAR_IMPL=\
- && $FS_TOOLS md ${BINDIR}/src \
&& $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 .
@@ -833,9 +832,11 @@ MAVEN_DEPLOY_CMD=$YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} $MAVEN_
MAVEN_EXPORT_CMD=
# tag:java-specific
+JAR_BUILD_SCRIPT_FLAGS=
JAVA_COVERAGE_SRCLIST_FLAG=--coverage ${output;pre=${MODULE_PREFIX};suf=.cpsf:REALPRJNAME} --source-root ${ARCADIA_ROOT}
JAVA_COVERAGE_SRCLIST=
PREPARE_JAR_BUILD=${cwd:BINDIR} ${YMAKE_PYTHON3} ${input:"build/scripts/prepare_jar_build.py"} \
+ ${JAR_BUILD_SCRIPT_FLAGS} \
--bindir ${BINDIR} --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 \
@@ -1114,6 +1115,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
when ($SOURCES_JAR == "yes") {
_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}
}
diff --git a/build/scripts/prepare_jar_build.py b/build/scripts/prepare_jar_build.py
index a326ca9884..17caba727e 100644
--- a/build/scripts/prepare_jar_build.py
+++ b/build/scripts/prepare_jar_build.py
@@ -112,8 +112,11 @@ class SourcesConsumer:
self.coverage.append(rel)
-def prepare_build_dirs(bindir):
- for dir in [os.path.join(bindir, dirname) for dirname in ['cls', 'misc']]:
+def prepare_build_dirs(bindir, with_sources_jar):
+ dirs = ['cls', 'misc']
+ if with_sources_jar:
+ dirs.append('src')
+ for dir in [os.path.join(bindir, dirname) for dirname in dirs]:
if not os.path.exists(dir):
os.makedirs(dir)
@@ -121,6 +124,7 @@ def prepare_build_dirs(bindir):
def main():
args = pcf.get_args(sys.argv[1:])
parser = argparse.ArgumentParser()
+ parser.add_argument('--with-sources-jar', action='store_true')
parser.add_argument('--moddir')
parser.add_argument('--bindir')
parser.add_argument('--java')
@@ -129,7 +133,7 @@ def main():
parser.add_argument('--source-root')
args, remaining_args = parser.parse_known_args(args)
- prepare_build_dirs(args.bindir)
+ prepare_build_dirs(args.bindir, args.with_sources_jar)
src_sorter = SourcesSorter(args.moddir)
src_consumer = SourcesConsumer(