ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant WHATSNEW
Date Fri, 27 Feb 2004 11:54:53 GMT
peterreilly    2004/02/27 03:54:53

  Modified:    src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH
                        ProjectHelper2.java
               .        Tag: ANT_16_BRANCH WHATSNEW
  Log:
  Sync with head
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.33.2.9  +8 -0      ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
  
  Index: ProjectHelper2.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
  retrieving revision 1.33.2.8
  retrieving revision 1.33.2.9
  diff -u -r1.33.2.8 -r1.33.2.9
  --- ProjectHelper2.java	9 Feb 2004 22:12:16 -0000	1.33.2.8
  +++ ProjectHelper2.java	27 Feb 2004 11:54:53 -0000	1.33.2.9
  @@ -804,6 +804,14 @@
   
               // If the name has already been defined ( import for example )
               if (currentTargets.containsKey(name)) {
  +                if (!context.isIgnoringProjectTag()) {
  +                    // not in a import'ed file
  +                    throw new BuildException(
  +                        "Duplicate target '" + name + "'",
  +                        new Location(context.getLocator().getSystemId(),
  +                                     context.getLocator().getLineNumber(),
  +                                     context.getLocator().getColumnNumber()));
  +                }
                   // Alter the name.
                   if (context.getCurrentProjectName() != null) {
                       String newName = context.getCurrentProjectName()
  
  
  
  No                   revision
  No                   revision
  1.503.2.48 +5 -1      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.47
  retrieving revision 1.503.2.48
  diff -u -r1.503.2.47 -r1.503.2.48
  --- WHATSNEW	24 Feb 2004 14:29:37 -0000	1.503.2.47
  +++ WHATSNEW	27 Feb 2004 11:54:53 -0000	1.503.2.48
  @@ -16,7 +16,11 @@
   
   * MacroDef did not allow attributes named 'description'. Bugzilla Report 27175.
   
  -* Throw build exception if name attribute missing from patternset. Bugzilla Report 25982.
  +* Throw build exception if name attribute missing from patternset#NameEntry.
  +  Bugzilla Report 25982.
  +
  +* Throw build exception if target repeated in build file, but allow targets
  +  to be repeated in imported files. 
   
   Other changes:
   --------------
  
  
  

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


Mime
View raw message