[Ant-contrib-developers] CVS: cpptasks/src/net/sf/antcontrib/cpptasks DependencyTable.java,1.14,1.15

[Hiram C. <ch...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks
In directory sc8-pr-cvs1:/tmp/cvs-serv24650/src/net/sf/antcontrib/cpptasks

Modified Files:
	DependencyTable.java 
Log Message:
Handle dependencies that are sitting in UNCs better.
lower verbosity allso

Index: DependencyTable.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/DependencyTable.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DependencyTable.java	11 Jul 2002 13:56:55 -0000	1.14
--- DependencyTable.java	19 Nov 2002 22:24:14 -0000	1.15
***************
*** 70,73 ****
--- 70,74 ----
  import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
  import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Project;
  import org.xml.sax.Attributes;
  import org.xml.sax.SAXException;
***************
*** 177,181 ****
          DependencyInfo dependInfo = getDependencyInfo(relative,includePathIdentifier);
          if(dependInfo == null) {
!           task.log("Parsing " + relative);
            dependInfo = parseIncludes(task,compiler,source);
          }
--- 178,182 ----
          DependencyInfo dependInfo = getDependencyInfo(relative,includePathIdentifier);
          if(dependInfo == null) {
!           task.log("Parsing " + relative, Project.MSG_VERBOSE);
            dependInfo = parseIncludes(task,compiler,source);
          }
***************
*** 399,404 ****
              if(includeInfos[i] == null) {
                missingCount++;
!               task.log("Parsing " + includes[i]);
!               DependencyInfo includeInfo = parseIncludes(task,compiler,new File(baseDir,includes[i]));
                includeInfos[i] = includeInfo;
              }
--- 400,410 ----
              if(includeInfos[i] == null) {
                missingCount++;
!               task.log("Parsing " + includes[i], Project.MSG_VERBOSE);
!               
!               // If the include is part of a UNC don't go building a relative file name.
!               File src = includes[i].startsWith("\\\\") ?
!               				new File(includes[i]) :
! 							new File(baseDir,includes[i]);
!               DependencyInfo includeInfo = parseIncludes(task,compiler,src);
                includeInfos[i] = includeInfo;
              }