diff options
| author | dimdim11 <dimdim11@yandex-team.com> | 2024-11-18 22:08:08 +0300 |
|---|---|---|
| committer | dimdim11 <dimdim11@yandex-team.com> | 2024-11-18 22:24:26 +0300 |
| commit | 204e141243de4565c47ccc9ebdf48f051cc317cc (patch) | |
| tree | e969764474606cf1930d22561c8dd3e39ba0fa12 | |
| parent | 6c9370843e7e74f3717a884e07d285fc54392a8d (diff) | |
| download | ydb-204e141243de4565c47ccc9ebdf48f051cc317cc.tar.gz | |
Fixes for AP semantics
Fixes for AP semantics
commit_hash:aeffb759ee7372e5672d1a7125fbcd5d46d63fe3
| -rw-r--r-- | build/conf/java.conf | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 4390abaa3d..02f5e25af2 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -78,20 +78,17 @@ multimodule JAVA_PROGRAM { } _PROCESSOR_CLASSES_VALUE= -_PROCESSOR_CLASSES_SEM= macro PROCESSOR_CLASSES(Classes...) { SET_APPEND(_PROCESSOR_CLASSES_VALUE $Classes) - SET_APPEND(_PROCESSOR_CLASSES_SEM && java-apclasses $Classes) } -_AUTO_SERVICE_SEM= macro AUTO_SERVICE(Ver) { USE_ANNOTATION_PROCESSOR(contrib/java/com/google/auto/service/auto-service/${Ver}) + # TODO Remove PEERDIR - old AP mechanic PEERDIR(contrib/java/com/google/auto/service/auto-service-annotations/${Ver}) - SET(_AUTO_SERVICE_SEM && java-apautoservice $Ver) } -_BUILD_JAVA_ANNOTATION_PROCESSOR_SEM=$BUILD_JAR_SEM $_PROCESSOR_CLASSES_SEM $_AUTO_SERVICE_SEM +_BUILD_JAVA_ANNOTATION_PROCESSOR_SEM=$BUILD_JAR_SEM ### @usage: JAVA_ANNOTATION_PROCESSOR() ### @@ -296,13 +293,11 @@ multimodule JTEST_FOR { } } -# TODO Something for using tool in RUN_JAVA_PROGRAM -_SEM_JAR_RUNNABLE= multimodule JAVA_CONTRIB_PROGRAM { module JAR_RUNNABLE: _JAR_RUNNABLE { .IGNORED=JAVA_SRCS RUN_JAR_PROGRAM RUN_JAVA_PROGRAM JAR_RESOURCE SRC_RESOURCE LOCAL_JAR .PEERDIRSELF=JAR_COMPILATION - .SEM=_SEM_JAR_RUNNABLE + .SEM=IGNORED SET(MODULE_TYPE JAVA_PROGRAM) ENABLE(DISABLE_SCRIPTGEN) @@ -526,23 +521,20 @@ macro _JAR_ANN_PROC_OPTS(Classes...) { } # tag:java-specific -_USE_ANNOTATION_PROCESSOR_TOOL= +_USE_ANNOTATION_PROCESSOR_PATH= +_USE_ANNOTATION_PROCESSOR_OPT= _USE_ANNOTATION_PROCESSOR_SEM= ### @usage: USE_ANNOTATION_PROCESSOR(Path) ### ### Used to specify annotation processor for building JAVA_PROGRAM() and JAVA_LIBRARY(). macro USE_ANNOTATION_PROCESSOR(Path) { - SET(_USE_ANNOTATION_PROCESSOR_TOOL $Path) - SET(_USE_ANNOTATION_PROCESSOR_SEM && use_annotation_processor $Path) + SET(_USE_ANNOTATION_PROCESSOR_PATH $Path) } -when ($_USE_ANNOTATION_PROCESSOR_TOOL != "") { - _USE_ANNOTATION_PROCESSOR_CMD=${tool:_USE_ANNOTATION_PROCESSOR_TOOL} - _USE_ANNOTATION_PROCESSOR_OPT=${pre=-processorpath "@";suf=.cplst:_USE_ANNOTATION_PROCESSOR_CMD} -} -otherwise { - _USE_ANNOTATION_PROCESSOR_CMD= - _USE_ANNOTATION_PROCESSOR_OPT= +when ($_USE_ANNOTATION_PROCESSOR_PATH != "") { + _USE_ANNOTATION_PROCESSOR_TOOL = ${tool:_USE_ANNOTATION_PROCESSOR_PATH} + _USE_ANNOTATION_PROCESSOR_OPT += ${pre=-processorpath "@";suf=.cplst:_USE_ANNOTATION_PROCESSOR_TOOL} + _USE_ANNOTATION_PROCESSOR_SEM += && use_annotation_processor $_USE_ANNOTATION_PROCESSOR_PATH/${nopath:_USE_ANNOTATION_PROCESSOR_TOOL} } # tag:java-specific |