github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#16133] jOOQ-codegen-gradle doesn't consider basedir property for its OutputDirectory

Browse Source
This commit is contained in:
Lukas Eder 2024-01-23 09:29:32 +01:00
parent 47339e4bb4
commit f57f1e494d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jOOQ-codegen-gradle/src/main/java/org/jooq/codegen/gradle/NamedConfiguration.java
View File

@ -56,6 +56,8 @@ import javax.inject.Inject;
import groovy.lang.*;
import org.codehaus.groovy.runtime.*;
import java.io.File;
/**
* A wrapper for a name, configuration pair.
*/
@ -117,16 +119,21 @@ public class NamedConfiguration {
action.execute(c);
configuration0(c);
if (configuration.getBasedir() == null)
configuration.setBasedir(layout.getProjectDirectory().getAsFile().getAbsolutePath());
// [#15944] Override default target directory
Target target = configuration.getGenerator().getTarget();
if (defaultTarget())
configuration.getGenerator().getTarget().setDirectory("build/generated-sources/jooq");
target.setDirectory("build/generated-sources/jooq");
outputDirectory.value(layout.getProjectDirectory().dir(target.getDirectory()));
String directory = target.getDirectory();
// [#16133] Make sure the CodegenTask's OutputDirectory takes into account any basedir config
if (configuration.getBasedir() == null)
configuration.setBasedir(layout.getProjectDirectory().getAsFile().getAbsolutePath());
else if (!new File(directory).isAbsolute())
directory = new File(configuration.getBasedir(), directory).getAbsolutePath();
outputDirectory.value(layout.getProjectDirectory().dir(directory));
outputDirectorySet = true;
}