Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MCOMPILER-549] Improve log message in case of recompilation #201

Merged
merged 5 commits into from
Oct 17, 2023
Merged

[MCOMPILER-549] Improve log message in case of recompilation #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0e1b53
idk refactored to immutableOutputFile
BrowneMonke Oct 13, 2023
ff17b52
rephrased log output
BrowneMonke Oct 13, 2023
d2704a4
reformatted code
BrowneMonke Oct 13, 2023
99d3773
improved log message
BrowneMonke Oct 13, 2023
5127b01
updated test case
BrowneMonke Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/it/MCOMPILER-500-package-info-incr/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def logFile = new File( basedir, 'build.log' )
assert logFile.exists()
content = logFile.text

assert 1 == content.count( 'Changes detected - recompiling the module!' )
assert 1 == content.count( 'Nothing to compile - all classes are up to date' )
assert 1 == content.count( "Recompiling the module because of ")
assert 1 == content.count( 'Nothing to compile - all classes are up to date.' )


16 changes: 9 additions & 7 deletions src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,20 +878,22 @@ public void execute() throws MojoExecutionException, CompilationFailureException

DirectoryScanResult dsr = computeInputFileTreeChanges(incrementalBuildHelper, sources);

boolean idk = compiler.getCompilerOutputStyle()
boolean immutableOutputFile = compiler.getCompilerOutputStyle()
.equals(CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES)
&& !canUpdateTarget;
boolean dependencyChanged = isDependencyChanged();
boolean sourceChanged = isSourceChanged(compilerConfiguration, compiler);
boolean inputFileTreeChanged = hasInputFileTreeChanged(dsr);
// CHECKSTYLE_OFF: LineLength
if (idk || dependencyChanged || sourceChanged || inputFileTreeChanged)
if (immutableOutputFile || dependencyChanged || sourceChanged || inputFileTreeChanged)
// CHECKSTYLE_ON: LineLength
{
String cause = idk
? "idk"
: (dependencyChanged ? "dependency" : (sourceChanged ? "source" : "input tree"));
getLog().info("Changes detected - recompiling the module! :" + cause);
String cause = immutableOutputFile
? "immutable single output file"
: (dependencyChanged
? "changed dependency"
: (sourceChanged ? "changed source code" : "added or removed source files"));
getLog().info("Recompiling the module because of " + cause + ".");
if (showCompilationChanges) {
for (String fileAdded : dsr.getFilesAdded()) {
getLog().info("\t+ " + fileAdded);
Expand All @@ -903,7 +905,7 @@ public void execute() throws MojoExecutionException, CompilationFailureException

compilerConfiguration.setSourceFiles(sources);
} else {
getLog().info("Nothing to compile - all classes are up to date");
getLog().info("Nothing to compile - all classes are up to date.");

return;
}
Expand Down