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 Tue, 24 Feb 2004 09:31:49 GMT
peterreilly    2004/02/24 01:31:49

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        MacroInstance.java
               src/etc/testcases/taskdefs Tag: ANT_16_BRANCH macrodef.xml
               src/testcases/org/apache/tools/ant/taskdefs Tag:
                        ANT_16_BRANCH MacroDefTest.java
               .        Tag: ANT_16_BRANCH WHATSNEW
  Log:
  Sync with HEAD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.5.2.18  +3 -0      ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
  
  Index: MacroInstance.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
  retrieving revision 1.5.2.17
  retrieving revision 1.5.2.18
  diff -u -r1.5.2.17 -r1.5.2.18
  --- MacroInstance.java	19 Feb 2004 12:31:43 -0000	1.5.2.17
  +++ MacroInstance.java	24 Feb 2004 09:31:48 -0000	1.5.2.18
  @@ -282,6 +282,9 @@
           for (Iterator i = macroDef.getAttributes().iterator(); i.hasNext();) {
               MacroDef.Attribute attribute = (MacroDef.Attribute) i.next();
               String value = (String) map.get(attribute.getName());
  +            if (value == null && "description".equals(attribute.getName())) {
  +                value = getDescription();
  +            }
               if (value == null) {
                   value = attribute.getDefault();
                   value = macroSubs(value, localProperties);
  
  
  
  No                   revision
  No                   revision
  1.2.2.9   +12 -0     ant/src/etc/testcases/taskdefs/macrodef.xml
  
  Index: macrodef.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/macrodef.xml,v
  retrieving revision 1.2.2.8
  retrieving revision 1.2.2.9
  diff -u -r1.2.2.8 -r1.2.2.9
  --- macrodef.xml	19 Feb 2004 12:31:43 -0000	1.2.2.8
  +++ macrodef.xml	24 Feb 2004 09:31:48 -0000	1.2.2.9
  @@ -156,4 +156,16 @@
       </macrodef>
       <escape a="avalue" b="bvalue"/>
     </target>
  +
  +  <target name="attribute.description">
  +    <macrodef name="d">
  +      <attribute name="description"/>
  +      <attribute name="d" default="p"/>
  +      <sequential>
  +        <echo>description is @{description}</echo>
  +      </sequential>
  +    </macrodef>
  +    <d description="hello world"/>
  +  </target>
  +
   </project>
  
  
  
  No                   revision
  No                   revision
  1.2.2.12  +5 -0      ant/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java
  
  Index: MacroDefTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java,v
  retrieving revision 1.2.2.11
  retrieving revision 1.2.2.12
  diff -u -r1.2.2.11 -r1.2.2.12
  --- MacroDefTest.java	19 Feb 2004 12:31:43 -0000	1.2.2.11
  +++ MacroDefTest.java	24 Feb 2004 09:31:48 -0000	1.2.2.12
  @@ -104,5 +104,10 @@
               "escape",
               "a@b or a@b is avalue@bvalue");
       }
  +    public void testAttributeDescription() {
  +        expectLog(
  +            "attribute.description",
  +            "description is hello world");
  +    }
   }
   
  
  
  
  No                   revision
  No                   revision
  1.503.2.45 +2 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.44
  retrieving revision 1.503.2.45
  diff -u -r1.503.2.44 -r1.503.2.45
  --- WHATSNEW	24 Feb 2004 09:25:02 -0000	1.503.2.44
  +++ WHATSNEW	24 Feb 2004 09:31:49 -0000	1.503.2.45
  @@ -14,6 +14,8 @@
   
   * SQL task did not work with Informix IDS 9.2. Bugzilla Report 27162.
   
  +* MacroDef did not allow attributes named 'description'. Bugzilla Report 27175.
  +
   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