Skip to content

Issue #165: Place script/argument files in target #173

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.

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

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
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