Просмотр исходного кода

Add enable_preview and annotation_processors attrs

Add enable_preview and annotation_processors attrs
dimdim11 1 год назад
Родитель
Сommit
a7db8517ca

+ 8 - 0
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

+ 2 - 0
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"

+ 2 - 0
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"