[Ant-contrib-developers] CVS: cpptasks/src/net/sf/antcontrib/cpptasks AboutCCTask.java,1.3,1.4 CCTask.java,1.29,1.30 PrecompileDef.java,1.4,1.5

[Curt A. <ca...@us...>]

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

Modified Files:
	AboutCCTask.java CCTask.java PrecompileDef.java 
Log Message:
Changed PrecompileDef to a DataType, mostly to get xdocs to document it
Very close to a release, just need to finish up the xdocs production

Index: AboutCCTask.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/AboutCCTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AboutCCTask.java	10 May 2002 06:17:30 -0000	1.3
--- AboutCCTask.java	10 May 2002 15:06:13 -0000	1.4
***************
*** 77,81 ****
        System.out.println("THIS SOFTWARE IS PROVIDED 'AS-IS', See");
        System.out.println("http://www.apache.org/LICENSE for additional");
!       System.out.println("disclaimers\n");
      }
  }
--- 77,86 ----
        System.out.println("THIS SOFTWARE IS PROVIDED 'AS-IS', See");
        System.out.println("http://www.apache.org/LICENSE for additional");
!       System.out.println("disclaimers.\n");
!       System.out.println("To use:");
!       System.out.println("\tPlace cpptasks.jar into jakarta-ant-1.5beta1/lib directory.");
!       System.out.println("\tAdd <taskdef resource=\"cpptasks.tasks\"/> and");
!       System.out.println("\t\t<typedef resource=\"cpptasks.types\"/> to build.xml");
!       System.out.println("Add <cc/>, <compiler/>; and <linker/> elements.");
      }
  }

Index: CCTask.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/CCTask.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** CCTask.java	10 May 2002 06:17:30 -0000	1.29
--- CCTask.java	10 May 2002 15:06:13 -0000	1.30
***************
*** 85,93 ****
   *
   * <p>This software is not a product of the of the Apache Software Foundation
!  *    and no endorsement or promotion is implied.</p>
   *
   * <p>THIS SOFTWARE IS PROVIDED 'AS-IS', See http://www.apache.org/LICENSE
   *    for additional disclaimers.</p>
   *
   *
   *
--- 85,100 ----
   *
   * <p>This software is not a product of the of the Apache Software Foundation
!  *    and no endorsement is implied.</p>
   *
   * <p>THIS SOFTWARE IS PROVIDED 'AS-IS', See http://www.apache.org/LICENSE
   *    for additional disclaimers.</p>
   *
+  * To use:
+  * <ol>
+  * <li>Place cpptasks.jar into jakarta-ant-1.5beta1/lib directory.</li>
+  * <li>Add &lt;taskdef resource="cpptasks.tasks"/&gt; and
+  *     &lt;typedef resource="cpptasks.types"/&gt; to build.xml.</li>
+  * <li>Add &lt;cc/&gt;, &lt;compiler/&gt; and &lt;linker/&gt elements.</li>
+  * </ol>
   *
   *

Index: PrecompileDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/PrecompileDef.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PrecompileDef.java	10 May 2002 06:17:30 -0000	1.4
--- PrecompileDef.java	10 May 2002 15:06:13 -0000	1.5
***************
*** 68,72 ****
  import java.lang.reflect.Method;
  import java.util.Enumeration;
! 
  
  
--- 68,72 ----
  import java.lang.reflect.Method;
  import java.util.Enumeration;
! import org.apache.tools.ant.types.DataType;
  
  
***************
*** 81,85 ****
   * @author Curt Arnold
   */
! public final class PrecompileDef extends ProjectComponent {
  
      /**
--- 81,85 ----
   * @author Curt Arnold
   */
! public final class PrecompileDef extends DataType {
  
      /**
***************
*** 103,107 ****
  
      public boolean isActive() {
!       return CUtil.isActive(project, ifCond, unlessCond);
      }
  
--- 103,123 ----
  
      public boolean isActive() {
!       boolean isActive = CUtil.isActive(project, ifCond, unlessCond);
!       if (!isActive) {
!         PrecompileDef ref = getRef();
!         if (ref != null) {
!           return ref.isActive();
!         }
!       }
!       return isActive;
!     }
! 
! 
!     private PrecompileDef getRef() {
!       if( isReference()) {
!           return ((PrecompileDef)getCheckedRef(PrecompileDef.class,
!                 "PrecompileDef"));
!       }
!       return null;
      }
  
***************
*** 115,118 ****
--- 131,137 ----
       */
       public void setPrototype(File prototype) {
+         if (isReference()) {
+           throw tooManyAttributes();
+         }
          if (prototype == null) {
            throw new NullPointerException("prototype");
***************
*** 126,129 ****
--- 145,152 ----
        */
        public File getPrototype() {
+         PrecompileDef ref = getRef();
+         if (ref != null) {
+           return ref.getPrototype();
+         }
          return prototype;
        }
***************
*** 151,154 ****
--- 174,181 ----
  
      public String[] getExceptFiles() {
+       PrecompileDef ref = getRef();
+       if (ref != null) {
+         return ref.getExceptFiles();
+       }
        if (exceptSets.size() == 0) {
          return new String[0];