Make if and unless attributes of <target> dynamically evaluated

PR:	2955


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269437 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/ProjectHelper.java

@@ -703,7 +703,7 @@ public class ProjectHelper {
      *
      * @param value the string to be scanned for property references.
      */
-    public static String replaceProperties(Project project, String value, Hashtable keys )
+    public static String replaceProperties(Project project, String value, Hashtable keys)
             throws BuildException {
         if (value == null) {
             return null;

src/main/org/apache/tools/ant/Target.java

@@ -196,12 +196,19 @@ public class Target implements TaskContainer {
     }
 
     private boolean testIfCondition() {
-        return "".equals(ifCondition) 
-            || project.getProperty(ifCondition) != null;
+        if ("".equals(ifCondition)) {
+            return true;
+        }
+        
+        String test = ProjectHelper.replaceProperties(getProject(), ifCondition, getProject().getProperties());
+        return project.getProperty(test) != null;
     }
 
     private boolean testUnlessCondition() {
-        return "".equals(unlessCondition) 
-            || project.getProperty(unlessCondition) == null;
+        if ("".equals(unlessCondition)) {
+            return true;
+        }
+        String test = ProjectHelper.replaceProperties(getProject(), unlessCondition, getProject().getProperties());
+        return project.getProperty(test) == null;
     }
 }