Skip to content

Commit d965055

Browse files
committed
Extract common Antlr4 generated directory field to super class.
1 parent 2f19152 commit d965055

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/bld/java/rife/AbstractRife2Build.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ public AbstractRife2Build()
4949
new File(workDirectory(), "embedded_dbs"),
5050
new File(workDirectory(), "logs"));
5151

52+
buildGeneratedDir = new File(buildDirectory(), "generated");
5253
antlr4Operation
54+
.outputDirectory(new File(buildGeneratedDir, "rife/template/antlr"))
5355
.visitor()
5456
.longMessages();
5557

@@ -72,6 +74,8 @@ public AbstractRife2Build()
7274
.link("https://jsoup.org/apidocs/");
7375
}
7476

77+
final File buildGeneratedDir;
78+
7579
void propagateJavaProperties(JavaOptions options, String... names) {
7680
for (var name : names) {
7781
if (properties().contains(name)) {

src/bld/java/rife/CoreBuild.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ public CoreBuild()
2121

2222
version = VersionNumber.parse(FileUtils.readString(new File(srcMainResourcesDirectory(), "CORE_VERSION")));
2323

24-
buildGeneratedDir = new File(buildDirectory(), "generated");
2524
antlr4Operation
26-
.sourceDirectories(List.of(new File(srcMainDirectory(), "antlr")))
27-
.outputDirectory(new File(buildGeneratedDir, "rife/template/antlr"));
25+
.sourceDirectories(List.of(new File(srcMainDirectory(), "antlr")));
2826

2927
precompileOperation()
3028
.templateTypes(HTML, XML, SQL);
@@ -67,8 +65,7 @@ public CoreBuild()
6765
.signPassphrase(property("sign.passphrase")));
6866
}
6967

70-
private final File buildGeneratedDir;
71-
private final File srcMainModuleDir;
68+
final File srcMainModuleDir;
7269

7370
@Override
7471
public void javadoc()

0 commit comments

Comments
 (0)