From b0b920b08fae74de3fd7a7dd5efbca9e8cf379e6 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 11 Jun 2010 07:33:07 +0000 Subject: [PATCH] faild for long command lines on OS/2. PR 49425. Submitted by git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@953594 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ .../ant/taskdefs/compilers/DefaultCompilerAdapter.java | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 3b2f3a84d..9d9b40f81 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -51,6 +51,9 @@ Fixed bugs: itself. Bugzilla Report 49420. + * failed for long command lines on OS/2. + Bugzilla Report 49425. + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index c43204fa0..de21af058 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -45,7 +45,15 @@ import org.apache.tools.ant.taskdefs.condition.Os; * @since Ant 1.3 */ public abstract class DefaultCompilerAdapter implements CompilerAdapter { - private static final int COMMAND_LINE_LIMIT = 4096; // 4K + private static final int COMMAND_LINE_LIMIT; + static { + if (Os.isFamily("os/2")) { + // OS/2 CMD.EXE has a much smaller limit around 1K + COMMAND_LINE_LIMIT = 1000; + } else { + COMMAND_LINE_LIMIT = 4096; // 4K + } + } // CheckStyle:VisibilityModifier OFF - bc private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();