Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
42 changes: 41 additions & 1 deletion build/conf/java.conf
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ multimodule JTEST_FOR {
}

multimodule JAVA_CONTRIB_PROGRAM {
module JAR_RUNNABLE: _JAR_RUNNABLE {
module JAR_RUNNABLE: _JAR_CONTRIB_RUNNABLE {
.IGNORED=JAVA_SRCS RUN_JAR_PROGRAM RUN_JAVA_PROGRAM JAR_RESOURCE SRC_RESOURCE LOCAL_JAR
.PEERDIRSELF=JAR_COMPILATION
.SEM=$_SEM_IGNORED
Expand Down Expand Up @@ -1431,6 +1431,46 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE {
CHECK_PROVIDES()
}

# tag:java-specific
module _JAR_CONTRIB_RUNNABLE: _JAR_BASE {
.FINAL_TARGET=yes
.CMD=$LINK_JAR_PROGRAM
.SEM=$_SEM_IGNORED
.ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES
.ALLOWED=WITH_JDK GENERATE_SCRIPT
.PEERDIR_POLICY=as_build_from

MODULE_SUFFIX=.run.cp.jar
CONSUME_NON_MANAGEABLE_PEERS=yes

when ($RUN_WITH_SOURCES == "yes") {
_SOURCE_JARS=${suf=-sources.jar;noext;ext=.jar:MANAGED_PEERS_CLOSURE} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;suf=-sources.jar;nopath;noext;ext=.jar:MANAGED_PEERS_CLOSURE}
_SOURCE_JARS_CPLIST=${rootrel;pre=$BINDIR/$REALPRJNAME/;suf=-sources.jar;nopath;noext;ext=.jar:MANAGED_PEERS_CLOSURE}
}

when ($TARED_CLASSPATH == "yes") {
DO_TAR_CLASSPATH=$TAR_CLASSPATH
}

when ($DISABLE_SCRIPTGEN) {
DO_GEN_JAVA_RUN_SH=
}
otherwise {
DO_GEN_JAVA_RUN_SH=$GEN_JAVA_RUN_SH
PEERDIR+=build/platform/java/scriptgen
}

when ($MAKE_UBERJAR_VALUE == "yes") {
LINK_JAR_PROGRAM=$LINK_UBERJAR_PROGRAM
DYNAMIC_LINK=no
_SCRIPTGEN_FLAGS=-D IS_UBERJAR=yes
}
otherwise {
_SCRIPTGEN_FLAGS=-D IS_UBERJAR=no
}
CHECK_PROVIDES()
}

# tag:java-specific
LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON3} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${hide;kv:"p JT"}
module _JAR_TEST: _COMPILABLE_JAR_BASE {
Expand Down
2 changes: 2 additions & 0 deletions build/mapping.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@
"10153859564": "{registry_endpoint}/10153859564",
"10164110401": "{registry_endpoint}/10164110401",
"10190826595": "{registry_endpoint}/10190826595",
"10239299149": "{registry_endpoint}/10239299149",
"5486713852": "{registry_endpoint}/5486713852",
"5514352253": "{registry_endpoint}/5514352253",
"5523579199": "{registry_endpoint}/5523579199",
Expand Down Expand Up @@ -2288,6 +2289,7 @@
"10153859564": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"10164110401": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"10190826595": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"10239299149": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"5486713852": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"5514352253": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"5523579199": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
Expand Down
10 changes: 5 additions & 5 deletions build/platform/test_tool/host.ya.make.inc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190891954)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239425239)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190886565)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239422513)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190901147)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239430509)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190882391)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239420178)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190896591)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239427879)

ENDIF()
10 changes: 5 additions & 5 deletions build/platform/test_tool/host_os.ya.make.inc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190817653)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239294900)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190812518)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239293034)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190826595)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239299149)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190807948)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239291286)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10190822339)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:10239296643)

ENDIF()
12 changes: 11 additions & 1 deletion contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% block current_date %}2024-09-20{% endblock %}

{% block keep_sources %}
.yandex_meta/scripts/fixlic.py
.yandex_meta/scripts/sysincls.py
include/__config_site
include/__config_epilogue.h
Expand Down Expand Up @@ -286,8 +287,17 @@ echo "no version update"
rsync --recursive --delete --perms ${SRC}/ ${OUTPUT}
{% endblock %}


{% block step_install %}
{{super()}}
rsync ${SYSINCLS}/stl-to-libcxx.yml ${ARCADIA_ROOT}/build/sysincl/stl-to-libcxx.yml
{% endblock %}

{% block run_license_analyzer %}
{{super()}}
base64 -d << EOF > ${BIN}/fixlic
{% include 'scripts/fixlic.py/base64' %}

EOF
cat ${OUTPUT}/.yandex_meta/licenses.list.txt | python3 ${BIN}/fixlic > _
mv _ ${OUTPUT}/.yandex_meta/licenses.list.txt
{% endblock %}
Loading
Loading