Skip to content

Commit b504250

Browse files
dimdim1177dimdim1177
committed
Unique source/resource sets, refactor templates
Unique source/resource sets, refactor templates commit_hash:b23a8d4a220dc84dcb59d63e8924cc5e70537ba7
1 parent e57003d commit b504250

File tree

5 files changed

+41
-72
lines changed

5 files changed

+41
-72
lines changed

‎build/export_generators/ide-gradle/build.gradle.kts.any.jinja

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
{%- include "[generator]/proto_builddir.jinja" -%}
3535
{%- include "[generator]/proto_plugins.jinja" -%}
3636
{%- include "[generator]/proto_configuration.jinja" -%}
37-
{%- include "[generator]/proto_source_sets.jinja" -%}
3837
{%- include "[generator]/protobuf.jinja" -%}
3938
{%- include "[generator]/proto_prepare.jinja" -%}
4039
{%- include "[generator]/build.gradle.kts.common.jinja" -%}
@@ -47,7 +46,6 @@
4746
{%- include "[generator]/kotlin_plugins.jinja" -%}
4847
{%- include "[generator]/preview.jinja" -%}
4948
{%- include "[generator]/configuration.jinja" -%}
50-
{%- include "[generator]/source_sets.jinja" -%}
5149
{%- include "[generator]/test.jinja" -%}
5250
{%- include "[generator]/build.gradle.kts.common.jinja" -%}
5351
{%- include "[generator]/dependencies.jinja" -%}

‎build/export_generators/ide-gradle/build.gradle.kts.common.jinja

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
{%- include "[generator]/javac_flags.jinja" -%}
66
{%- include "[generator]/kotlinc_flags.jinja" -%}
77

8+
{%- include "[generator]/source_sets.jinja" -%}
89
{%- include "[generator]/codegen.jinja" -%}
910

10-
{%- include "[generator]/javadoc.jinja" -%}
11+
{#- To disable redundant javadoc (it may fail the build) #}
12+
13+
tasks.withType<Javadoc>().configureEach {
14+
isEnabled = false
15+
}

‎build/export_generators/ide-gradle/javadoc.jinja

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎build/export_generators/ide-gradle/proto_source_sets.jinja

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎build/export_generators/ide-gradle/source_sets.jinja

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{#- empty string #}
22
sourceSets {
3-
{%- if target.runs|length or target.jar_source_set|length %}
3+
{%- set target_jar_source_set = target.jar_source_set|reject('startsWith', 'src/main/java:')|unique -%}
4+
{%- set target_jar_resource_set = target.jar_resource_set|reject('startsWith', 'src/main/resources:')|unique -%}
5+
{%- if proto_template or target_jar_source_set|length or target_jar_resource_set|length %}
46
main {
57
{#-
68
Default by Gradle:
@@ -9,23 +11,25 @@ sourceSets {
911
resources.srcDir("src/main/resources")
1012
1113
#}
12-
{%- if target.jar_source_set|length -%}
13-
{%- for source_set in target.jar_source_set -%}
14+
{%- if target_jar_source_set|length -%}
15+
{%- for source_set in target_jar_source_set -%}
1416
{%- set srcdir_glob = split(source_set, ':') -%}
15-
{%- set srcdir = srcdir_glob[0] -%}
16-
{%- if srcdir != 'src/main/java' %}
17+
{%- set srcdir = srcdir_glob[0] %}
1718
java.srcDir({{ PatchRoots(srcdir) }})
18-
{%- endif -%}
1919
{%- endfor -%}
2020
{%- endif %}
21-
{%- if target.jar_resource_set|length -%}
22-
{%- for resource_set in target.jar_resource_set -%}
21+
{%- if target_jar_resource_set|length -%}
22+
{%- for resource_set in target_jar_resource_set -%}
2323
{%- set resdir_glob = split(resource_set, ':') -%}
24-
{%- set resdir = resdir_glob[0] -%}
25-
{%- if resdir != 'src/main/resources' %}
24+
{%- set resdir = resdir_glob[0] %}
2625
resources.srcDir({{ PatchRoots(resdir) }})
27-
{%- endif -%}
2826
{%- endfor -%}
27+
{%- endif -%}
28+
{%- if proto_template %}
29+
java.srcDir("$buildDir/generated/source/proto/main/java")
30+
{%- if target.proto_grpc %}
31+
java.srcDir("$buildDir/generated/source/proto/main/grpc")
32+
{%- endif %}
2933
{%- endif %}
3034
}
3135
{%- endif %}
@@ -37,6 +41,12 @@ sourceSets {
3741
resources.srcDir("src/test/resources")
3842
3943
#}
44+
{%- if proto_template %}
45+
java.srcDir("$buildDir/generated/source/proto/test/java")
46+
{%- if target.proto_grpc %}
47+
java.srcDir("$buildDir/generated/source/proto/test/grpc")
48+
{%- endif -%}
49+
{%- else %}
4050
java.srcDir("ut/java")
4151
resources.srcDir("ut/resources")
4252
java.srcDir("src/test-integration/java")
@@ -48,25 +58,22 @@ sourceSets {
4858
java.srcDir("src/intTest/java")
4959
resources.srcDir("src/intTest/resources")
5060

51-
{%- set extra_target_source_sets = extra_targets|selectattr('jar_source_set')|map(attribute='jar_source_set')|sum|unique -%}
52-
{%- if extra_target_source_sets|length -%}
53-
{%- for source_set in extra_target_source_sets -%}
54-
{%- set srcdir_glob = split(source_set, ':') -%}
55-
{%- set srcdir = srcdir_glob[0] -%}
56-
{%- if srcdir != 'src/test/java' %}
61+
{%- set extra_target_source_sets = extra_targets|selectattr('jar_source_set')|map(attribute='jar_source_set')|sum|reject('startsWith', 'src/test/java:')|unique -%}
62+
{%- if extra_target_source_sets|length -%}
63+
{%- for source_set in extra_target_source_sets -%}
64+
{%- set srcdir_glob = split(source_set, ':') -%}
65+
{%- set srcdir = srcdir_glob[0] %}
5766
java.srcDir({{ PatchRoots(srcdir) }})
58-
{%- endif -%}
59-
{%- endfor -%}
60-
{%- endif %}
61-
{%- set extra_target_resource_sets = extra_targets|selectattr('jar_resource_set')|map(attribute='jar_resource_set')|sum|unique -%}
62-
{%- if extra_target_resource_sets|length -%}
63-
{%- for resource_set in extra_target_resource_sets -%}
64-
{%- set resdir_glob = split(resource_set, ':') -%}
65-
{%- set resdir = resdir_glob[0] -%}
66-
{%- if resdir != 'src/main/resources' %}
67+
{%- endfor -%}
68+
{%- endif %}
69+
{%- set extra_target_resource_sets = extra_targets|selectattr('jar_resource_set')|map(attribute='jar_resource_set')|sum|reject('startsWith', 'src/test/resources:')|unique -%}
70+
{%- if extra_target_resource_sets|length -%}
71+
{%- for resource_set in extra_target_resource_sets -%}
72+
{%- set resdir_glob = split(resource_set, ':') -%}
73+
{%- set resdir = resdir_glob[0] %}
6774
resources.srcDir({{ PatchRoots(resdir) }})
68-
{%- endif -%}
69-
{%- endfor -%}
75+
{%- endfor -%}
76+
{%- endif -%}
7077
{%- endif %}
7178
}
7279
}

0 commit comments

Comments
 (0)