From b3968729c23c8012887de848f26eb4f219f4c527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Sat, 10 Dec 2022 19:38:31 +0100 Subject: [PATCH 1/2] simplify "Compiling" info message: display relative path --- .../org/codehaus/plexus/compiler/ajc/AspectJCompiler.java | 4 +++- .../org/codehaus/plexus/compiler/javac/JavacCompiler.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java index 83053d48..d62d5871 100644 --- a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java +++ b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java @@ -320,9 +320,11 @@ public CompilerResult performCompile( CompilerConfiguration config ) return new CompilerResult(); } + String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() : + config.getWorkingDirectory().toPath().relativize( destinationDir.toPath() ).toString(); System.out.println( "Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + " to " - + destinationDir.getAbsolutePath() ); + + to ); // String[] args = buildCompilerArguments( config, sourceFiles ); AjBuildConfig buildConfig = buildCompilerConfig( config ); diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java index 136319e6..9dbf357e 100644 --- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java +++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java @@ -143,9 +143,11 @@ public CompilerResult performCompile( CompilerConfiguration config ) if ( ( getLogger() != null ) && getLogger().isInfoEnabled() ) { + String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() : + config.getWorkingDirectory().toPath().relativize( destinationDir.toPath() ).toString(); getLogger().info( "Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + - " to " + destinationDir.getAbsolutePath() ); + " to " + to ); } String[] args = buildCompilerArguments( config, sourceFiles ); From 37f6843f4dfbf0a8a9caa185926d16ab8b55f0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Thu, 15 Dec 2022 23:04:37 +0100 Subject: [PATCH 2/2] share "Compiling" log message logic in AbstractCompiler --- .../plexus/compiler/AbstractCompiler.java | 12 ++++++++++++ .../src/main/it/error-prone-compiler/pom.xml | 17 +++++++++++++++++ .../plexus/compiler/ajc/AspectJCompiler.java | 6 +----- .../plexus/compiler/csharp/CSharpCompiler.java | 3 +-- .../compiler/eclipse/EclipseJavaCompiler.java | 2 ++ .../plexus/compiler/j2objc/J2ObjCCompiler.java | 4 +--- .../plexus/compiler/javac/JavacCompiler.java | 9 +-------- 7 files changed, 35 insertions(+), 18 deletions(-) diff --git a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java index 579e6280..2a64b691 100644 --- a/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java +++ b/plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java @@ -299,4 +299,16 @@ protected static String[] toStringArray( List arguments ) return args; } + + protected void logCompiling( String[] sourceFiles, CompilerConfiguration config ) + { + if ( ( getLogger() != null ) && getLogger().isInfoEnabled() ) + { + String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() : + config.getWorkingDirectory().toPath().relativize( new File( config.getOutputLocation() ).toPath() ).toString(); + getLogger().info( "Compiling " + + ( sourceFiles == null ? "" : ( sourceFiles.length + " source file" + ( sourceFiles.length == 1 ? " " : "s " ) ) ) + + "to " + to ); + } + } } diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml index 47466656..bbdb70fb 100644 --- a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml +++ b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml @@ -65,6 +65,23 @@ + + + org.codehaus.plexus + plexus-compiler-api + ${plexus.compiler.version} + + + org.codehaus.plexus + plexus-compiler-javac-errorprone + ${plexus.compiler.version} + + + org.codehaus.plexus + plexus-compiler-javac + ${plexus.compiler.version} + + diff --git a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java index d62d5871..ae1a7daf 100644 --- a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java +++ b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java @@ -320,11 +320,7 @@ public CompilerResult performCompile( CompilerConfiguration config ) return new CompilerResult(); } - String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() : - config.getWorkingDirectory().toPath().relativize( destinationDir.toPath() ).toString(); - System.out.println( - "Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + " to " - + to ); + logCompiling( sourceFiles, config ); // String[] args = buildCompilerArguments( config, sourceFiles ); AjBuildConfig buildConfig = buildCompilerConfig( config ); diff --git a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java index 3266f925..dc6e01ef 100644 --- a/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java +++ b/plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java @@ -115,8 +115,7 @@ public CompilerResult performCompile( CompilerConfiguration config ) return new CompilerResult().success( true ); } - System.out.println( "Compiling " + sourceFiles.length + " " + "source file" + - ( sourceFiles.length == 1 ? "" : "s" ) + " to " + destinationDir.getAbsolutePath() ); + logCompiling( sourceFiles, config ); String[] args = buildCompilerArguments( config, sourceFiles ); diff --git a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java index 330936d3..f12891f4 100644 --- a/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java +++ b/plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java @@ -251,6 +251,8 @@ public CompilerResult performCompile( CompilerConfiguration config ) allSources = resortSourcesToPutModuleInfoFirst( allSources ); + logCompiling( null, config ); + // Compile try { diff --git a/plexus-compilers/plexus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java b/plexus-compilers/plexus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java index d4098e00..2621968a 100644 --- a/plexus-compilers/plexus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java +++ b/plexus-compilers/plexus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java @@ -122,9 +122,7 @@ public CompilerResult performCompile( CompilerConfiguration config ) return new CompilerResult().success( true ); } - System.out.println( - "Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + " to " - + destinationDir.getAbsolutePath() ); + logCompiling( sourceFiles, config ); String[] args = buildCompilerArguments( config, sourceFiles ); diff --git a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java index 9dbf357e..b53e52c0 100644 --- a/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java +++ b/plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java @@ -141,14 +141,7 @@ public CompilerResult performCompile( CompilerConfiguration config ) return new CompilerResult(); } - if ( ( getLogger() != null ) && getLogger().isInfoEnabled() ) - { - String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() : - config.getWorkingDirectory().toPath().relativize( destinationDir.toPath() ).toString(); - getLogger().info( "Compiling " + sourceFiles.length + " " + - "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + - " to " + to ); - } + logCompiling( sourceFiles, config ); String[] args = buildCompilerArguments( config, sourceFiles );