describe compiler configuration on run

Author: hboutemy

plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java

@@ -24,6 +24,8 @@
  * SOFTWARE.
  */
 
+import org.codehaus.plexus.util.StringUtils;
+
 import java.io.File;
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -812,4 +814,54 @@ public void setImplicitOption( String implicitOption )
     {
         this.implicitOption = implicitOption;
     }
+
+    public String describe( String id )
+    {
+        List<String> params = new ArrayList<>();
+        params.add( id );
+        if ( isFork() )
+        {
+            params.add( "forked" );
+        }
+
+        // base options: debug, optimize, verbose, deprecation
+        if ( isDebug() )
+        {
+            if ( StringUtils.isNotEmpty( getDebugLevel() ) )
+            {
+                params.add( "debug:" + getDebugLevel() );
+            }
+            else
+            {
+                params.add( "debug" );
+            }
+        }
+        if ( isOptimize() )
+        {
+            params.add( "optimize" );
+        }
+        if ( isVerbose() )
+        {
+            params.add( "verbose" );
+        }
+        if ( isShowDeprecation() )
+        {
+            params.add( "deprecation" );
+        }
+
+        // target bytecode options: release or target, module-path
+        if ( !StringUtils.isEmpty( getReleaseVersion() ) )
+        {
+            params.add( "release " + getReleaseVersion() );
+        }
+        else if ( !StringUtils.isEmpty( getTargetVersion() ) )
+        {
+            params.add( "target " + getTargetVersion() );
+        }
+        if ( getModulepathEntries() != null && !getModulepathEntries().isEmpty() )
+        {
+            params.add( "module-path" );
+        }
+        return String.join( " ", params );
+    }
 }

plexus-compiler-its/src/main/it/simple-javac-fork/pom.xml

@@ -24,16 +24,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.codehaus.plexus.compiler.it</groupId>
-  <artifactId>simple-javac</artifactId>
+  <artifactId>simple-javac-forked</artifactId>
   <version>1.0-SNAPSHOT</version>
 
-  <name>Test for default configuration</name>
+  <name>Test for default configuration with forked=true</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.release>11</maven.compiler.release>
     <plexus.compiler.version>@pom.version@</plexus.compiler.version>
   </properties>
 

plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java

@@ -320,7 +320,14 @@ public CompilerResult performCompile( CompilerConfiguration config )
             return new CompilerResult();
         }
 
+<<<<<<< Upstream, based on plexus/master
         logCompiling( sourceFiles, config );
+=======
+        System.out.println(
+            "Compiling " + sourceFiles.length + " source file" + ( sourceFiles.length == 1 ? "" : "s" ) +
+                    " with " + config.describe( "aspectj" ) +
+                    " to " + destinationDir.getAbsolutePath() );
+>>>>>>> 97348ff describe compiler configuration on run
 
         //        String[] args = buildCompilerArguments( config, sourceFiles );
         AjBuildConfig buildConfig = buildCompilerConfig( config );

plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java

@@ -371,6 +371,10 @@ public void report( Diagnostic<? extends JavaFileObject> diagnostic )
                     args.add( errorF.toString() );
                     args.addAll( allSources );
 
+                    String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() :
+                        config.getWorkingDirectory().toPath().relativize( new File( config.getOutputLocation() ).toPath() ).toString();
+                    getLogger().info( "Compiling with " + config.describe( "eclipse" ) +
+                            " to " + to );
                     getLogger().debug( "ecj command line: " + args );
 
                     success = BatchCompiler.compile( args.toArray( new String[args.size()] ), devNull, devNull,

plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java

@@ -141,7 +141,17 @@ public CompilerResult performCompile( CompilerConfiguration config )
             return new CompilerResult();
         }
 
+<<<<<<< Upstream, based on plexus/master
         logCompiling( sourceFiles, config );
+=======
+        if ( ( getLogger() != null ) && getLogger().isInfoEnabled() )
+        {
+            getLogger().info( "Compiling " + sourceFiles.length +
+                                  " source file" + ( sourceFiles.length == 1 ? "" : "s" ) +
+                                  " with " + config.describe( "javac" ) +
+                                  " to " + destinationDir.getAbsolutePath() );
+        }
+>>>>>>> 97348ff describe compiler configuration on run
 
         String[] args = buildCompilerArguments( config, sourceFiles );