Skip to content

Commit 521f965

Browse files
committed
disable -sources.jar for protos via variable
commit_hash:a4b4ea1430f9dac200fb204ac6cb79bf29723e3d
1 parent 5d59785 commit 521f965

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

build/conf/java.conf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,14 @@ elsewhen ($JDK_VERSION == "" && $HAS_PER_MODULE_JDK_VERSION == "no") {
15961596
otherwise {
15971597
EXTERNAL_JAVA_JDK_RESOURCE=$JDK_RESOURCE
15981598
}
1599-
COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/compile_java.py"} --ya-start-command-file --java-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/java --javac-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar --kotlin-compiler $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET --srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME} $AUTO_INPUT DELIM $JAVAC_OPTS $EXTERNAL_JAVA_JAVAC_OPTS DELIM $MANAGED_PEERS_CLOSURE DELIM -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} ${KOTLINC_OPTS_VALUE} --ya-end-command-file ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:4"} ${hide;input:"build/scripts/java_command_file.py"} ${hide;input:"build/scripts/process_command_files.py"}
1599+
DISABLE_SOURCES_JAR_FOR_EXTERNAL_LIBRARY=
1600+
when ($DISABLE_SOURCES_JAR_FOR_EXTERNAL_LIBRARY == "yes") {
1601+
SOURCES_JAR_FLAGS=
1602+
}
1603+
otherwise {
1604+
SOURCES_JAR_FLAGS=--srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME}
1605+
}
1606+
COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/compile_java.py"} --ya-start-command-file --java-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/java --javac-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar --kotlin-compiler $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET $SOURCES_JAR_FLAGS $AUTO_INPUT DELIM $JAVAC_OPTS $EXTERNAL_JAVA_JAVAC_OPTS DELIM $MANAGED_PEERS_CLOSURE DELIM -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} ${KOTLINC_OPTS_VALUE} --ya-end-command-file ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:4"} ${hide;input:"build/scripts/java_command_file.py"} ${hide;input:"build/scripts/process_command_files.py"}
16001607

16011608
ARGS_DELIM="MACRO_CALLS_DELIM"
16021609

0 commit comments

Comments
 (0)