aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimdim11 <dimdim11@yandex-team.com>2024-02-12 06:11:56 +0300
committerDaniil Cherednik <dcherednik@ydb.tech>2024-02-14 14:26:13 +0000
commita7db8517ca75947abf39588e02b2714f8b49aa32 (patch)
tree96253041af345b51ad81dc26cb4250a976b3328e
parente536211101d9ee76cdd17407ea6269d2767c6b1f (diff)
downloadydb-a7db8517ca75947abf39588e02b2714f8b49aa32.tar.gz
Add enable_preview and annotation_processors attrs
Add enable_preview and annotation_processors attrs
-rw-r--r--build/conf/java.conf8
-rw-r--r--build/export_generators/gradle/generator.toml2
-rw-r--r--build/export_generators/ide-gradle/generator.toml2
3 files changed, 12 insertions, 0 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf
index c43625bd41..5879bc488c 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -449,9 +449,11 @@ macro RUN_JAVA_PROGRAM(Args...) {
# tag:java-specific
_JAR_ANN_PROCESSORS=
_JAR_ANN_PROC_OPT_PREFIX=
+_ANN_PROCESSORS_SEM=
macro JAR_ANNOTATION_PROCESSOR(Classes...) {
SET_APPEND(_JAR_ANN_PROCESSORS $Classes)
SET(_JAR_ANN_PROC_OPT_PREFIX -processor)
+ SET_APPEND(_ANN_PROCESSORS_SEM && annotation_processors $Classes)
# for ya ide idea only
SET_APPEND(ANNOTATION_PROCESSOR_VALUE $ARGS_DELIM $Classes)
@@ -902,6 +904,8 @@ BUILD_JAR_SEM= \
$_KOTLIN_SEM \
$_JAR_MAIN_SEM \
$_GRADLE_EXPORT_PUBLISHING_SEM \
+ $_ANN_PROCESSORS_SEM \
+ $_ENABLE_PREVIEW_SEM \
$SEM_JAR_SOURCE_SET
BUILD_PROTO_JAR_SEM= \
@@ -911,6 +915,8 @@ BUILD_PROTO_JAR_SEM= \
&& consumer-classpath $EXPORT_GRADLE_CLASSPATH \
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
&& consumer-type library \
+ $_ANN_PROCESSORS_SEM \
+ $_ENABLE_PREVIEW_SEM \
$_KOTLIN_SEM
# tag:java-specific tag:internal
@@ -1640,6 +1646,7 @@ macro JAVAC_FLAGS(Args...) {
# tag:java-specific
ENABLE_PREVIEW_VALUE=
+_ENABLE_PREVIEW_SEM=
### @usage: ENABLE_PREVIEW()
###
### Enable java preview features.
@@ -1648,6 +1655,7 @@ macro ENABLE_PREVIEW() {
SET_APPEND(JAVAC_OPTS --enable-preview --release $JDK_REAL_VERSION)
SET_APPEND(JAVAC_FLAGS_VALUE --enable-preview --release $JDK_REAL_VERSION)
SET(ENABLE_PREVIEW_VALUE yes)
+ SET(_ENABLE_PREVIEW_SEM && enable_preview)
}
# tag:java-specific
diff --git a/build/export_generators/gradle/generator.toml b/build/export_generators/gradle/generator.toml
index ba289b8db0..daff4c19e2 100644
--- a/build/export_generators/gradle/generator.toml
+++ b/build/export_generators/gradle/generator.toml
@@ -20,6 +20,8 @@ add_vcs_info_to_mf="bool"
junit4_test="flag"
junit5_test="flag"
app_main_class="str"
+enable_preview="flag"
+annotation_processors="list"
publish="flag"
publish_group="str"
diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml
index 7a33da1647..28fb468eab 100644
--- a/build/export_generators/ide-gradle/generator.toml
+++ b/build/export_generators/ide-gradle/generator.toml
@@ -22,6 +22,8 @@ junit4_test="flag"
junit5_test="flag"
app_main_class="str"
jar_source_set="list"
+enable_preview="flag"
+annotation_processors="list"
publish="flag"
publish_group="str"