diff options
author | Peter Reilly <peterreilly@apache.org> | 2004-01-27 17:43:25 +0000 |
---|---|---|
committer | Peter Reilly <peterreilly@apache.org> | 2004-01-27 17:43:25 +0000 |
commit | bf736586fa0347cd87d9bcb450dfe16c7263c1e4 (patch) | |
tree | 9f5febf19907c4f27320ad0774d38412b32bf300 /src/etc | |
parent | dc783273b09bd69dee29f8afd61706e328b9e666 (diff) | |
download | ant-bf736586fa0347cd87d9bcb450dfe16c7263c1e4.tar.gz |
Change textname attribute in macrodef to a text element
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275962 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/testcases/taskdefs/macrodef.xml | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/src/etc/testcases/taskdefs/macrodef.xml b/src/etc/testcases/taskdefs/macrodef.xml index 01dcd12b5..f114816de 100644 --- a/src/etc/testcases/taskdefs/macrodef.xml +++ b/src/etc/testcases/taskdefs/macrodef.xml @@ -102,8 +102,9 @@ </ignore> </target> - <target name="textname"> - <macrodef name="echotest" textname="text"> + <target name="textelement"> + <macrodef name="echotest"> + <text name="text" optional="yes"/> <sequential> <echo>@{text}</echo> </sequential> @@ -113,8 +114,31 @@ </echotest> </target> + <target name="text.trim"> + <macrodef name="echotest"> + <text name="text" trim="yes"/> + <sequential> + <echo>[@{text}]</echo> + </sequential> + </macrodef> + <echotest> + Hello world + </echotest> + </target> + <target name="duplicatetextname"> - <macrodef name="echotest" textname="text"> + <macrodef name="echotest"> + <attribute name="text"/> + <text name="text"/> + <sequential> + <echo>@{text}</echo> + </sequential> + </macrodef> + </target> + + <target name="duplicatetextname2"> + <macrodef name="echotest"> + <text name="text"/> <attribute name="text"/> <sequential> <echo>@{text}</echo> |