Skip to content

Add support for "parameters" flag #29

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

Merged
merged 1 commit into from
May 29, 2017
Merged

Add support for "parameters" flag #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion plexus-compiler-api/src/main/java/org/codehaus/plexus/compiler/CompilerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ public class CompilerConfiguration

private boolean verbose = false;

private boolean parameters;

/**
* A build temporary directory, eg target/.
* <p/>
Expand Down Expand Up @@ -564,7 +566,17 @@ public void setVerbose( boolean verbose )
this.verbose = verbose;
}

public void setProc( String proc )
public boolean isParameters()
{
return parameters;
}

public void setParameters(boolean parameters)
{
this.parameters = parameters;
}

public void setProc(String proc )
{
this.proc = proc;
}
Expand Down
5 changes: 5 additions & 0 deletions ...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ public CompilerResult performCompile( CompilerConfiguration config )
settings.put( CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.IGNORE );
}

if ( config.isParameters() )
{
settings.put( CompilerOptions.OPTION_MethodParametersAttribute, CompilerOptions.GENERATE );
}

// ----------------------------------------------------------------------
// Set Eclipse-specific options
// ----------------------------------------------------------------------
Expand Down
18 changes: 18 additions & 0 deletions ...plexus-compiler-javac/src/main/java/org/codehaus/plexus/compiler/javac/JavacCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@ public static String[] buildCompilerArguments( CompilerConfiguration config, Str
args.add( "-verbose" );
}

if ( !isPreJava18(config) && config.isParameters() )
{
args.add( "-parameters" );
}

if ( config.isShowDeprecation() )
{
args.add( "-deprecation" );
Expand Down Expand Up @@ -439,6 +444,19 @@ private static boolean isPreJava16( CompilerConfiguration config )
|| v.startsWith( "1.1" ) || v.startsWith( "1.0" );
}

private static boolean isPreJava18( CompilerConfiguration config )
{
String v = config.getCompilerVersion();

if ( v == null )
{
return true;
}

return v.startsWith( "1.7" ) || v.startsWith( "1.6" ) || v.startsWith( "1.5" ) || v.startsWith( "1.4" )
|| v.startsWith( "1.3" ) || v.startsWith( "1.2" ) || v.startsWith( "1.1" ) || v.startsWith( "1.0" );
}


private static boolean suppressSource( CompilerConfiguration config )
{
Expand Down
34 changes: 28 additions & 6 deletions ...ler-javac/src/test/java/org/codehaus/plexus/compiler/javac/AbstractJavacCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void testBuildCompilerArgs13()

compilerConfiguration.setCompilerVersion( "1.3" );

populateArguments( compilerConfiguration, expectedArguments, true, true );
populateArguments( compilerConfiguration, expectedArguments, true, true, false );

internalTest( compilerConfiguration, expectedArguments );
}
Expand All @@ -117,7 +117,7 @@ public void testBuildCompilerArgs14()

compilerConfiguration.setCompilerVersion( "1.4" );

populateArguments( compilerConfiguration, expectedArguments, false, false );
populateArguments( compilerConfiguration, expectedArguments, false, false, false );

internalTest( compilerConfiguration, expectedArguments );
}
Expand All @@ -130,7 +130,20 @@ public void testBuildCompilerArgs15()

compilerConfiguration.setCompilerVersion( "1.5" );

populateArguments( compilerConfiguration, expectedArguments, false, false );
populateArguments( compilerConfiguration, expectedArguments, false, false, false );

internalTest( compilerConfiguration, expectedArguments );
}

public void testBuildCompilerArgs18()
{
List<String> expectedArguments = new ArrayList<String>();

CompilerConfiguration compilerConfiguration = new CompilerConfiguration();

compilerConfiguration.setCompilerVersion( "1.8" );

populateArguments( compilerConfiguration, expectedArguments, false, false, true );

internalTest( compilerConfiguration, expectedArguments );
}
Expand All @@ -141,7 +154,7 @@ public void testBuildCompilerArgsUnspecifiedVersion()

CompilerConfiguration compilerConfiguration = new CompilerConfiguration();

populateArguments( compilerConfiguration, expectedArguments, false, false );
populateArguments( compilerConfiguration, expectedArguments, false, false, false );

internalTest( compilerConfiguration, expectedArguments );
}
Expand All @@ -156,7 +169,7 @@ public void testBuildCompilerDebugLevel()

compilerConfiguration.setDebugLevel( "none" );

populateArguments( compilerConfiguration, expectedArguments, false, false );
populateArguments( compilerConfiguration, expectedArguments, false, false, false );

internalTest( compilerConfiguration, expectedArguments );
}
Expand Down Expand Up @@ -320,7 +333,7 @@ public void testCommandLineTooLongWhenForking()
*/

private void populateArguments( CompilerConfiguration compilerConfiguration, List<String> expectedArguments,
boolean suppressSourceVersion, boolean suppressEncoding )
boolean suppressSourceVersion, boolean suppressEncoding, boolean parameters )
{
// outputLocation

Expand Down Expand Up @@ -371,6 +384,15 @@ private void populateArguments( CompilerConfiguration compilerConfiguration, Lis
expectedArguments.add( "-g" );
}

// parameters

compilerConfiguration.setParameters( true );

if (parameters)
{
expectedArguments.add( "-parameters" );
}

// showDeprecation

compilerConfiguration.setShowDeprecation( true );
Expand Down