aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-14 23:04:22 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-14 23:04:22 +0300
commitf1015a245cd81e95cf35cfa4f50b3b89f12426ec (patch)
tree7d26d0816bad3bd6669545d73687f8d715b5119d
parentacee9ca906b5ac99f86785066de4e929daa77814 (diff)
downloadydb-f1015a245cd81e95cf35cfa4f50b3b89f12426ec.tar.gz
intermediate changes
ref:5aff33e4d0b3cd883b8950cb3a828303e8cdafc8
-rw-r--r--build/ya.conf.json4
-rw-r--r--build/ymake.core.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/build/ya.conf.json b/build/ya.conf.json
index a8cbc53d13..dbec5427d2 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -7352,8 +7352,8 @@
"appteka": {
"formula": {
"sandbox_id": [
- 1210417586,
- 1210425679
+ 1215148707,
+ 1215281222
],
"match": "appteka"
},
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 8498c31833..c15cd8a3cc 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -7361,8 +7361,8 @@ macro RUN_PYTHON(Args...) {
###
### Macro to invoke ANTLR3 generator (general case)
macro RUN_ANTLR(IN[], OUT[], OUT_NOAUTO[], OUTPUT_INCLUDES[], REQUIREMENTS[], CWD="", Args...) {
- PEERDIR(build/external_resources/antlr3)
- _RUN_JAVA(-jar $ANTLR3_RESOURCE_GLOBAL/antlr-3.5.2-complete-no-st3.jar $Args IN $IN OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES REQUIREMENTS $REQUIREMENTS ${pre=CWD :CWD})
+ PEERDIR(build/external_resources/antlr3 build/platform/java/jdk $JDK_RESOURCE_PEERDIR)
+ .CMD=$_RUN_JAVA(-jar $ANTLR3_RESOURCE_GLOBAL/antlr-3.5.2-complete-no-st3.jar $Args IN $IN OUT $OUT OUT_NOAUTO $OUT_NOAUTO OUTPUT_INCLUDES $OUTPUT_INCLUDES REQUIREMENTS $REQUIREMENTS ${pre=CWD :CWD})
.SEM=run_antlr OUTPUT ${output:OUT} ${output;noauto:OUT_NOAUTO} DEPENDS ${input:IN} ${pre=WORKING_DIRECTORY :CWD} ANTLER_ARGS $Args && modules_required antlr.cmake
}