diff options
| author | dimdim11 <[email protected]> | 2025-06-09 09:17:56 +0300 |
|---|---|---|
| committer | dimdim11 <[email protected]> | 2025-06-09 09:34:34 +0300 |
| commit | 6c44ab0f075c82d8eb1453ee8e517b177db2fb72 (patch) | |
| tree | 7b74959baeb24f7f73bab9f5d2ab85e8be2669a1 | |
| parent | a43cbf86711ff2381754cd9da293c9bb408f98ef (diff) | |
Package prefix to templates
Package prefix to templates
commit_hash:6cf5e27fcfefa5324c47919da5519ce82e4120c0
| -rw-r--r-- | build/conf/java.conf | 4 | ||||
| -rw-r--r-- | build/export_generators/ide-gradle/common_vars.jinja | 2 | ||||
| -rw-r--r-- | build/export_generators/ide-gradle/generator.toml | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 6d4dd246ec8..fe1d9d22250 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -450,8 +450,8 @@ macro _JAVA_SRCS(RESOURCES?"yes":"no", SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], # Fill semantic jar_source_set/jar_resource_set by JAVA_SRCS() Args _JAR_SOURCE_SET_SEM= macro _SEM_JAR_SOURCE_SET(SRCDIR=".", PACKAGE_PREFIX="", EXCLUDE[], FILES[], RESOURCES?"jar_resource_set":"jar_source_set", SKIP_CHECK_SRCDIR?"SKIP_CHECK_SRCDIR":"", Globs...) { - # Now ignore SKIP_CHECK_SRCDIR, PACKAGE_PREFIX, EXCLUDE, FILES - SET_APPEND(_JAR_SOURCE_SET_SEM && $RESOURCES ${pre=${SRCDIR}\::Globs}) + # Now ignore SKIP_CHECK_SRCDIR, EXCLUDE, FILES + SET_APPEND(_JAR_SOURCE_SET_SEM && $RESOURCES ${pre=${SRCDIR}\::Globs} ${pre=&& package_prefix :PACKAGE_PREFIX}) } ### Fill JAVA_SRCS to value for ya ide idea and real apply for late globs diff --git a/build/export_generators/ide-gradle/common_vars.jinja b/build/export_generators/ide-gradle/common_vars.jinja index 20349ac618d..87cbfcb3d12 100644 --- a/build/export_generators/ide-gradle/common_vars.jinja +++ b/build/export_generators/ide-gradle/common_vars.jinja @@ -34,4 +34,6 @@ {#- Lombok -#} {%- set with_lombok_plugin = not(disable_lombok_plugin) and (all_targets|selectattr('use_annotation_processor')|map(attribute='use_annotation_processor')|sum|select('startsWith', 'contrib/java/org/projectlombok/lombok')|length) -%} +{%- set package_prefix = package_prefix|select("ne", "")|first -%} + {%- include "[generator]/jdk.jinja" -%} diff --git a/build/export_generators/ide-gradle/generator.toml b/build/export_generators/ide-gradle/generator.toml index b6eac64b501..ea14e595ba2 100644 --- a/build/export_generators/ide-gradle/generator.toml +++ b/build/export_generators/ide-gradle/generator.toml @@ -42,6 +42,7 @@ junit5_test="flag" app_main_class="str" jar_source_set="list" jar_resource_set="list" +package_prefix="list" enable_preview="flag" use_annotation_processor="list" use_errorprone="flag" |