[Ant-contrib-developers] CVS: cpptasks/src/net/sf/antcontrib/cpptasks TargetDef.java,1.1,1.2 DistributerDef.java,1.1,1.2 VersionInfo.java,1.1,1.2 CPUEnum.java,1.1,1.2 OptimizationEnum.java,1.2,1.3 CCTask.java,1.52,1.53

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

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

Modified Files:
	TargetDef.java DistributerDef.java VersionInfo.java 
	CPUEnum.java OptimizationEnum.java CCTask.java 
Log Message:
Documentation fixes for 1.0b3 (bug 943890)

Index: TargetDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/TargetDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TargetDef.java	23 Apr 2004 21:15:45 -0000	1.1
--- TargetDef.java	28 Apr 2004 18:23:27 -0000	1.2
***************
*** 22,25 ****
--- 22,26 ----
  /**
   * Information on the execution platforms for the generated code.
+  * (Non-functional prototype)
   *
   */
***************
*** 64,68 ****
     * Bogus method required for documentation generation.
     */
!   public void execute()  {
      throw new org.apache.tools.ant.BuildException(
          "Not an actual task, but looks like one for documentation purposes");
--- 65,69 ----
     * Bogus method required for documentation generation.
     */
!   public void execute() {
      throw new org.apache.tools.ant.BuildException(
          "Not an actual task, but looks like one for documentation purposes");
***************
*** 74,78 ****
     * @return true if active
     */
!   public boolean isActive()  {
      return CUtil.isActive(getProject(), ifCond, unlessCond);
    }
--- 75,79 ----
     * @return true if active
     */
!   public boolean isActive() {
      return CUtil.isActive(getProject(), ifCond, unlessCond);
    }
***************
*** 121,125 ****
     * @param r id of referenced target
     */
!   public void setRefid(final Reference r)  {
      super.setRefid(r);
    }
--- 122,126 ----
     * @param r id of referenced target
     */
!   public void setRefid(final Reference r) {
      super.setRefid(r);
    }
***************
*** 190,194 ****
     * @param value new value
     */
!   public void setCpu(final CPUEnum value)  {
      if (isReference()) {
        throw tooManyAttributes();
--- 191,195 ----
     * @param value new value
     */
!   public void setCpu(final CPUEnum value) {
      if (isReference()) {
        throw tooManyAttributes();
***************
*** 201,205 ****
     * @param value new value
     */
!   public void setArch(final ArchEnum value)  {
      if (isReference()) {
        throw tooManyAttributes();
--- 202,206 ----
     * @param value new value
     */
!   public void setArch(final ArchEnum value) {
      if (isReference()) {
        throw tooManyAttributes();
***************
*** 215,219 ****
     * @param value new value
     */
!   public void setOsfamily(final OSFamilyEnum value)  {
      if (isReference()) {
        throw tooManyAttributes();
--- 216,220 ----
     * @param value new value
     */
!   public void setOsfamily(final OSFamilyEnum value) {
      if (isReference()) {
        throw tooManyAttributes();

Index: DistributerDef.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/DistributerDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DistributerDef.java	23 Apr 2004 21:15:45 -0000	1.1
--- DistributerDef.java	28 Apr 2004 18:23:27 -0000	1.2
***************
*** 23,27 ****
  
  /**
!  * Distributed build information (Experimental).
   *
   */
--- 23,27 ----
  
  /**
!  * Distributed build information (Non-functional prototype).
   *
   */

Index: VersionInfo.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/VersionInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VersionInfo.java	23 Apr 2004 21:15:45 -0000	1.1
--- VersionInfo.java	28 Apr 2004 18:23:27 -0000	1.2
***************
*** 26,30 ****
  
  /**
!  * Version Information. (Experimental)
   * 
   */
--- 26,30 ----
  
  /**
!  * Version Information. (Non-functional prototype)
   * 
   */

Index: CPUEnum.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/CPUEnum.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CPUEnum.java	23 Apr 2004 21:15:45 -0000	1.1
--- CPUEnum.java	28 Apr 2004 18:23:27 -0000	1.2
***************
*** 27,54 ****
  public final class CPUEnum
      extends EnumeratedAttribute {
-   /**
-    * X86 cpus.
-    */
-   private static String[] x86Cpus;
-   /**
-    * ARM cpus.
-    */
-   private static String[] armCpus;
-   /**
-    * POWER cpus.
-    */
-   private static String[] powerCpus;
  
    /**
!    * All Cpus.
     */
!   private static String[] values;
  
    /**
!    * Class initializer.
     */
!   static {
!     x86Cpus =
!         new String[] {
          "i386",
          "i486",
--- 27,49 ----
  public final class CPUEnum
      extends EnumeratedAttribute {
  
    /**
!    * Constructor.
!    *
!    * Set by default to "pentium3"
!    *
!    * @see java.lang.Object#Object()
     */
!   public CPUEnum() {
!     setValue("pentium3");
!   }
  
    /**
!    * Gets list of acceptable values.
!    *
!    * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
     */
!   public String[] getValues() {
!     return new String[] {
          "i386",
          "i486",
***************
*** 71,144 ****
          "winchip-c6",
          "winchip2",
!         "c3"};
!     int count = x86Cpus.length;
!     armCpus = new String[] {
!         "arm2", "arm250", "arm3", "arm6", "arm60", "arm600", "arm610", "arm620",
!         "arm7", "arm7m", "arm7d", "arm7dm", "arm7di", "arm7dmi", "arm70",
!         "arm700", "arm700i", "arm710", "arm710c", "arm7100", "arm7500",
!         "arm7500fe", "arm7tdmi", "arm8", "strongarm", "strongarm110",
!         "strongarm1100", "arm8", "arm810", "arm9", "arm9e", "arm920", "arm920t",
!         "arm940t", "arm9tdmi", "arm10tdmi", "arm1020t", "xscale"};
! 
!     powerCpus = new String[] {
!         "power", "power2", "powerpc", "powerpc64"};
!     count += powerCpus.length;
! 
!     values = new String[count];
!     for (int i = 0; i < x86Cpus.length; i++) {
!       values[i] = x86Cpus[i];
!     }
!     int offset = x86Cpus.length;
!     for (int i = 0; i < armCpus.length; i++) {
!       values[offset + i] = armCpus[i];
!     }
!     offset += armCpus.length;
!     for (int i = 0; i < powerCpus.length; i++) {
!       values[offset + i] = powerCpus[i];
!     }
!   }
! 
!   /**
!    * Constructor.
!    *
!    * Set by default to "pentium3"
!    *
!    * @see java.lang.Object#Object()
!    */
!   public CPUEnum() {
!     setValue("pentium3");
!   }
! 
!   /**
!    * Gets list of acceptable values.
!    *
!    * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
!    */
!   public String[] getValues() {
!     return values;
!   }
! 
!   /**
!    * Gets X86 CPUs.
!    * @return X86 CPUs
!    */
!   public static String[] getX86Cpus() {
!     return (String[]) x86Cpus.clone();
!   }
! 
!   /**
!    * Gets ARM Cpus.
!    * @return ARM cpus.
!    */
!   public static String[] getArmCpus() {
!     return (String[]) armCpus.clone();
    }
  
-   /**
-    * Gets POWER Cpus.
-    * @return POWER cpus.
-    */
-   public static String[] getPowerCpus() {
-     return (String[]) powerCpus.clone();
-   }
  }
--- 66,71 ----
          "winchip-c6",
          "winchip2",
!         "c3" };
    }
  
  }

Index: OptimizationEnum.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/OptimizationEnum.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OptimizationEnum.java	24 Apr 2004 20:07:20 -0000	1.2
--- OptimizationEnum.java	28 Apr 2004 18:23:27 -0000	1.3
***************
*** 47,55 ****
          "none",
          "size",
! 		"minimal",
          "speed",
          "full",
          "aggressive",
! 		"extreme",
          "unsafe"
      };
--- 47,55 ----
          "none",
          "size",
!         "minimal",
          "speed",
          "full",
          "aggressive",
!         "extreme",
          "unsafe"
      };
***************
*** 80,83 ****
    }
  
- 
  }
--- 80,82 ----

Index: CCTask.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/CCTask.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** CCTask.java	23 Apr 2004 21:15:45 -0000	1.52
--- CCTask.java	28 Apr 2004 18:23:27 -0000	1.53
***************
*** 1214,1218 ****
       * Adds descriptive version information to be included in the
       * generated file.  The first active version info block will
!      * be used.  (Experimental)
       */
      public void addConfiguredVersioninfo(VersionInfo info) {
--- 1214,1218 ----
       * Adds descriptive version information to be included in the
       * generated file.  The first active version info block will
!      * be used.  (Non-functional prototype)
       */
      public void addConfiguredVersioninfo(VersionInfo info) {
***************
*** 1220,1224 ****
      }
      /**
!      * Adds a target definition or reference (experimental).
       * 
       * @param target
--- 1220,1224 ----
      }
      /**
!      * Adds a target definition or reference (Non-functional prototype).
       * 
       * @param target
***************
*** 1235,1239 ****
      }
      /**
!      * Adds a distributer definition or reference (experimental).
       * 
       * @param distributer
--- 1235,1239 ----
      }
      /**
!      * Adds a distributer definition or reference (Non-functional prototype).
       * 
       * @param distributer
***************
*** 1250,1254 ****
      }
      /**
!      * Sets optimization.  (experimental)
       * @param optimization
       */
--- 1250,1254 ----
      }
      /**
!      * Sets optimization.
       * @param optimization
       */