Skip to content

Commit

Permalink
Issue #165: Place script/argument files in target
Browse files Browse the repository at this point in the history
With this the arguments and `java.[sh|bat` files will be created in the
build directory (usually `target`), rather than in the output directory
(usually `target/classes`).

Fixes #165
  • Loading branch information
zregvart committed Dec 17, 2021
1 parent 5a40182 commit c95da61
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ protected CompilerResult compileOutOfProcess( CompilerConfiguration config, Stri

try
{
File argumentsFile = createFileWithArguments( args, config.getOutputLocation() );
File argumentsFile = createFileWithArguments( args, config.getBuildDirectory() );
cli.addArguments(
new String[]{ "@" + argumentsFile.getCanonicalPath().replace( File.separatorChar, '/' ) } );

Expand Down Expand Up @@ -595,7 +595,7 @@ protected CompilerResult compileOutOfProcess( CompilerConfiguration config, Stri
if ( ( getLogger() != null ) && getLogger().isDebugEnabled() )
{
File commandLineFile =
new File( config.getOutputLocation(), "javac." + ( Os.isFamily( Os.FAMILY_WINDOWS ) ? "bat" : "sh" ) );
new File( config.getBuildDirectory(), "javac." + ( Os.isFamily( Os.FAMILY_WINDOWS ) ? "bat" : "sh" ) );
try
{
FileUtils.fileWrite( commandLineFile.getAbsolutePath(), cli.toString().replaceAll( "'", "" ) );
Expand Down Expand Up @@ -979,7 +979,7 @@ private static String getWarnPrefix( String msg )
* @return the temporary file wth the arguments
* @throws IOException
*/
private File createFileWithArguments( String[] args, String outputDirectory )
private File createFileWithArguments( String[] args, File outputDirectory )
throws IOException
{
PrintWriter writer = null;
Expand All @@ -989,7 +989,7 @@ private File createFileWithArguments( String[] args, String outputDirectory )
if ( ( getLogger() != null ) && getLogger().isDebugEnabled() )
{
tempFile =
File.createTempFile( JavacCompiler.class.getName(), "arguments", new File( outputDirectory ) );
File.createTempFile( JavacCompiler.class.getName(), "arguments", outputDirectory );
}
else
{
Expand Down

0 comments on commit c95da61

Please sign in to comment.