202 files changed, 208 insertions, 24 deletions

diff --git a/pom.xml b/pom.xml
index 14e0585..4ce6964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,23 +37,6 @@
 
   <build>
     <defaultGoal>install</defaultGoal>
-    <sourceDirectory>src</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <includes>
-          <include>LICENSE</include>
-          <include>NOTICE</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src</directory>
-        <includes>
-          <include>cpptasks.tasks</include>
-          <include>cpptasks.types</include>
-        </includes>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/src/cpptasks.mf b/src/cpptasks.mf
deleted file mode 100644
index 8f3b6d0..0000000
--- a/src/cpptasks.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 2.0
-Main-Class: net.sf.antcontrib.cpptasks.AboutCCTask
-
-Name: CCTask
-Implementation-Vendor: Ant-Contrib project
-Implementation-Version: 1.0
-Implementation-Title: Compile and link tasks for Apache Ant
diff --git a/src/net/sf/antcontrib/cpptasks/AboutCCTask.java b/src/main/java/net/sf/antcontrib/cpptasks/AboutCCTask.java
index 4f17111..4f17111 100644
--- a/src/net/sf/antcontrib/cpptasks/AboutCCTask.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/AboutCCTask.java
diff --git a/src/net/sf/antcontrib/cpptasks/ArchEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/ArchEnum.java
index 0f36405..0f36405 100644
--- a/src/net/sf/antcontrib/cpptasks/ArchEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ArchEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/CCTask.java b/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java
index b1ef17b..b1ef17b 100644
--- a/src/net/sf/antcontrib/cpptasks/CCTask.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CCTask.java
diff --git a/src/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java b/src/main/java/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
index 317d6c3..317d6c3 100644
--- a/src/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
diff --git a/src/net/sf/antcontrib/cpptasks/CPUEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/CPUEnum.java
index 512ef37..512ef37 100644
--- a/src/net/sf/antcontrib/cpptasks/CPUEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CPUEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/CUtil.java b/src/main/java/net/sf/antcontrib/cpptasks/CUtil.java
index 2ac18e5..2ac18e5 100644
--- a/src/net/sf/antcontrib/cpptasks/CUtil.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CUtil.java
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerDef.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java
index 1bbdabf..1bbdabf 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java
index 96723b9..96723b9 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerParam.java b/src/main/java/net/sf/antcontrib/cpptasks/CompilerParam.java
index 8a15a77..8a15a77 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerParam.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/CompilerParam.java
diff --git a/src/net/sf/antcontrib/cpptasks/DependencyInfo.java b/src/main/java/net/sf/antcontrib/cpptasks/DependencyInfo.java
index d14966e..d14966e 100644
--- a/src/net/sf/antcontrib/cpptasks/DependencyInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DependencyInfo.java
diff --git a/src/net/sf/antcontrib/cpptasks/DependencyTable.java b/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java
index ae20496..ae20496 100644
--- a/src/net/sf/antcontrib/cpptasks/DependencyTable.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DependencyTable.java
diff --git a/src/net/sf/antcontrib/cpptasks/DistributerDef.java b/src/main/java/net/sf/antcontrib/cpptasks/DistributerDef.java
index f40ac8e..f40ac8e 100644
--- a/src/net/sf/antcontrib/cpptasks/DistributerDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DistributerDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/DistributerMap.java b/src/main/java/net/sf/antcontrib/cpptasks/DistributerMap.java
index ec0f4a4..ec0f4a4 100644
--- a/src/net/sf/antcontrib/cpptasks/DistributerMap.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DistributerMap.java
diff --git a/src/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
index 7d3734d..7d3734d 100644
--- a/src/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/FileVisitor.java b/src/main/java/net/sf/antcontrib/cpptasks/FileVisitor.java
index c59f04f..c59f04f 100644
--- a/src/net/sf/antcontrib/cpptasks/FileVisitor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/FileVisitor.java
diff --git a/src/net/sf/antcontrib/cpptasks/LinkerDef.java b/src/main/java/net/sf/antcontrib/cpptasks/LinkerDef.java
index af1d307..af1d307 100644
--- a/src/net/sf/antcontrib/cpptasks/LinkerDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/LinkerDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/LinkerEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/LinkerEnum.java
index 90ee7ca..90ee7ca 100644
--- a/src/net/sf/antcontrib/cpptasks/LinkerEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/LinkerEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/LinkerParam.java b/src/main/java/net/sf/antcontrib/cpptasks/LinkerParam.java
index 3dae933..3dae933 100644
--- a/src/net/sf/antcontrib/cpptasks/LinkerParam.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/LinkerParam.java
diff --git a/src/net/sf/antcontrib/cpptasks/OSFamilyEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
index 68ebd82..68ebd82 100644
--- a/src/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/ObjectFileCollector.java b/src/main/java/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
index fd4cda5..fd4cda5 100644
--- a/src/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
diff --git a/src/net/sf/antcontrib/cpptasks/OptimizationEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/OptimizationEnum.java
index 042822e..042822e 100644
--- a/src/net/sf/antcontrib/cpptasks/OptimizationEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/OptimizationEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/OutputTypeEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
index 62941b8..62941b8 100644
--- a/src/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/PrecompileDef.java b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileDef.java
index 4dd9831..4dd9831 100644
--- a/src/net/sf/antcontrib/cpptasks/PrecompileDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
index c6c7da7..c6c7da7 100644
--- a/src/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ProcessorDef.java b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorDef.java
index 24c1a1f..24c1a1f 100644
--- a/src/net/sf/antcontrib/cpptasks/ProcessorDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
index 9096183..9096183 100644
--- a/src/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
diff --git a/src/net/sf/antcontrib/cpptasks/ProcessorParam.java b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorParam.java
index 1b0c613..1b0c613 100644
--- a/src/net/sf/antcontrib/cpptasks/ProcessorParam.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ProcessorParam.java
diff --git a/src/net/sf/antcontrib/cpptasks/RuntimeType.java b/src/main/java/net/sf/antcontrib/cpptasks/RuntimeType.java
index 6590098..6590098 100644
--- a/src/net/sf/antcontrib/cpptasks/RuntimeType.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/RuntimeType.java
diff --git a/src/net/sf/antcontrib/cpptasks/SourceHistory.java b/src/main/java/net/sf/antcontrib/cpptasks/SourceHistory.java
index 4ffd38f..4ffd38f 100644
--- a/src/net/sf/antcontrib/cpptasks/SourceHistory.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/SourceHistory.java
diff --git a/src/net/sf/antcontrib/cpptasks/SubsystemEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java
index 24dac1b..24dac1b 100644
--- a/src/net/sf/antcontrib/cpptasks/SubsystemEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/SubsystemEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetDef.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetDef.java
index 70263ad..70263ad 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetHistory.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistory.java
index b797170..b797170 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetHistory.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistory.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetHistoryTable.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
index 1a6eda1..1a6eda1 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetInfo.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetInfo.java
index 8fd5bb4..8fd5bb4 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetInfo.java
diff --git a/src/net/sf/antcontrib/cpptasks/TargetMatcher.java b/src/main/java/net/sf/antcontrib/cpptasks/TargetMatcher.java
index 9260f77..9260f77 100644
--- a/src/net/sf/antcontrib/cpptasks/TargetMatcher.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/TargetMatcher.java
diff --git a/src/net/sf/antcontrib/cpptasks/VersionInfo.java b/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
index 3e70707..3e70707 100644
--- a/src/net/sf/antcontrib/cpptasks/VersionInfo.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/VersionInfo.java
diff --git a/src/net/sf/antcontrib/cpptasks/WarningLevelEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java
index 6ba8489..6ba8489 100644
--- a/src/net/sf/antcontrib/cpptasks/WarningLevelEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/WarningLevelEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/antlib.xml b/src/main/java/net/sf/antcontrib/cpptasks/antlib.xml
index 5f8af42..5f8af42 100644
--- a/src/net/sf/antcontrib/cpptasks/antlib.xml
+++ b/src/main/java/net/sf/antcontrib/cpptasks/antlib.xml
diff --git a/src/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java
index 7f21bec..7f21bec 100644
--- a/src/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/apple/XcodeProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/apple/package.html b/src/main/java/net/sf/antcontrib/cpptasks/apple/package.html
index 43a2ac3..43a2ac3 100644
--- a/src/net/sf/antcontrib/cpptasks/apple/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/apple/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
index c7e12d5..c7e12d5 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
index 65c430f..65c430f 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/arm/ADSLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
index fda52fa..fda52fa 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
index fd9c657..fd9c657 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
index a452b1b..a452b1b 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
index 6ec9212..6ec9212 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
index 315761f..315761f 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
index 6143bda..6143bda 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
index debfa2b..debfa2b 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java
index dfe5ec6..dfe5ec6 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/CBuilderXProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
index 82767cb..82767cb 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
index 5656af8..5656af8 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java b/src/main/java/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
index ec3bc84..ec3bc84 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
diff --git a/src/net/sf/antcontrib/cpptasks/borland/package.html b/src/main/java/net/sf/antcontrib/cpptasks/borland/package.html
index a91e91f..a91e91f 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/borland/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
index ca3c3e3..ca3c3e3 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
index 2488619..2488619 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
index c8930f9..c8930f9 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
index e61bd64..e61bd64 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
index 9de9491..9de9491 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
index 045f1ff..045f1ff 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
index f58ed8e..f58ed8e 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
index adafa08..adafa08 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
index a8b7691..a8b7691 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
index 38492ea..38492ea 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
index 7b0eed2..7b0eed2 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
index aeed2bb..aeed2bb 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
index f0aad67..f0aad67 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/Compiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Compiler.java
index 48bc190..48bc190 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/Compiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Compiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
index 6aba345..6aba345 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/LinkType.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkType.java
index 7df5d98..7df5d98 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/LinkType.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkType.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Linker.java
index 672a0e3..672a0e3 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
index ff7ac5d..ff7ac5d 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
index 2af1a68..2af1a68 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
index 3b66597..3b66597 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
index f707dc5..f707dc5 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/Processor.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Processor.java
index d6513f7..d6513f7 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/Processor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/Processor.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
index 870fb33..870fb33 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
index 9949856..9949856 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
index d0b8b95..d0b8b95 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
index dc1afb3..dc1afb3 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
index de006d8..de006d8 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
index 88ecd78..88ecd78 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
index bd63f42..bd63f42 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
index 826074b..826074b 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
index effd883..effd883 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
index 8257c09..8257c09 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java
index 94030fb..94030fb 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
index 3d9b83e..3d9b83e 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
index 898503e..898503e 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/VisualStudioNETProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/package.html b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/package.html
index 46a31b4..46a31b4 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/devstudio/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
index 2e8d4af..2e8d4af 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
index 32e6e7e..32e6e7e 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
index 1abdbec..1abdbec 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
index fa134f0..fa134f0 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
index 0c6ae4b..0c6ae4b 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
index a551bfa..a551bfa 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
index 058ef12..058ef12 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
index 097f96b..097f96b 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/LdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
index 2104e34..2104e34 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
index 86a8ac7..86a8ac7 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
index c9d28d9..c9d28d9 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
index 4347211..4347211 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
index 8e35995..8e35995 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
index b332c64..b332c64 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
index 26abf8c..26abf8c 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
index 44dd968..44dd968 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
index 779fb3d..779fb3d 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
index d7dd3db..d7dd3db 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
index 8a7a26e..8a7a26e 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
index 45bbea9..45bbea9 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
index 0cc5fbf..0cc5fbf 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
index e556e6b..e556e6b 100644
--- a/src/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/hp/aCCLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
index 94f7fc0..94f7fc0 100644
--- a/src/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
index 56b7674..56b7674 100644
--- a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
index 8e614b3..8e614b3 100644
--- a/src/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/DebugDef.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/DebugDef.java
index 8ddd04e..8ddd04e 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/DebugDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/DebugDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/ProjectDef.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectDef.java
index df0177c..df0177c 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/ProjectDef.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectDef.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java
index c4c144d..c4c144d 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriter.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java
index e100dbc..e100dbc 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/ProjectWriterEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/ide/package.html b/src/main/java/net/sf/antcontrib/cpptasks/ide/package.html
index ed0de56..ed0de56 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ide/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
index 085d61e..085d61e 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32CLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32CLinker.java
index 49a8a57..49a8a57 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32CLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32CLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32Compiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32Compiler.java
index d4feac3..d4feac3 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32Compiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32Compiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
index e6ddee1..e6ddee1 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
index 1d9f6c5..1d9f6c5 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64CLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64CLinker.java
index ec25e9e..ec25e9e 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64CLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64CLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64Compiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64Compiler.java
index 531de0c..531de0c 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64Compiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64Compiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
index 6798c3f..6798c3f 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelLinuxFortranCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinuxFortranCompiler.java
index b9e4467..b9e4467 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelLinuxFortranCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelLinuxFortranCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
index ed7c61a..ed7c61a 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
index 80ade19..80ade19 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
index e9473d5..e9473d5 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
index 66009f0..66009f0 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
index 6344022..6344022 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java
index 32eb9ec..32eb9ec 100644
--- a/src/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/XpidlCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/mozilla/package.html b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/package.html
index 6be6dff..6be6dff 100644
--- a/src/net/sf/antcontrib/cpptasks/mozilla/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/mozilla/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java
index 4c36438..4c36438 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java
index 93e65b4..93e65b4 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java
index 4cf2d18..4cf2d18 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java
index ca3abcb..ca3abcb 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java
index 82b6999..82b6999 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomFortranLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java
index 848c395..848c395 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java
index f0bbe3d..f0bbe3d 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java
index 5845776..5845776 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/OpenWatcomProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/package.html b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/package.html
index 3d9adab..3d9adab 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/openwatcom/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
index 6b1895f..6b1895f 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/os390/OS390Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
index 9c4f845..9c4f845 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/os390/OS390Processor.java b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
index d3243fc..d3243fc 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
diff --git a/src/net/sf/antcontrib/cpptasks/os400/IccCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
index 952d719..952d719 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/os400/IccLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccLinker.java
index ea10bcc..ea10bcc 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/IccLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/os400/IccProcessor.java b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
index f15aa8b..f15aa8b 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
diff --git a/src/net/sf/antcontrib/cpptasks/package.html b/src/main/java/net/sf/antcontrib/cpptasks/package.html
index fba9d80..fba9d80 100644
--- a/src/net/sf/antcontrib/cpptasks/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/parser/AbstractParser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
index b9bca25..b9bca25 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
index b3e3307..b3e3307 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/BranchState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/BranchState.java
index 4b869e0..4b869e0 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/BranchState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/BranchState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/CParser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/CParser.java
index d10d889..d10d889 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/CParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/CParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
index edcfe83..edcfe83 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/FilenameState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/FilenameState.java
index f3a6193..f3a6193 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/FilenameState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/FilenameState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/FortranParser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/FortranParser.java
index d393e65..d393e65 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/FortranParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/FortranParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/LetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/LetterState.java
index fc62f9b..fc62f9b 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/LetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/LetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/Parser.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/Parser.java
index bf63ae7..bf63ae7 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/Parser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/Parser.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/PostE.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/PostE.java
index d599f19..d599f19 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/PostE.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/PostE.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
index f7cbcea..f7cbcea 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
index 61c133d..61c133d 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
diff --git a/src/net/sf/antcontrib/cpptasks/parser/package.html b/src/main/java/net/sf/antcontrib/cpptasks/parser/package.html
index 1d7aa49..1d7aa49 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/parser/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java b/src/main/java/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java
index f16f94e..f16f94e 100644
--- a/src/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/platforms/WindowsPlatform.java
diff --git a/src/net/sf/antcontrib/cpptasks/platforms/package.html b/src/main/java/net/sf/antcontrib/cpptasks/platforms/package.html
index e054c41..e054c41 100644
--- a/src/net/sf/antcontrib/cpptasks/platforms/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/platforms/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
index 4ac8ac1..4ac8ac1 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/C89Linker.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java
index 6c41c89..6c41c89 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/C89Linker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Linker.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/C89Processor.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Processor.java
index 343293a..343293a 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/C89Processor.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/C89Processor.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
index 2c37eff..2c37eff 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
index 91ec3d1..91ec3d1 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/ForteCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCompiler.java
index 9fb43da..9fb43da 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/ForteCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/sun/ForteF77Compiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteF77Compiler.java
index 2230b66..2230b66 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/ForteF77Compiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteF77Compiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
index c844ac4..c844ac4 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
index c48815a..c48815a 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
diff --git a/src/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
index bb644a4..bb644a4 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java
index 25651da..25651da 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java
index e75a116..e75a116 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/MetaObjectParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java
index cc4cf3b..cc4cf3b 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceCompiler.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java
index e3e309c..e3e309c 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/UserInterfaceParser.java
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/package.html b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/package.html
index c12d506..c12d506 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/package.html
+++ b/src/main/java/net/sf/antcontrib/cpptasks/trolltech/package.html
diff --git a/src/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
index e428469..e428469 100644
--- a/src/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/CompilerArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
index 2137186..2137186 100644
--- a/src/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
index 7bc22ee..7bc22ee 100644
--- a/src/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/ConditionalPath.java b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
index ae45eaa..ae45eaa 100644
--- a/src/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/DefineArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineArgument.java
index 5118e79..5118e79 100644
--- a/src/net/sf/antcontrib/cpptasks/types/DefineArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/DefineSet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineSet.java
index f3ab44b..f3ab44b 100644
--- a/src/net/sf/antcontrib/cpptasks/types/DefineSet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/DefineSet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/FlexLong.java b/src/main/java/net/sf/antcontrib/cpptasks/types/FlexLong.java
index f710aa3..f710aa3 100644
--- a/src/net/sf/antcontrib/cpptasks/types/FlexLong.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/FlexLong.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/IncludePath.java b/src/main/java/net/sf/antcontrib/cpptasks/types/IncludePath.java
index e4c8414..e4c8414 100644
--- a/src/net/sf/antcontrib/cpptasks/types/IncludePath.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/IncludePath.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/LibrarySet.java
index acac911..acac911 100644
--- a/src/net/sf/antcontrib/cpptasks/types/LibrarySet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/LibrarySet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java b/src/main/java/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
index c0af5f8..c0af5f8 100644
--- a/src/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/LinkerArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
index bee15cf..bee15cf 100644
--- a/src/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
index 37a3e28..37a3e28 100644
--- a/src/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
index 97c4fa2..97c4fa2 100644
--- a/src/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
diff --git a/src/net/sf/antcontrib/cpptasks/types/UndefineArgument.java b/src/main/java/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
index aa958ef..aa958ef 100644
--- a/src/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/src/main/resources/META-INF/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..70964f8
--- /dev/null
+++ b/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,6 @@
+This product includes software developed by
+   The Ant-Contrib project (http://ant-contrib.sourceforge.net)
+This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+This product was changed by FreeHEP
+   The FreeHEP project (http://java.freehep.org/).
diff --git a/src/cpptasks.tasks b/src/main/resources/cpptasks.tasks
index 425935a..425935a 100644
--- a/src/cpptasks.tasks
+++ b/src/main/resources/cpptasks.tasks
diff --git a/src/cpptasks.types b/src/main/resources/cpptasks.types
index c37c17f..c37c17f 100644
--- a/src/cpptasks.types
+++ b/src/main/resources/cpptasks.types