diff options
| author | dimdim11 <dimdim11@yandex-team.com> | 2024-12-18 00:30:46 +0300 |
|---|---|---|
| committer | dimdim11 <dimdim11@yandex-team.com> | 2024-12-18 01:06:17 +0300 |
| commit | 2a6107b5238d0b6407126e801c9ff7ba548fe819 (patch) | |
| tree | c4f0864adae5918345e2a462adac01313abc3944 | |
| parent | 16463f359005f12009de5ac321b9a00d50b41c90 (diff) | |
| download | ydb-2a6107b5238d0b6407126e801c9ff7ba548fe819.tar.gz | |
Add semantics for JDK path and version
Add semantics for JDK path and version
commit_hash:c1a6fa63fea3f4a360d9cc0e8eff367bf5f56ceb
| -rw-r--r-- | build/conf/java.conf | 8 | ||||
| -rw-r--r-- | build/export_generators/gradle/generator.toml | 2 | ||||
| -rw-r--r-- | build/export_generators/ide-gradle/generator.toml | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 668897fc0c..d00e671a9d 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -413,10 +413,10 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], # tag:java-specific # Fill semantic jar_source_set by JAVA_SRCS() Args -SEM_JAR_SOURCE_SET= +_JAR_SOURCE_SET_SEM= macro _SEM_JAR_SOURCE_SET(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"RESOURCES":"", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) { # Now ignore SKIP_CHECK_SRCDIR, PACKAGE_PREFIX, EXCLUDE, RESOURCES, FILES - SET_APPEND(SEM_JAR_SOURCE_SET && jar_source_set ${pre=${SRCDIR}\::Globs}) + SET_APPEND(_JAR_SOURCE_SET_SEM && jar_source_set ${pre=${SRCDIR}\::Globs}) } ### Fill JAVA_SRCS to value for ya ide idea and real apply for late globs @@ -994,7 +994,7 @@ _BUILD_JAR_SEM= \ $_USE_ANNOTATION_PROCESSOR_SEM \ $_USE_ERROR_PRONE_SEM \ $_ENABLE_PREVIEW_SEM \ - $SEM_JAR_SOURCE_SET + $_JAR_SOURCE_SET_SEM BUILD_PROTO_JAR_SEM= \ ${hide:target} ${hide:AUTO_INPUT} \ @@ -1740,7 +1740,7 @@ macro IDEA_MODULE_NAME(Name) { # tag:java-specific JAVAC_FLAGS_VALUE= -_JAVAC_SEM= +_JAVAC_SEM=&& jdk_path $JDK_RESOURCE && jdk_version $JDK_RESOURCE ### @usage: JAVAC_FLAGS(Args...) ### ### Set additional Java compilation flags. diff --git a/build/export_generators/gradle/generator.toml b/build/export_generators/gradle/generator.toml index aeb7ccaf4b..f447c1ed6d 100644 --- a/build/export_generators/gradle/generator.toml +++ b/build/export_generators/gradle/generator.toml @@ -28,6 +28,8 @@ app_main_class="str" enable_preview="flag" use_annotation_processor="list" use_errorprone="flag" +jdk_version="str" +jdk_path="str" publish="flag" publish_group="str" diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml index 2ca73ff555..b618430b2c 100644 --- a/build/export_generators/ide-gradle/generator.toml +++ b/build/export_generators/ide-gradle/generator.toml @@ -32,6 +32,8 @@ jar_source_set="list" enable_preview="flag" use_annotation_processor="list" use_errorprone="flag" +jdk_version="str" +jdk_path="str" publish="flag" publish_group="str" |