From 91b61f8842a491f1bf9cb6d59f648b6eb5f16190 Mon Sep 17 00:00:00 2001 From: darius42 Date: Thu, 23 Aug 2007 18:18:30 +0000 Subject: Fix bug 1573193. Update usage information to reflect the current package name and XML namespace usage. Update documentation for warning levels to reflect actual names. git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@141 32d7a393-a5a9-423c-abd3-5d954feb1f2f --- .../java/net/sf/antcontrib/cpptasks/CCTask.java | 62 ++++++++++++++++------ .../net/sf/antcontrib/cpptasks/CompilerDef.java | 2 +- .../sf/antcontrib/cpptasks/WarningLevelEnum.java | 2 +- 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java b/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java index 92ead13..5f15bf1 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java @@ -51,9 +51,8 @@ import org.apache.tools.ant.types.Environment; * Resource files. *

* - * *

- * Copyright (c) 2001-2006, The Ant-Contrib project. + * Copyright (c) 2001-2007, The Ant-Contrib project. *

* *

@@ -67,23 +66,54 @@ import org.apache.tools.ant.types.Environment; *

* *

- * THIS SOFTWARE IS PROVIDED 'AS-IS', See http://www.apache.org/licenses/LICENSE-2.0 for - * additional disclaimers. + * THIS SOFTWARE IS PROVIDED 'AS-IS', See + * http://www.apache.org/licenses/LICENSE-2.0 for additional disclaimers. *

* * To use: *
    - *
  1. Place cpptasks.jar into Ant's classpath by placing in Ant's lib directory, - * adding to CLASSPATH environment variable or using the -lib command line option.
    2. - *
  2. Add type and task definitions in build file: - *
    • Ant 1.6 or later: add xmlns:cpptasks="antlib:org.sf.net.antcontrib.cpptasks" to <project> element.
      • - *
    • Ant 1.5 or later: Add <taskdef resource="cpptasks.tasks"/> and <typedef - * resource="cpptasks.types"/> to body of <project> element.
    3. - *
  3. Add <cc/>, <compiler/> and <linker/> elements to - * project.
    4. - *
  4. Set path and environment variables to be able to run compiler from - * command line.
    5. - *
  5. Build project.
    6. + *
  6. + * Place cpptasks.jar into Ant's classpath by placing it in Ant's lib + * directory, adding it to the CLASSPATH environment variable or by using the + * -lib command line option. + *
    7. + *
  7. + * Add type and task definitions to the build file: + *
      + *
    • + * Ant 1.6 or later: + *
        + *
      • Add xmlns:cpptasks="antlib:net.sf.antcontrib.cpptasks" to + * <project> element. + *
        • + *
      • + * Add <cpptasks:cc/>, <cpptasks:compiler/> and + * <cpptasks:linker/> elements to the project. + *
        • + *
      + *
      • + *
    • + * Ant 1.5 or later: + *
        + *
      • Add <taskdef resource="cpptasks.tasks"/> and + * <typedef resource="cpptasks.types"/> to body of <project> + * element. + *
        • + *
      • + * Add <cc/>, <compiler/> and <linker/> elements to the + * project. + *
        • + *
      + *
      • + *
    + *
    8. + *
  8. + * Set the path and environment variables to be able to run compiler from + * command line. + *
    9. + *
  9. + * Build the project. + *
    10. *
* * @author Adam Murdoch @@ -1337,7 +1367,7 @@ public class CCTask extends Task { /** * Enumerated attribute with the values "none", "severe", "default", - * "production", "diagnostic", and "failtask". + * "production", "diagnostic", and "aserror". */ public void setWarnings(WarningLevelEnum level) { compilerDef.setWarnings(level); diff --git a/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java index 1bbdabf..aef1e32 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java @@ -483,7 +483,7 @@ public final class CompilerDef extends ProcessorDef { } /** * Enumerated attribute with the values "none", "severe", "default", - * "production", "diagnostic", and "failtask". + * "production", "diagnostic", and "aserror". */ public void setWarnings(WarningLevelEnum level) { warnings = level.getIndex(); diff --git a/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java index 6ba8489..6ba7438 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java @@ -19,7 +19,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute; /** * Enumerated attribute with the values "none", "severe", "default", - * "production", "diagnostic", and "failtask". + * "production", "diagnostic", and "aserror". */ public final class WarningLevelEnum extends EnumeratedAttribute { /** -- cgit v1.2.3