costin 2003/01/06 08:00:56
Modified: src/main/org/apache/tools/ant/helper ProjectHelper2.java
Log:
Warn of duplicated project name only if importing.
There are normal cases ( antcall) where the same build file is parsed many
times
( this could be avoided now - as an optimization ).
It is a problem only in import, because of the target conflict resolution.
( targets are qualified with the project name )
Revision Changes Path
1.11 +2 -1
jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ProjectHelper2.java 6 Jan 2003 07:30:34 -0000 1.10
+++ ProjectHelper2.java 6 Jan 2003 16:00:55 -0000 1.11
@@ -629,7 +629,8 @@
String dup = project.getProperty(antFileProp);
if (dup != null) {
File dupFile = new File(dup);
- if (!dupFile.equals(context.buildFile)) {
+ if( context.ignoreProjectTag &&
+ !dupFile.equals(context.buildFile)) {
project.log("Duplicated project name in import. Project
"+
context.currentProjectName + " defined first in " +
dup + " and again in " + context.buildFile,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
