ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Concat.java
Date Tue, 12 Nov 2002 12:21:32 GMT
bodewig     2002/11/12 04:21:32

  Modified:    src/etc/testcases/taskdefs Tag: ANT_15_BRANCH concat.xml
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Concat.java
  Log:
  Merge fix for PR#14310 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +3 -0      jakarta-ant/src/etc/testcases/taskdefs/concat.xml
  
  Index: concat.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/concat.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- concat.xml	8 Nov 2002 13:20:10 -0000	1.1.2.1
  +++ concat.xml	12 Nov 2002 12:21:32 -0000	1.1.2.2
  @@ -35,6 +35,9 @@
       <concat destfile="TESTDEST" append="true">
         <filelist dir="${basedir}" files="thisfiledoesnotexist"/>
       </concat>
  +    <available file="TESTDEST" property="TESTDEST.was.created"/>
  +    <fail message="TESTDEST created for nonexistant files"
  +          if="TESTDEST.was.created"/>
     </target>
   
   </project>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.3   +9 -0      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Concat.java
  
  Index: Concat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- Concat.java	8 Nov 2002 13:20:10 -0000	1.5.2.2
  +++ Concat.java	12 Nov 2002 12:21:32 -0000	1.5.2.3
  @@ -270,6 +270,9 @@
                   // Concatenate the files.
                   if (srcFiles != null) {
                       catFiles(fileSetBase, srcFiles);
  +                } else {
  +                    log("Warning: Concat received empty fileset.", 
  +                        Project.MSG_WARN);
                   }
               }
           } finally {
  @@ -321,6 +324,12 @@
           }
   
           final int len = inputFileNames.size();
  +        if (len == 0) {
  +            log("Warning: Could not find any of the files specified " +
  +                "in concat task.", Project.MSG_WARN);
  +            return;
  +        }
  +
           String[] input = new String[len];
           inputFileNames.copyInto(input);
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message