Browse Source

Make subprojects aware of custom tasks.

Submitted by:	Glenn McAllister <glennm@ca.ibm.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267759 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 25 years ago
parent
commit
5fbf26cd07
2 changed files with 12 additions and 0 deletions
  1. +4
    -0
      src/main/org/apache/tools/ant/Project.java
  2. +8
    -0
      src/main/org/apache/tools/ant/taskdefs/Ant.java

+ 4
- 0
src/main/org/apache/tools/ant/Project.java View File

@@ -319,6 +319,10 @@ public class Project {
taskClassDefinitions.put(taskName, taskClass);
}

public Hashtable getTaskDefinitions() {
return taskClassDefinitions;
}

/**
* This call expects to add a <em>new</em> Target.
* @param target is the Target to be added to the current


+ 8
- 0
src/main/org/apache/tools/ant/taskdefs/Ant.java View File

@@ -106,6 +106,14 @@ public class Ant extends Task {

p1.init();

Hashtable taskdefs = project.getTaskDefinitions();
Enumeration et = taskdefs.keys();
while (et.hasMoreElements()) {
String taskName = (String) et.nextElement();
Class taskClass = (Class) taskdefs.get(taskName);
p1.addTaskDefinition(taskName, taskClass);
}

// set user-define properties
Hashtable prop1 = project.getProperties();
Enumeration e = prop1.keys();


Loading…
Cancel
Save