Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit dcac4ea

Browse filesBrowse files
hboutemyhboutemy
authored
simplify "Compiling" info message: display relative path (#250)
simplify "Compiling" info message: display relative path
1 parent 2bbba88 commit dcac4ea
Copy full SHA for dcac4ea

File tree

Expand file treeCollapse file tree

7 files changed

+35
-14
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+35
-14
lines changed

‎plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java

Copy file name to clipboardExpand all lines: plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/AbstractCompiler.java
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,4 +299,16 @@ protected static String[] toStringArray( List<String> arguments )
299299

300300
return args;
301301
}
302+
303+
protected void logCompiling( String[] sourceFiles, CompilerConfiguration config )
304+
{
305+
if ( ( getLogger() != null ) && getLogger().isInfoEnabled() )
306+
{
307+
String to = ( config.getWorkingDirectory() == null ) ? config.getOutputLocation() :
308+
config.getWorkingDirectory().toPath().relativize( new File( config.getOutputLocation() ).toPath() ).toString();
309+
getLogger().info( "Compiling " +
310+
( sourceFiles == null ? "" : ( sourceFiles.length + " source file" + ( sourceFiles.length == 1 ? " " : "s " ) ) ) +
311+
"to " + to );
312+
}
313+
}
302314
}

‎plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml

Copy file name to clipboardExpand all lines: plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml
+17Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,23 @@
6565
</path>
6666
</annotationProcessorPaths>
6767
</configuration>
68+
<dependencies>
69+
<dependency>
70+
<groupId>org.codehaus.plexus</groupId>
71+
<artifactId>plexus-compiler-api</artifactId>
72+
<version>${plexus.compiler.version}</version>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.codehaus.plexus</groupId>
76+
<artifactId>plexus-compiler-javac-errorprone</artifactId>
77+
<version>${plexus.compiler.version}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.codehaus.plexus</groupId>
81+
<artifactId>plexus-compiler-javac</artifactId>
82+
<version>${plexus.compiler.version}</version>
83+
</dependency>
84+
</dependencies>
6885
</plugin>
6986
</plugins>
7087
</build>

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

Copy file name to clipboardExpand all lines: plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
320320
return new CompilerResult();
321321
}
322322

323-
System.out.println(
324-
"Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + " to "
325-
+ destinationDir.getAbsolutePath() );
323+
logCompiling( sourceFiles, config );
326324

327325
// String[] args = buildCompilerArguments( config, sourceFiles );
328326
AjBuildConfig buildConfig = buildCompilerConfig( config );

‎plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java

Copy file name to clipboardExpand all lines: plexus-compilers/plexus-compiler-csharp/src/main/java/org/codehaus/plexus/compiler/csharp/CSharpCompiler.java
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
115115
return new CompilerResult().success( true );
116116
}
117117

118-
System.out.println( "Compiling " + sourceFiles.length + " " + "source file" +
119-
( sourceFiles.length == 1 ? "" : "s" ) + " to " + destinationDir.getAbsolutePath() );
118+
logCompiling( sourceFiles, config );
120119

121120
String[] args = buildCompilerArguments( config, sourceFiles );
122121

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

Copy file name to clipboardExpand all lines: plexus-compilers/plexus-compiler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ public CompilerResult performCompile( CompilerConfiguration config )
251251

252252
allSources = resortSourcesToPutModuleInfoFirst( allSources );
253253

254+
logCompiling( null, config );
255+
254256
// Compile
255257
try
256258
{

‎plexus-compilers/plexus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java

Copy file name to clipboardExpand all lines: plexus-compilers/plexus-compiler-j2objc/src/main/java/org/codehaus/plexus/compiler/j2objc/J2ObjCCompiler.java
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
122122
return new CompilerResult().success( true );
123123
}
124124

125-
System.out.println(
126-
"Compiling " + sourceFiles.length + " " + "source file" + ( sourceFiles.length == 1 ? "" : "s" ) + " to "
127-
+ destinationDir.getAbsolutePath() );
125+
logCompiling( sourceFiles, config );
128126

129127
String[] args = buildCompilerArguments( config, sourceFiles );
130128

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

Copy file name to clipboardExpand all lines: plexus-compilers/plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
+1-6Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,7 @@ public CompilerResult performCompile( CompilerConfiguration config )
141141
return new CompilerResult();
142142
}
143143

144-
if ( ( getLogger() != null ) && getLogger().isInfoEnabled() )
145-
{
146-
getLogger().info( "Compiling " + sourceFiles.length + " " +
147-
"source file" + ( sourceFiles.length == 1 ? "" : "s" ) +
148-
" to " + destinationDir.getAbsolutePath() );
149-
}
144+
logCompiling( sourceFiles, config );
150145

151146
String[] args = buildCompilerArguments( config, sourceFiles );
152147

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.