Latest script

150 files changed, 2555 insertions, 2555 deletions

diff --git a/.cvsignore b/.cvsignore
index 90fe913..81da3c1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-build

-dist

-result.xml

-bin

+build
+dist
+result.xml
+bin
diff --git a/CVS/Entries b/CVS/Entries
index d1c4efc..42daacb 100644
--- a/CVS/Entries
+++ b/CVS/Entries
@@ -1,10 +1,10 @@
-/.classpath/1.8/Sat Sep 25 05:10:31 2004//

-/.cvsignore/1.3/Sat Feb 28 19:06:07 2004//

-/.project/1.1/Mon Feb 17 03:18:22 2003//

-/LICENSE/1.1/Sat Feb 28 19:06:07 2004/-kb/

-/NOTICE/1.3/Sat Feb 28 19:12:56 2004/-kb/

-/build.xml/1.51/Fri Jan 21 20:18:55 2005//

-/sun_checks.xml/1.4/Sat Sep 25 05:10:31 2004//

-D/samples////

-D/src////

-D/test////

+/.classpath/1.8/Sat Sep 25 05:10:31 2004//
+/.cvsignore/1.3/Sat Feb 28 19:06:07 2004//
+/.project/1.1/Mon Feb 17 03:18:22 2003//
+/LICENSE/1.1/Sat Feb 28 19:06:07 2004/-kb/
+/NOTICE/1.3/Sat Feb 28 19:12:56 2004/-kb/
+/build.xml/1.51/Fri Jan 21 20:18:55 2005//
+/sun_checks.xml/1.4/Sat Sep 25 05:10:31 2004//
+D/samples////
+D/src////
+D/test////
diff --git a/CVS/Entries.Log b/CVS/Entries.Log
index eeeea55..87c5f54 100644
--- a/CVS/Entries.Log
+++ b/CVS/Entries.Log
@@ -1,4 +1,4 @@
-A D/base-implementations////

-A D/schema////

-R D/schema////

-R D/base-implementations////

+A D/base-implementations////
+A D/schema////
+R D/schema////
+R D/base-implementations////
diff --git a/CVS/Repository b/CVS/Repository
index 5259986..6ab921d 100644
--- a/CVS/Repository
+++ b/CVS/Repository
@@ -1 +1 @@
-cpptasks

+cpptasks
diff --git a/CVS/Root b/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/CVS/Root
+++ b/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/samples/.cvsignore b/samples/.cvsignore
index fcb6a2f..378eac2 100644
--- a/samples/.cvsignore
+++ b/samples/.cvsignore
@@ -1 +1 @@
-build

+build
diff --git a/samples/CVS/Entries b/samples/CVS/Entries
index 2d6583e..3b636b2 100644
--- a/samples/CVS/Entries
+++ b/samples/CVS/Entries
@@ -1,8 +1,8 @@
-/.cvsignore/1.1/Sun Aug 29 04:52:51 2004//

-/blas.ant/1.1/Fri Apr 30 20:38:47 2004//

-/check.ant/1.1/Fri Apr 30 20:38:47 2004//

-/cppunit.ant/1.10/Tue Aug 24 22:46:09 2004//

-/qtunit.ant/1.1/Wed May  5 02:50:59 2004/-kb/

-/xercesc.ant/1.22/Sat Feb 28 18:58:38 2004//

-/xpcom.ant/1.1/Wed May  5 02:50:59 2004/-kb/

-D

+/.cvsignore/1.1/Sun Aug 29 04:52:51 2004//
+/blas.ant/1.1/Fri Apr 30 20:38:47 2004//
+/check.ant/1.1/Fri Apr 30 20:38:47 2004//
+/cppunit.ant/1.10/Tue Aug 24 22:46:09 2004//
+/qtunit.ant/1.1/Wed May  5 02:50:59 2004/-kb/
+/xercesc.ant/1.22/Sat Feb 28 18:58:38 2004//
+/xpcom.ant/1.1/Wed May  5 02:50:59 2004/-kb/
+D
diff --git a/samples/CVS/Repository b/samples/CVS/Repository
index cee2e7c..69c8b96 100644
--- a/samples/CVS/Repository
+++ b/samples/CVS/Repository
@@ -1 +1 @@
-cpptasks/samples

+cpptasks/samples
diff --git a/samples/CVS/Root b/samples/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/samples/CVS/Root
+++ b/samples/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/samples/blas.ant b/samples/blas.ant
index 45c3691..c1a28f5 100644
--- a/samples/blas.ant
+++ b/samples/blas.ant
@@ -1,185 +1,185 @@
-<?xml version="1.0"?>

-<!--

-

-Copyright 2004 The Ant-Contrib project

-

-   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.

--->

-

-<!--  

-

-    build file for generic FORTRAN 77 Basic Linear Algebra Subprograms library

-    (http://www.netlib.org/blas/blas.tgz) and double precision tests

-    

-    targets test-dblat2 and test-dblat3 require Ant 1.6

-    

-    

-    

--->    

-<project name="blas" default="test-all">

-

-<property name="base.dir" value="."/>

-<property name="debug" value="true"/>

-<property name="compiler" value="g77"/>

-<property name="src.dir" location="${base.dir}/src"/>

-<property name="tests.dir" location="${base.dir}/tests"/>

-<property name="build.dir" location="build"/>

-<property name="libtype" value="static"/>

-

-<taskdef resource="cpptasks.tasks"/>

-<typedef resource="cpptasks.types"/>

-

-<target name="usage">

-	<echo message="Builds BLAS (http://www.netlib.org/blas)."/>

-	<echo message="Usage:"/>

-	<echo message="ant -f blas.ant -Dsrc.dir=c:/blas -Dtests.dir=c:/blas-tests"/>

-	<echo message="    -Dcompiler=[g77 | df ...]"/>

-	<echo message="    -Dlibtype=[static | shared ...]"/>

-</target>

-

-<target name="get-blas">

-    <get src="http://www.netlib.org/blas/blas.tgz" usetimestamp="true"

-         dest="${base.dir}/blas.tgz"/>

-    <untar src="${base.dir}/blas.tgz" dest="${src.dir}" compression="gzip" overwrite="true"/>

-    <mkdir dir="${tests.dir}"/>

-    <get src="http://www.netlib.org/blas/dblat1" usetimestamp="true"

-         dest="${tests.dir}/dblat1.f"/>

-    <get src="http://www.netlib.org/blas/dblat2" usetimestamp="true"

-         dest="${tests.dir}/dblat2.f"/>

-    <get src="http://www.netlib.org/blas/dblat2d" usetimestamp="true"

-         dest="${tests.dir}/dblat2d"/>

-    <get src="http://www.netlib.org/blas/dblat3" usetimestamp="true"

-         dest="${tests.dir}/dblat3.f"/>

-    <get src="http://www.netlib.org/blas/dblat3d" usetimestamp="true"

-         dest="${tests.dir}/dblat3d"/>

-</target>

-

-<target name="init">

-	<mkdir dir="${build.dir}"/>

-	<property name="obj.dir" value="${build.dir}/obj"/>

-	<mkdir dir="${obj.dir}"/>

-	<property environment="env"/>

-	<!--  in case not set in environment, use an insignificant value -->

-	<property name="env.LD_LIBRARY_PATH" value="."/>

-	<condition property="is-shared"><equals arg1="${libtype}" arg2="shared"/></condition>

-	<condition property="is-gcc">

-		<or>

-			<equals arg1="${compiler}" arg2="gcc"/>

-			<equals arg1="${compiler}" arg2="g77"/>

-		</or>

-	</condition>

-</target>

-

-<target name="clean">

-	<delete dir="${build.dir}"/>

-</target>

-

-

-<target name="build-lib" depends="init">

-	<cc subsystem="console" 

-		outfile="${build.dir}/blas"

-		objdir="${obj.dir}" 

-		outtype="${libtype}" 

-		debug="${debug}"

-		warnings="diagnostic"

-	    optimize="speed"

-		name="${compiler}">

-		<fileset dir="${src.dir}" includes="*.f"/>

-	</cc>

-</target>

-

-<target name="build-dblat1" depends="build-lib">

-	<cc outfile="${build.dir}/dblat1" 

-	    outtype="executable" 

-	    subsystem="console" 

-	    objdir="${obj.dir}" 

-	    debug="${debug}"

-	    warnings="diagnostic"

-	    name="${compiler}"

-	    outputfileproperty="dblat1.exe">

-		<fileset dir="${tests.dir}" includes="dblat1.f"/>

-		<!-- the following line is undesirable and will hopefully be made unnecessary shortly  -->

-		<libset libs="g2c, frtbegin" if="is-gcc"/>

-		<libset dir="${build.dir}" type="${libtype}" libs="blas"/>

-	</cc>

-</target>

-

-

-<target name="test-dblat1" depends="build-dblat1">

-	<exec dir="${build.dir}" 

-	      executable="${dblat1.exe}"

-	      failonerror="true"/> 

-</target>

-

-<target name="build-dblat2" depends="build-lib">

-	<cc outfile="${build.dir}/dblat2" 

-	    outtype="executable" 

-	    subsystem="console" 

-	    objdir="${obj.dir}" 

-	    debug="${debug}"

-	    warnings="diagnostic"

-	    name="${compiler}"

-	    outputfileproperty="dblat2.exe">

-		<fileset dir="${tests.dir}" includes="dblat2.f"/>

-		<!-- the following line is undesirable and will hopefully be made unnecessary shortly  -->

-		<syslibset libs="g2c, frtbegin" if="is-gcc"/>

-		<libset dir="${build.dir}" type="${libtype}" libs="blas"/>

-	</cc>

-</target>

-

-

-<target name="test-dblat2" depends="build-dblat2">

-    <delete file="${build.dir}/DBLAT2.SUMM"/>

-    <!-- requires Ant 1.6 due to the input attribute  -->

-	<exec dir="${build.dir}" 

-	      executable="${dblat2.exe}"

-	      failonerror="true"

-	      input="${tests.dir}/dblat2d"/>

-	<concat><fileset dir="${build.dir}" includes="DBLAT2.SUMM"/></concat>   

-</target>

-

-

-<target name="build-dblat3" depends="build-lib">

-	<cc outfile="${build.dir}/dblat3" 

-	    outtype="executable" 

-	    subsystem="console" 

-	    objdir="${obj.dir}" 

-	    debug="${debug}"

-	    warnings="diagnostic"

-	    name="${compiler}"

-	    outputfileproperty="dblat3.exe">

-		<fileset dir="${tests.dir}" includes="dblat3.f"/>

-		<!-- the following line is undesirable and will hopefully be made unnecessary shortly  -->

-		<syslibset libs="g2c, frtbegin" if="is-gcc"/>

-		<libset dir="${build.dir}" type="${libtype}" libs="blas"/>

-	</cc>

-</target>

-

-

-<target name="test-dblat3" depends="build-dblat3">

-    <delete file="${build.dir}/DBLAT3.SUMM"/>

-    <!-- requires Ant 1.6 due to the input attribute  -->

-	<exec dir="${build.dir}" 

-	      executable="${dblat3.exe}"

-	      failonerror="true"

-	      input="${tests.dir}/dblat3d"/> 

-	<concat><fileset dir="${build.dir}" includes="DBLAT3.SUMM"/></concat>   

-</target>

-

-

-			    

-<target name="all" depends="build-dblat1, build-dblat2, build-dblat3"/>

-

-<target name="test-all" depends="test-dblat1, test-dblat2, test-dblat3"/>

-			    

+<?xml version="1.0"?>
+<!--
+
+Copyright 2004 The Ant-Contrib project
+
+   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.
+-->
+
+<!--  
+
+    build file for generic FORTRAN 77 Basic Linear Algebra Subprograms library
+    (http://www.netlib.org/blas/blas.tgz) and double precision tests
+    
+    targets test-dblat2 and test-dblat3 require Ant 1.6
+    
+    
+    
+-->    
+<project name="blas" default="test-all">
+
+<property name="base.dir" value="."/>
+<property name="debug" value="true"/>
+<property name="compiler" value="g77"/>
+<property name="src.dir" location="${base.dir}/src"/>
+<property name="tests.dir" location="${base.dir}/tests"/>
+<property name="build.dir" location="build"/>
+<property name="libtype" value="static"/>
+
+<taskdef resource="cpptasks.tasks"/>
+<typedef resource="cpptasks.types"/>
+
+<target name="usage">
+	<echo message="Builds BLAS (http://www.netlib.org/blas)."/>
+	<echo message="Usage:"/>
+	<echo message="ant -f blas.ant -Dsrc.dir=c:/blas -Dtests.dir=c:/blas-tests"/>
+	<echo message="    -Dcompiler=[g77 | df ...]"/>
+	<echo message="    -Dlibtype=[static | shared ...]"/>
+</target>
+
+<target name="get-blas">
+    <get src="http://www.netlib.org/blas/blas.tgz" usetimestamp="true"
+         dest="${base.dir}/blas.tgz"/>
+    <untar src="${base.dir}/blas.tgz" dest="${src.dir}" compression="gzip" overwrite="true"/>
+    <mkdir dir="${tests.dir}"/>
+    <get src="http://www.netlib.org/blas/dblat1" usetimestamp="true"
+         dest="${tests.dir}/dblat1.f"/>
+    <get src="http://www.netlib.org/blas/dblat2" usetimestamp="true"
+         dest="${tests.dir}/dblat2.f"/>
+    <get src="http://www.netlib.org/blas/dblat2d" usetimestamp="true"
+         dest="${tests.dir}/dblat2d"/>
+    <get src="http://www.netlib.org/blas/dblat3" usetimestamp="true"
+         dest="${tests.dir}/dblat3.f"/>
+    <get src="http://www.netlib.org/blas/dblat3d" usetimestamp="true"
+         dest="${tests.dir}/dblat3d"/>
+</target>
+
+<target name="init">
+	<mkdir dir="${build.dir}"/>
+	<property name="obj.dir" value="${build.dir}/obj"/>
+	<mkdir dir="${obj.dir}"/>
+	<property environment="env"/>
+	<!--  in case not set in environment, use an insignificant value -->
+	<property name="env.LD_LIBRARY_PATH" value="."/>
+	<condition property="is-shared"><equals arg1="${libtype}" arg2="shared"/></condition>
+	<condition property="is-gcc">
+		<or>
+			<equals arg1="${compiler}" arg2="gcc"/>
+			<equals arg1="${compiler}" arg2="g77"/>
+		</or>
+	</condition>
+</target>
+
+<target name="clean">
+	<delete dir="${build.dir}"/>
+</target>
+
+
+<target name="build-lib" depends="init">
+	<cc subsystem="console" 
+		outfile="${build.dir}/blas"
+		objdir="${obj.dir}" 
+		outtype="${libtype}" 
+		debug="${debug}"
+		warnings="diagnostic"
+	    optimize="speed"
+		name="${compiler}">
+		<fileset dir="${src.dir}" includes="*.f"/>
+	</cc>
+</target>
+
+<target name="build-dblat1" depends="build-lib">
+	<cc outfile="${build.dir}/dblat1" 
+	    outtype="executable" 
+	    subsystem="console" 
+	    objdir="${obj.dir}" 
+	    debug="${debug}"
+	    warnings="diagnostic"
+	    name="${compiler}"
+	    outputfileproperty="dblat1.exe">
+		<fileset dir="${tests.dir}" includes="dblat1.f"/>
+		<!-- the following line is undesirable and will hopefully be made unnecessary shortly  -->
+		<libset libs="g2c, frtbegin" if="is-gcc"/>
+		<libset dir="${build.dir}" type="${libtype}" libs="blas"/>
+	</cc>
+</target>
+
+
+<target name="test-dblat1" depends="build-dblat1">
+	<exec dir="${build.dir}" 
+	      executable="${dblat1.exe}"
+	      failonerror="true"/> 
+</target>
+
+<target name="build-dblat2" depends="build-lib">
+	<cc outfile="${build.dir}/dblat2" 
+	    outtype="executable" 
+	    subsystem="console" 
+	    objdir="${obj.dir}" 
+	    debug="${debug}"
+	    warnings="diagnostic"
+	    name="${compiler}"
+	    outputfileproperty="dblat2.exe">
+		<fileset dir="${tests.dir}" includes="dblat2.f"/>
+		<!-- the following line is undesirable and will hopefully be made unnecessary shortly  -->
+		<syslibset libs="g2c, frtbegin" if="is-gcc"/>
+		<libset dir="${build.dir}" type="${libtype}" libs="blas"/>
+	</cc>
+</target>
+
+
+<target name="test-dblat2" depends="build-dblat2">
+    <delete file="${build.dir}/DBLAT2.SUMM"/>
+    <!-- requires Ant 1.6 due to the input attribute  -->
+	<exec dir="${build.dir}" 
+	      executable="${dblat2.exe}"
+	      failonerror="true"
+	      input="${tests.dir}/dblat2d"/>
+	<concat><fileset dir="${build.dir}" includes="DBLAT2.SUMM"/></concat>   
+</target>
+
+
+<target name="build-dblat3" depends="build-lib">
+	<cc outfile="${build.dir}/dblat3" 
+	    outtype="executable" 
+	    subsystem="console" 
+	    objdir="${obj.dir}" 
+	    debug="${debug}"
+	    warnings="diagnostic"
+	    name="${compiler}"
+	    outputfileproperty="dblat3.exe">
+		<fileset dir="${tests.dir}" includes="dblat3.f"/>
+		<!-- the following line is undesirable and will hopefully be made unnecessary shortly  -->
+		<syslibset libs="g2c, frtbegin" if="is-gcc"/>
+		<libset dir="${build.dir}" type="${libtype}" libs="blas"/>
+	</cc>
+</target>
+
+
+<target name="test-dblat3" depends="build-dblat3">
+    <delete file="${build.dir}/DBLAT3.SUMM"/>
+    <!-- requires Ant 1.6 due to the input attribute  -->
+	<exec dir="${build.dir}" 
+	      executable="${dblat3.exe}"
+	      failonerror="true"
+	      input="${tests.dir}/dblat3d"/> 
+	<concat><fileset dir="${build.dir}" includes="DBLAT3.SUMM"/></concat>   
+</target>
+
+
+			    
+<target name="all" depends="build-dblat1, build-dblat2, build-dblat3"/>
+
+<target name="test-all" depends="test-dblat1, test-dblat2, test-dblat3"/>
+			    
 </project>
\ No newline at end of file
diff --git a/samples/check.ant b/samples/check.ant
index c0d4271..6e87157 100644
--- a/samples/check.ant
+++ b/samples/check.ant
@@ -1,249 +1,249 @@
-<?xml version="1.0"?>

-<!--

-

-Copyright 2004 The Ant-Contrib project

-

-   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.

--->

-

-<!--  

-

-    build file for check 0.8.4 (http://check.sourceforge.net)

-    a C unit test framework.

-    

--->    

-<project name="check" default="test-all">

-

-<property name="base.dir" value="."/>

-<property name="debug" value="true"/>

-<property name="compiler" value="gcc"/>

-<property name="src.dir" location="${base.dir}/src"/>

-<property name="tests.dir" location="${base.dir}/tests"/>

-<property name="money.dir" location="${base.dir}/doc/money"/>

-<property name="build.dir" location="build"/>

-<property name="major" value="0"/>

-<property name="minor" value="8"/>

-<property name="build" value="4"/>

-<!-- specify api="unix" or api="win32" override platform default -->

-<property name="api" value="default"/>

-

-<taskdef resource="cpptasks.tasks"/>

-<typedef resource="cpptasks.types"/>

-

-<target name="usage">

-	<echo message="Builds check (http://check.sourceforge.net)."/>

-	<echo message="Usage:"/>

-	<echo message="ant -f cppunit.ant -Dbase.dir=c:/check-0.8.4"/>

-	<echo message="    -Dcompiler=[gcc | msvc | icc | bcc ...]"/>

-</target>

-

-<!--  

-    sample versioninfo, targetplatform and distributer to check

-         if definitions are processed, not functional at this time

--->         

-<versioninfo id="check-version" 

-             fileversion="0.8.4" 

-             compatibilityversion="0.8"/>

-             

-<targetplatform id="winbox" arch="pentium4" osfamily="windows"/>

-

-<distributer id="mydistcc" hosts="192.168.18.101 192.168.18.102" protocol="distcc" user="carnold">

-    <map local="c:\" remote="smb://xanadu/c-drive/" remoteseparator="/"/>

-</distributer>

-

-<target name="check-config" depends="init">

-	<available property="configure-available" 

-	           file="${base.dir}/configure"/>

-	<available property="config-available" 

-	           file="${base.dir}/config.h"/>

-	<condition property="do-autogen">

-			<not>

-				<or>

-					<isset property="configure-available"/>

-					<isset property="is-windows"/>

-				</or>

-			</not>

-	</condition>

-	<condition property="do-configure">

-			<not>

-				<or>

-					<isset property="config-available"/>

-					<isset property="is-windows"/>

-				</or>

-			</not>

-	</condition>

-</target>

-

-<target name="run-autogen" 

-        depends="check-config" 

-	    if="do-autogen">

-	<exec dir="${base.dir}" executable="bash">

-		<arg value="autogen.sh"/>

-	</exec>

-</target>

-

-

-<target name="run-configure" 

-        depends="run-autogen" 

-        if="do-configure">

-	<exec dir="${base.dir}" executable="bash">

-		<arg value="configure"/>

-	</exec>

-</target>

-

-<target name="init">

-	<mkdir dir="${build.dir}"/>

-	<property name="obj.dir" value="${build.dir}/obj"/>

-	<mkdir dir="${obj.dir}"/>

-	<condition property="is-gcc">

-		<or>

-			<equals arg1="${compiler}" arg2="gcc"/>

-			<equals arg1="${compiler}" arg2="g++"/>

-		</or>

-	</condition>

-	<condition property="is-msvc">

-		<or>

-			<equals arg1="${compiler}" arg2="msvc"/>

-		</or>

-	</condition>

-	<condition property="is-windows"><os family="windows"/></condition>

-	<condition property="is-win32">

-		<or>

-			<equals arg1="${api}" arg2="win32"/>

-			<and>

-				<equals arg1="${api}" arg2="default"/>

-				<isset property="is-windows"/>

-			</and>

-		</or>

-	</condition>

-	<property environment="env"/>

-	<!--  in case not set in environment, use an insignificant value -->

-	<property name="env.LD_LIBRARY_PATH" value="."/>

-</target>

-

-<target name="clean">

-	<delete dir="${build.dir}"/>

-</target>

-

-

-<target name="static-lib" depends="run-configure">

-	<mkdir dir="${obj.dir}"/>

-	<cc subsystem="console" 

-		outfile="${build.dir}/check"

-		objdir="${obj.dir}" 

-		outtype="static" 

-		debug="${debug}"

-		warnings="diagnostic"

-	    optimize="speed"

-		name="${compiler}">

-		<fileset dir="${src.dir}" includes="*.c"/>

-		<includepath path="${base.dir};${src.dir}"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<defineset define="HAVE_CONFIG_H"/>

-		<versioninfo refid="check-version"/>

-	</cc>

-</target>

-

-<target name="build-money" depends="static-lib">

-	<cc outfile="${build.dir}/money" 

-	    outtype="executable" 

-	    subsystem="console" 

-	    objdir="${obj.dir}" 

-	    debug="${debug}"

-	    warnings="diagnostic"

-	    name="${compiler}"

-	    outputfileproperty="money.exe">

-		<fileset dir="${money.dir}" includes="*.c"/>

-		<includepath path="${src.dir}"/>

-		<libset dir="${build.dir}" libs="check"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo refid="check-version"/>

-	</cc>

-</target>

-

-

-<target name="test-money" depends="build-money">

-	<exec dir="${build.dir}" 

-	      executable="${money.exe}"

-	      failonerror="false"/> 

-</target>

-

-<target name="build-check_check" depends="static-lib">

-

-    <!--  test expected file of test failure not to include

-             path, this change checks that the last 17 characters

-             of the file are check_check_sub.c   -->

-    <replace file="${tests.dir}/check_check_master.c"

-          token='strcmp(tr_lfile(tr_fail_array[i])'

-          value="strcmp(strchr(tr_lfile(tr_fail_array[i]), 0) - 17"/>

-

-    <!--   multiple tests expected error message not to include

-                 path to source file, changed hardcoded "check_check_fixture.c"

-                 to __FILE__   -->

-    <replace file="${tests.dir}/check_check_fixture.c"

-          token='"check_check_fixture.c:'

-          value='__FILE__ ":'/>

-          

-	<cc outfile="${build.dir}/check_check" 

-	    outtype="executable" 

-	    subsystem="console" 

-	    objdir="${obj.dir}" 

-	    debug="${debug}"

-	    warnings="diagnostic"

-	    name="${compiler}"

-	    outputfileproperty="check_check.exe">

-		<fileset dir="${tests.dir}" includes="check_check*.c, check_list.c"/>

-		<includepath path="${src.dir};${tests.dir}"/>

-		<libset dir="${build.dir}" libs="check"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo refid="check-version"/>

-	</cc>

-</target>

-

-

-<target name="test-check_check" depends="build-check_check">

-	<exec dir="${tests.dir}" 

-	      executable="${check_check.exe}"

-	      failonerror="true"/> 

-</target>

-

-<target name="build-check_stress" depends="static-lib">

-	<cc outfile="${build.dir}/check_stress" 

-	    outtype="executable" 

-	    subsystem="console" 

-	    objdir="${obj.dir}" 

-	    debug="${debug}"

-	    warnings="diagnostic"

-	    name="${compiler}"

-	    outputfileproperty="check_stress.exe">

-		<fileset dir="${tests.dir}" includes="check_stress.c"/>

-		<includepath path="${src.dir};${tests.dir}"/>

-		<libset dir="${build.dir}" libs="check"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo refid="check-version"/>

-	</cc>

-</target>

-

-

-<target name="test-check_stress" depends="build-check_stress">

-	<exec dir="${tests.dir}" 

-	      executable="${check_stress.exe}"

-	      failonerror="true"/> 

-</target>

-

-			    

-<target name="all" depends="build-money, build-check_check, build-check_stress"/>

-

-<target name="test-all" depends="test-money, test-check_check, test-check_stress"/>

-			    

+<?xml version="1.0"?>
+<!--
+
+Copyright 2004 The Ant-Contrib project
+
+   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.
+-->
+
+<!--  
+
+    build file for check 0.8.4 (http://check.sourceforge.net)
+    a C unit test framework.
+    
+-->    
+<project name="check" default="test-all">
+
+<property name="base.dir" value="."/>
+<property name="debug" value="true"/>
+<property name="compiler" value="gcc"/>
+<property name="src.dir" location="${base.dir}/src"/>
+<property name="tests.dir" location="${base.dir}/tests"/>
+<property name="money.dir" location="${base.dir}/doc/money"/>
+<property name="build.dir" location="build"/>
+<property name="major" value="0"/>
+<property name="minor" value="8"/>
+<property name="build" value="4"/>
+<!-- specify api="unix" or api="win32" override platform default -->
+<property name="api" value="default"/>
+
+<taskdef resource="cpptasks.tasks"/>
+<typedef resource="cpptasks.types"/>
+
+<target name="usage">
+	<echo message="Builds check (http://check.sourceforge.net)."/>
+	<echo message="Usage:"/>
+	<echo message="ant -f cppunit.ant -Dbase.dir=c:/check-0.8.4"/>
+	<echo message="    -Dcompiler=[gcc | msvc | icc | bcc ...]"/>
+</target>
+
+<!--  
+    sample versioninfo, targetplatform and distributer to check
+         if definitions are processed, not functional at this time
+-->         
+<versioninfo id="check-version" 
+             fileversion="0.8.4" 
+             compatibilityversion="0.8"/>
+             
+<targetplatform id="winbox" arch="pentium4" osfamily="windows"/>
+
+<distributer id="mydistcc" hosts="192.168.18.101 192.168.18.102" protocol="distcc" user="carnold">
+    <map local="c:\" remote="smb://xanadu/c-drive/" remoteseparator="/"/>
+</distributer>
+
+<target name="check-config" depends="init">
+	<available property="configure-available" 
+	           file="${base.dir}/configure"/>
+	<available property="config-available" 
+	           file="${base.dir}/config.h"/>
+	<condition property="do-autogen">
+			<not>
+				<or>
+					<isset property="configure-available"/>
+					<isset property="is-windows"/>
+				</or>
+			</not>
+	</condition>
+	<condition property="do-configure">
+			<not>
+				<or>
+					<isset property="config-available"/>
+					<isset property="is-windows"/>
+				</or>
+			</not>
+	</condition>
+</target>
+
+<target name="run-autogen" 
+        depends="check-config" 
+	    if="do-autogen">
+	<exec dir="${base.dir}" executable="bash">
+		<arg value="autogen.sh"/>
+	</exec>
+</target>
+
+
+<target name="run-configure" 
+        depends="run-autogen" 
+        if="do-configure">
+	<exec dir="${base.dir}" executable="bash">
+		<arg value="configure"/>
+	</exec>
+</target>
+
+<target name="init">
+	<mkdir dir="${build.dir}"/>
+	<property name="obj.dir" value="${build.dir}/obj"/>
+	<mkdir dir="${obj.dir}"/>
+	<condition property="is-gcc">
+		<or>
+			<equals arg1="${compiler}" arg2="gcc"/>
+			<equals arg1="${compiler}" arg2="g++"/>
+		</or>
+	</condition>
+	<condition property="is-msvc">
+		<or>
+			<equals arg1="${compiler}" arg2="msvc"/>
+		</or>
+	</condition>
+	<condition property="is-windows"><os family="windows"/></condition>
+	<condition property="is-win32">
+		<or>
+			<equals arg1="${api}" arg2="win32"/>
+			<and>
+				<equals arg1="${api}" arg2="default"/>
+				<isset property="is-windows"/>
+			</and>
+		</or>
+	</condition>
+	<property environment="env"/>
+	<!--  in case not set in environment, use an insignificant value -->
+	<property name="env.LD_LIBRARY_PATH" value="."/>
+</target>
+
+<target name="clean">
+	<delete dir="${build.dir}"/>
+</target>
+
+
+<target name="static-lib" depends="run-configure">
+	<mkdir dir="${obj.dir}"/>
+	<cc subsystem="console" 
+		outfile="${build.dir}/check"
+		objdir="${obj.dir}" 
+		outtype="static" 
+		debug="${debug}"
+		warnings="diagnostic"
+	    optimize="speed"
+		name="${compiler}">
+		<fileset dir="${src.dir}" includes="*.c"/>
+		<includepath path="${base.dir};${src.dir}"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<defineset define="HAVE_CONFIG_H"/>
+		<versioninfo refid="check-version"/>
+	</cc>
+</target>
+
+<target name="build-money" depends="static-lib">
+	<cc outfile="${build.dir}/money" 
+	    outtype="executable" 
+	    subsystem="console" 
+	    objdir="${obj.dir}" 
+	    debug="${debug}"
+	    warnings="diagnostic"
+	    name="${compiler}"
+	    outputfileproperty="money.exe">
+		<fileset dir="${money.dir}" includes="*.c"/>
+		<includepath path="${src.dir}"/>
+		<libset dir="${build.dir}" libs="check"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo refid="check-version"/>
+	</cc>
+</target>
+
+
+<target name="test-money" depends="build-money">
+	<exec dir="${build.dir}" 
+	      executable="${money.exe}"
+	      failonerror="false"/> 
+</target>
+
+<target name="build-check_check" depends="static-lib">
+
+    <!--  test expected file of test failure not to include
+             path, this change checks that the last 17 characters
+             of the file are check_check_sub.c   -->
+    <replace file="${tests.dir}/check_check_master.c"
+          token='strcmp(tr_lfile(tr_fail_array[i])'
+          value="strcmp(strchr(tr_lfile(tr_fail_array[i]), 0) - 17"/>
+
+    <!--   multiple tests expected error message not to include
+                 path to source file, changed hardcoded "check_check_fixture.c"
+                 to __FILE__   -->
+    <replace file="${tests.dir}/check_check_fixture.c"
+          token='"check_check_fixture.c:'
+          value='__FILE__ ":'/>
+          
+	<cc outfile="${build.dir}/check_check" 
+	    outtype="executable" 
+	    subsystem="console" 
+	    objdir="${obj.dir}" 
+	    debug="${debug}"
+	    warnings="diagnostic"
+	    name="${compiler}"
+	    outputfileproperty="check_check.exe">
+		<fileset dir="${tests.dir}" includes="check_check*.c, check_list.c"/>
+		<includepath path="${src.dir};${tests.dir}"/>
+		<libset dir="${build.dir}" libs="check"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo refid="check-version"/>
+	</cc>
+</target>
+
+
+<target name="test-check_check" depends="build-check_check">
+	<exec dir="${tests.dir}" 
+	      executable="${check_check.exe}"
+	      failonerror="true"/> 
+</target>
+
+<target name="build-check_stress" depends="static-lib">
+	<cc outfile="${build.dir}/check_stress" 
+	    outtype="executable" 
+	    subsystem="console" 
+	    objdir="${obj.dir}" 
+	    debug="${debug}"
+	    warnings="diagnostic"
+	    name="${compiler}"
+	    outputfileproperty="check_stress.exe">
+		<fileset dir="${tests.dir}" includes="check_stress.c"/>
+		<includepath path="${src.dir};${tests.dir}"/>
+		<libset dir="${build.dir}" libs="check"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo refid="check-version"/>
+	</cc>
+</target>
+
+
+<target name="test-check_stress" depends="build-check_stress">
+	<exec dir="${tests.dir}" 
+	      executable="${check_stress.exe}"
+	      failonerror="true"/> 
+</target>
+
+			    
+<target name="all" depends="build-money, build-check_check, build-check_stress"/>
+
+<target name="test-all" depends="test-money, test-check_check, test-check_stress"/>
+			    
 </project>
\ No newline at end of file
diff --git a/samples/cppunit.ant b/samples/cppunit.ant
index f6b2172..a2441a4 100644
--- a/samples/cppunit.ant
+++ b/samples/cppunit.ant
@@ -1,559 +1,559 @@
-<?xml version="1.0"?>

-<!--

-

-Copyright 2004 The Ant-Contrib project

-

-   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.

--->

-<project name="cppunit" default="test-all-but-qt">

-

-<property name="base.dir" value="."/>

-<property name="debug" value="true"/>

-<property name="compiler" value="gcc"/>

-<property name="src.dir" location="${base.dir}/src"/>

-<property name="examples.dir" location="${base.dir}/examples"/>

-<property name="build.dir" location="build"/>

-<property name="include.dir" location="${base.dir}/include"/>

-<property name="config.dir" location="${base.dir}/config"/>

-<property name="qt.dir" location="/usr/lib/qt3"/>

-<property name="major" value="1"/>

-<property name="minor" value="9"/>

-<property name="build" value="14"/>

-<!-- specify api="unix" or api="win32" override platform default -->

-<property name="api" value="default"/>

-

-<taskdef resource="cpptasks.tasks"/>

-<typedef resource="cpptasks.types"/>

-

-<target name="usage">

-	<echo message="Builds cppunit (http://cppunit.sf.net)."/>

-	<echo message="Usage:"/>

-	<echo message="ant -f cppunit.ant -Dbase.dir=c:/cppunit-1.9.14"/>

-	<echo message="    -Dcompiler=[gcc | msvc | icc | bcc ...]"/>

-	<echo message="Status:"/>

-	<echo message="test-all will pass for gcc and icc on Linux"/>

-	<echo message="test-all-but-qt will pass for gcc on Mac OS/X"/>

-	<echo message="test-all-but-qt will pass for msvc on Windows"/>

-	<echo message="all-but-qt will pass for bcc but test that divide by zero will fail"/>

-	<echo message="test-all-but-qt will pass for gcc and CC on Solaris,"/>

-	<echo message="but may be necessary to add /usr/ccs/bin so &quot;ar&quot; may be found and"/>

-	<echo message="add the location of libstdc++ to LD_LIBRARY_PATH"/>

-</target>

-

-<!--

-    sample versioninfo, targetplatform and distributer to check

-         if definitions are processed, not functional at this time

--->

-<versioninfo id="cppunit-version"

-             fileversion="1.9.14"

-             productversion="1.9.14"

-             compatibilityversion="1"

-             legalcopyright="Copyright &#xA9; 1996-2000 by Michael Feathers &lt;mfeathers@objectmentor.com&gt;"

-             productname="cppunit"

-             companyname="Cppunit project &lt;http://cppunit.sourceforge.net&gt;"

-             />

-

-<targetplatform id="winbox" arch="pentium4" osfamily="windows"/>

-

-<distributer id="mydistcc" hosts="192.168.18.101 192.168.18.102" protocol="distcc" user="carnold">

-    <map local="c:\" remote="smb://xanadu/c-drive/" remoteseparator="/"/>

-</distributer>

-

-<target name="check-config" depends="init">

-	<available property="configure-available"

-	           file="${base.dir}/configure"/>

-	<available property="config-auto-available"

-	           file="${include.dir}/cppunit/config-auto.h"/>

-	<condition property="do-autogen">

-			<not>

-				<or>

-					<isset property="configure-available"/>

-					<isset property="is-windows"/>

-				</or>

-			</not>

-	</condition>

-	<condition property="do-configure">

-			<not>

-				<or>

-					<isset property="config-auto-available"/>

-					<isset property="is-windows"/>

-				</or>

-			</not>

-	</condition>

-	<condition property="use-brc">

-		<equals arg1="${compiler}" arg2="bcc"/>

-	</condition>

-</target>

-

-<target name="run-autogen"

-        depends="check-config"

-	    if="do-autogen">

-	<exec dir="${base.dir}" executable="bash">

-		<arg value="autogen.sh"/>

-	</exec>

-</target>

-

-

-<target name="run-configure"

-        depends="run-autogen"

-        if="do-configure">

-	<exec dir="${base.dir}" executable="bash">

-		<arg value="configure"/>

-	</exec>

-</target>

-

-<target name="init">

-	<mkdir dir="${build.dir}"/>

-	<property name="obj.dir" value="${build.dir}/obj"/>

-	<mkdir dir="${obj.dir}"/>

-	<condition property="is-gcc">

-		<or>

-			<equals arg1="${compiler}" arg2="gcc"/>

-			<equals arg1="${compiler}" arg2="g++"/>

-		</or>

-	</condition>

-	<condition property="is-msvc">

-		<or>

-			<equals arg1="${compiler}" arg2="msvc"/>

-		</or>

-	</condition>

-	<condition property="is-windows"><os family="windows"/></condition>

-	<condition property="is-win32">

-		<or>

-			<equals arg1="${api}" arg2="win32"/>

-			<and>

-				<equals arg1="${api}" arg2="default"/>

-				<isset property="is-windows"/>

-			</and>

-		</or>

-	</condition>

-	<property environment="env"/>

-	<!--  in case not set in environment, use an insignificant value -->

-	<property name="env.LD_LIBRARY_PATH" value="."/>

-</target>

-

-<target name="clean">

-	<delete dir="${build.dir}"/>

-</target>

-

-

-<target name="shared-lib" depends="run-configure">

-	<mkdir dir="${obj.dir}/cppunit_shared"/>

-	<mkdir dir="${build.dir}/lib"/>

-	<cc subsystem="console"

-	    objdir="${obj.dir}/cppunit_shared"

-	    debug="${debug}"

-	    outtype="shared"

-	    name="${compiler}"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-	    outfile="${build.dir}/lib/cppunit">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${src.dir}/cppunit"

-		   includes="*.cpp" excludes="DllMain.cpp"/>

-		<fileset dir="${src.dir}/cppunit"

-			includes="DllMain.cpp"

-			if="is-windows"/>

-		<includepath path="${include.dir}"/>

-		<libset libs="dl" unless="is-win32"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<defineset define="CPPUNIT_BUILD_DLL"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo extends="cppunit-version" filedescription="Cppunit shared library"/>

-        <!-- writes shared-lib.cbx  -->

-	<project outfile="${base.dir}/shared-lib" type="cbuilderx" name="shared-lib"/>

-        <!-- writes cppunit.dsp  -->

-		<project outfile="${base.dir}/cppunit" type="msvc5" name="cppunit"/>

-        <!-- writes cppunit.vcproj  -->

-		<project outfile="${base.dir}/cppunit" type="msvc71" name="testdllproj"/>

-        <!-- writes cppunit.xcode  -->

-		<project outfile="${base.dir}/cppunit" type="xcode" name="cppunit"/>

-	</cc>

-</target>

-

-<target name="static-lib" depends="run-configure">

-	<mkdir dir="${obj.dir}/cppunit_static"/>

-	<cc subsystem="console"

-		outfile="${build.dir}/cppunit"

-		objdir="${obj.dir}/cppunit_static"

-		outtype="static"

-		debug="${debug}"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-		name="${compiler}">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${src.dir}/cppunit"

-		   includes="*.cpp" excludes="DllMain.cpp"/>

-		<includepath path="${include.dir}"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<versioninfo extends="cppunit-version" filedescription="Cppunit static library"/>

-        <!-- writes static-lib.cbx  -->

-	<project outfile="${base.dir}/static-lib" type="cbuilderx" name="static-lib"/>

-		<project outfile="${base.dir}/cppunit_static" type="msvc5" name="cppunit"/>

-	</cc>

-</target>

-

-<target name="compile-static-test" depends="static-lib">

-	<mkdir dir="${obj.dir}/cppunittestmain_static"/>

-	<cc outfile="${build.dir}/cppunittestmain_static"

-	    outtype="executable"

-	    subsystem="console"

-	    objdir="${obj.dir}/cppunittestmain_static"

-	    debug="${debug}"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-	    name="${compiler}"

-	    outputfileproperty="test-static.exe">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${examples.dir}/cppunittest"

-		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>

-		<includepath path="${include.dir}"/>

-		<libset dir="${build.dir}" libs="cppunit"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<versioninfo extends="cppunit-version" filedescription="Self tests using static library"/>

-	        <project outfile="${base.dir}/static-test" type="cbuilderx" name="static-test"/>

-		<project outfile="${base.dir}/static_test" type="msvc5" name="cppunittestmain"/>

-	</cc>

-</target>

-

-<target name="compile-shared-test" depends="shared-lib">

-	<mkdir dir="${obj.dir}/cppunittestmain_shared_shared"/>

-	<cc outfile="${build.dir}/lib/cppunittestmain_shared"

-	    outtype="executable"

-		subsystem="console"

-		objdir="${obj.dir}/cppunittestmain_shared"

-		debug="${debug}"

-		name="${compiler}"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-		outputfileproperty="test.exe">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${examples.dir}/cppunittest"

-		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>

-		<includepath path="${include.dir}"/>

-		<libset dir="${build.dir}/lib" libs="cppunit"/>

-		<defineset define="CPPUNIT_DLL"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<versioninfo extends="cppunit-version" filedescription="Self tests using shared library"/>

-	        <project outfile="${base.dir}/shared-test" type="cbuilderx" name="shared-test"/>

-	</cc>

-</target>

-

-<!--

-compile CPPUnit implementation and unit tests into a single executable

--->

-<target name="compile-mono-test" depends="run-configure">

-	<mkdir dir="${obj.dir}/cppunittestmain_mono"/>

-	<cc outfile="${build.dir}/lib/cppunittestmain"

-	    outtype="executable"

-		subsystem="console"

-		objdir="${obj.dir}/cppunittestmain_mono"

-		debug="${debug}"

-		name="${compiler}"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-	    outputfileproperty="test.exe">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${src.dir}/cppunit"

-		   includes="*.cpp" excludes="DllMain.cpp"/>

-		<libset libs="dl" unless="is-win32"/>

-		<fileset dir="${examples.dir}/cppunittest"

-		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>

-		<includepath path="${include.dir}"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<libset libs="stdc++" if="is-gcc"/>

-	    <versioninfo extends="cppunit-version" filedescription="Combined unit tests and implementation"/>

-	    <project outfile="${base.dir}/mono-test" type="cbuilderx" name="cppunittestmain_mono"/>

-	</cc>

-</target>

-

-<target name="test-static" depends="compile-static-test">

-	<!-- return value (or Ant's treatment of it) is

-	           inconsistent on Linux   -->

-	<exec dir="${build.dir}"

-	      executable="${test-static.exe}"

-	      failonerror="true"/>

-</target>

-

-<target name="test-shared" depends="compile-shared-test">

-	<!-- return value (or Ant's treatment of it) is

-	           inconsistent on Linux   -->

-	<exec dir="${build.dir}"

-	      executable="${build.dir}/lib/cppunittestmain_shared"

-	      failonerror="true">

-	      <env key="LD_LIBRARY_PATH" value="${build.dir}/lib:${env.LD_LIBRARY_PATH}"/>

-	</exec>

-</target>

-

-<target name="test-mono" depends="compile-mono-test">

-	<exec dir="${build.dir}"

-	      executable="${build.dir}/cppunittestmain"

-	      failonerror="true"/>

-</target>

-

-<target name="qttestrunner" depends="shared-lib">

-	<mkdir dir="${obj.dir}/qttestrunner"/>

-    <mkdir dir="${build.dir}/qttestrunner"/>

-	<cc outfile="${build.dir}/qttestrunner"

-	    outtype="shared"

-	    subsystem="console"

-	    objdir="${obj.dir}/qttestrunner"

-	    exceptions="true"

-	    name="${compiler}"

-	    rtti="true"

-	    optimize="speed"

-	    debug="${debug}">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${src.dir}/qttestrunner" includes="*.cpp"/>

-		<compiler name="uic">

-			<fileset dir="${src.dir}/qttestrunner" includes="*.ui"/>

-		</compiler>

-		<defineset define="_REENTRANT,QT_NO_DEBUG,QT_THREAD_SUPPORT,QT_SHARED,QT_TABLE_SUPPORT"/>

-		<includepath path="${include.dir}"/>

-		<includepath path="${obj.dir}/qttestrunner"/>

-		<includepath path="${qt.dir}/include"/>

-		<libset dir="${build.dir}/lib" libs="cppunit"/>

-		<libset dir="${qt.dir}/lib" libs="qt-mt"/>

-		<libset libs="pthread"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<versioninfo extends="cppunit-version" filedescription="Qt test runner"/>

-	</cc>

-

-</target>

-

-<target name="plugintester" depends="static-lib">

-	<mkdir dir="${obj.dir}/DllPlugInTester"/>

-	<cc outfile="${build.dir}/DllPlugInTester"

-	    outtype="executable"

-	    subsystem="console"

-	    objdir="${obj.dir}/DllPlugInTester"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-	    name="${compiler}"

-	    debug="${debug}">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${src.dir}/DllPlugInTester"

-		    includes="*.cpp"

-		    excludes="DllPlugInTesterTest.cpp"/>

-		<includepath path="${include.dir}"/>

-		<libset dir="${build.dir}" libs="cppunit"/>

-		<libset libs="dl" unless="is-windows"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<defineset define="WIN32" if="is-windows"/>

-		<versioninfo extends="cppunit-version" fileversion="Dll Plug-in tester"/>

-	</cc>

-</target>

-

-

-<target name="plugintestertest" depends="plugintester">

-	<mkdir dir="${obj.dir}/DllPlugInTester"/>

-	<cc outfile="${build.dir}/DllPlugInTesterTest"

-	    outtype="executable"

-	    subsystem="console"

-	    objdir="${obj.dir}/DllPlugInTester"

-	    name="${compiler}"

-	    exceptions="true"

-	    optimize="speed"

-	    rtti="true"

-	    debug="${debug}">

-		<fileset dir="${src.dir}/DllPlugInTester"

-		    includes="*.cpp"

-		    excludes="DllPlugInTester.cpp"/>

-		<includepath path="${include.dir}"/>

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<libset dir="${build.dir}" libs="cppunit"/>

-		<libset libs="dl" unless="is-windows"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<defineset define="WIN32" if="is-windows"/>

-		<versioninfo extends="cppunit-version" filedescription="Tests for Plugin tester"/>

-	</cc>

-</target>

-

-<target name="test-plugintestertest" depends="plugintestertest">

-	<exec executable="${build.dir}/DllPlugInTesterTest"/>

-</target>

-

-<target name="money" depends="static-lib">

-	<mkdir dir="${obj.dir}/money"/>

-	<cc outfile="${build.dir}/MoneyApp"

-	    outtype="executable"

-	    subsystem="console"

-	    name="${compiler}"

-	    objdir="${obj.dir}/money"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-	    debug="${debug}">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${examples.dir}/money"

-		    includes="*.cpp"/>

-		<includepath path="${include.dir}"/>

-		<libset dir="${build.dir}" libs="cppunit"/>

-		<libset libs="dl" unless="is-windows"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo extends="cppunit-version" filedescription="Money example"/>

-	</cc>

-</target>

-

-<target name="test-money" depends="money">

-	<exec executable="${build.dir}/MoneyApp"

-	      failonerror="true"/>

-</target>

-

-<target name="hierarchy" depends="static-lib">

-	<mkdir dir="${obj.dir}/hierarchy"/>

-	<cc outfile="${build.dir}/hierarchy"

-	    outtype="executable"

-	    subsystem="console"

-	    name="${compiler}"

-	    objdir="${obj.dir}/hierarchy"

-	    exceptions="true"

-	    rtti="true"

-	    optimize="speed"

-	    debug="${debug}">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${examples.dir}/hierarchy"

-		    includes="*.cpp"/>

-		<includepath path="${include.dir}"/>

-		<libset dir="${build.dir}" libs="cppunit"/>

-		<libset libs="dl" unless="is-windows"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo extends="cppunit-version" filedescription="Hierarchy example"/>

-	</cc>

-</target>

-

-<target name="test-hierarchy" depends="hierarchy">

-	<!--  some tests intentionally fail -->

-	<exec executable="${build.dir}/hierarchy"

-	      resultproperty="hierarchy-result"/>

-	<condition property="hierarchy-pass">

-		<equals arg1="${hierarchy-result}" arg2="0"/>

-	</condition>

-	<fail unless="hierarchy-pass"

-	      message="hierarchy erroneously passed all tests"/>

-</target>

-

-<target name="simple" depends="static-lib">

-	<mkdir dir="${obj.dir}/simple"/>

-	<cc outfile="${build.dir}/simple"

-	    outtype="executable"

-	    subsystem="console"

-	    name="${compiler}"

-	    exceptions="true"

-	    optimize="speed"

-	    rtti="true"

-	    objdir="${obj.dir}/simple"

-	    debug="${debug}">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${examples.dir}/simple"

-		    includes="*.cpp" excludes="SimplePlugIn.cpp"/>

-		<includepath path="${include.dir}"/>

-		<!--  original was shared, but changing gives

-		          an error loading library  -->

-		<libset dir="${build.dir}" libs="cppunit"/>

-		<libset libs="dl" unless="is-windows"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo extends="cppunit-version" filedescription="Sample plug-in"/>

-	</cc>

-</target>

-

-<target name="test-simple" depends="simple">

-	<!--  some tests intentionally fail -->

-	<exec executable="${build.dir}/simple"

-	      resultproperty="simple-result"/>

-	<condition property="simple-pass">

-		<equals arg1="${simple-result}" arg2="0"/>

-	</condition>

-	<!-- fail unless="simple-pass"

-	      message="simple erroneously passed all tests"/ -->

-</target>

-

-<target name="dsplugin" depends="static-lib" if="is-windows">

-	<mkdir dir="${obj.dir}/DSPlugIn"/>

-	<!--  DSPlugIn.rc required compiled tlb to be in same directory   -->

-	<cc objdir="${src.dir}/msvc6/DSPlugIn"

-		name="midl">

-		<fileset dir="${src.dir}/msvc6/DSPlugIn" includes="*.idl"/>

-	</cc>

-	<cc outfile="${build.dir}/TestRunnerDSPlugIn"

-	    outtype="shared"

-	    subsystem="gui"

-	    objdir="${obj.dir}/DSPlugIn"

-	    exceptions="true"

-	    name="${compiler}"

-	    optimize="speed"

-	    rtti="true"

-	    debug="${debug}">

-	    <compiler name="brc" if="use-brc"/>

-	    <compiler name="msrc"/>

-		<fileset dir="${src.dir}/msvc6/DSPlugIn"

-		    includes="*.cpp *.rc"/>

-		<compiler name="msrc"/>

-		<includepath path="${include.dir}"/>

-		<libset dir="${build.dir}" libs="cppunit"/>

-		<libset libs="stdc++" if="is-gcc"/>

-		<defineset define="WIN32" if="is-win32"/>

-		<versioninfo refid="cppunit-version"/>

-	</cc>

-</target>

-

-

-

-<target name="all-static" depends="static-lib,

-			    plugintestertest,

-			    money,

-			    hierarchy,

-			    simple"/>

-

-<target name="test-all-static" depends="test-static,

-			    test-plugintestertest,

-			    test-money,

-			    test-hierarchy,

-			    test-simple"/>

-

-<target name="all-but-qt" depends="shared-lib,all-static"/>

-

-<target name="test-all-but-qt" depends="test-shared,test-all-static"/>

-

-<target name="all-qt" depends="qttestrunner"/>

-

-<target name="test-all-qt" depends="qttestrunner"/>

-

-<target name="all" depends="all-but-qt, all-qt"/>

-

-<target name="test-all" depends="test-all-but-qt, test-all-qt"/>

-

-</project>

+<?xml version="1.0"?>
+<!--
+
+Copyright 2004 The Ant-Contrib project
+
+   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.
+-->
+<project name="cppunit" default="test-all-but-qt">
+
+<property name="base.dir" value="."/>
+<property name="debug" value="true"/>
+<property name="compiler" value="gcc"/>
+<property name="src.dir" location="${base.dir}/src"/>
+<property name="examples.dir" location="${base.dir}/examples"/>
+<property name="build.dir" location="build"/>
+<property name="include.dir" location="${base.dir}/include"/>
+<property name="config.dir" location="${base.dir}/config"/>
+<property name="qt.dir" location="/usr/lib/qt3"/>
+<property name="major" value="1"/>
+<property name="minor" value="9"/>
+<property name="build" value="14"/>
+<!-- specify api="unix" or api="win32" override platform default -->
+<property name="api" value="default"/>
+
+<taskdef resource="cpptasks.tasks"/>
+<typedef resource="cpptasks.types"/>
+
+<target name="usage">
+	<echo message="Builds cppunit (http://cppunit.sf.net)."/>
+	<echo message="Usage:"/>
+	<echo message="ant -f cppunit.ant -Dbase.dir=c:/cppunit-1.9.14"/>
+	<echo message="    -Dcompiler=[gcc | msvc | icc | bcc ...]"/>
+	<echo message="Status:"/>
+	<echo message="test-all will pass for gcc and icc on Linux"/>
+	<echo message="test-all-but-qt will pass for gcc on Mac OS/X"/>
+	<echo message="test-all-but-qt will pass for msvc on Windows"/>
+	<echo message="all-but-qt will pass for bcc but test that divide by zero will fail"/>
+	<echo message="test-all-but-qt will pass for gcc and CC on Solaris,"/>
+	<echo message="but may be necessary to add /usr/ccs/bin so &quot;ar&quot; may be found and"/>
+	<echo message="add the location of libstdc++ to LD_LIBRARY_PATH"/>
+</target>
+
+<!--
+    sample versioninfo, targetplatform and distributer to check
+         if definitions are processed, not functional at this time
+-->
+<versioninfo id="cppunit-version"
+             fileversion="1.9.14"
+             productversion="1.9.14"
+             compatibilityversion="1"
+             legalcopyright="Copyright &#xA9; 1996-2000 by Michael Feathers &lt;mfeathers@objectmentor.com&gt;"
+             productname="cppunit"
+             companyname="Cppunit project &lt;http://cppunit.sourceforge.net&gt;"
+             />
+
+<targetplatform id="winbox" arch="pentium4" osfamily="windows"/>
+
+<distributer id="mydistcc" hosts="192.168.18.101 192.168.18.102" protocol="distcc" user="carnold">
+    <map local="c:\" remote="smb://xanadu/c-drive/" remoteseparator="/"/>
+</distributer>
+
+<target name="check-config" depends="init">
+	<available property="configure-available"
+	           file="${base.dir}/configure"/>
+	<available property="config-auto-available"
+	           file="${include.dir}/cppunit/config-auto.h"/>
+	<condition property="do-autogen">
+			<not>
+				<or>
+					<isset property="configure-available"/>
+					<isset property="is-windows"/>
+				</or>
+			</not>
+	</condition>
+	<condition property="do-configure">
+			<not>
+				<or>
+					<isset property="config-auto-available"/>
+					<isset property="is-windows"/>
+				</or>
+			</not>
+	</condition>
+	<condition property="use-brc">
+		<equals arg1="${compiler}" arg2="bcc"/>
+	</condition>
+</target>
+
+<target name="run-autogen"
+        depends="check-config"
+	    if="do-autogen">
+	<exec dir="${base.dir}" executable="bash">
+		<arg value="autogen.sh"/>
+	</exec>
+</target>
+
+
+<target name="run-configure"
+        depends="run-autogen"
+        if="do-configure">
+	<exec dir="${base.dir}" executable="bash">
+		<arg value="configure"/>
+	</exec>
+</target>
+
+<target name="init">
+	<mkdir dir="${build.dir}"/>
+	<property name="obj.dir" value="${build.dir}/obj"/>
+	<mkdir dir="${obj.dir}"/>
+	<condition property="is-gcc">
+		<or>
+			<equals arg1="${compiler}" arg2="gcc"/>
+			<equals arg1="${compiler}" arg2="g++"/>
+		</or>
+	</condition>
+	<condition property="is-msvc">
+		<or>
+			<equals arg1="${compiler}" arg2="msvc"/>
+		</or>
+	</condition>
+	<condition property="is-windows"><os family="windows"/></condition>
+	<condition property="is-win32">
+		<or>
+			<equals arg1="${api}" arg2="win32"/>
+			<and>
+				<equals arg1="${api}" arg2="default"/>
+				<isset property="is-windows"/>
+			</and>
+		</or>
+	</condition>
+	<property environment="env"/>
+	<!--  in case not set in environment, use an insignificant value -->
+	<property name="env.LD_LIBRARY_PATH" value="."/>
+</target>
+
+<target name="clean">
+	<delete dir="${build.dir}"/>
+</target>
+
+
+<target name="shared-lib" depends="run-configure">
+	<mkdir dir="${obj.dir}/cppunit_shared"/>
+	<mkdir dir="${build.dir}/lib"/>
+	<cc subsystem="console"
+	    objdir="${obj.dir}/cppunit_shared"
+	    debug="${debug}"
+	    outtype="shared"
+	    name="${compiler}"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+	    outfile="${build.dir}/lib/cppunit">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${src.dir}/cppunit"
+		   includes="*.cpp" excludes="DllMain.cpp"/>
+		<fileset dir="${src.dir}/cppunit"
+			includes="DllMain.cpp"
+			if="is-windows"/>
+		<includepath path="${include.dir}"/>
+		<libset libs="dl" unless="is-win32"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<defineset define="CPPUNIT_BUILD_DLL"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo extends="cppunit-version" filedescription="Cppunit shared library"/>
+        <!-- writes shared-lib.cbx  -->
+	<project outfile="${base.dir}/shared-lib" type="cbuilderx" name="shared-lib"/>
+        <!-- writes cppunit.dsp  -->
+		<project outfile="${base.dir}/cppunit" type="msvc5" name="cppunit"/>
+        <!-- writes cppunit.vcproj  -->
+		<project outfile="${base.dir}/cppunit" type="msvc71" name="testdllproj"/>
+        <!-- writes cppunit.xcode  -->
+		<project outfile="${base.dir}/cppunit" type="xcode" name="cppunit"/>
+	</cc>
+</target>
+
+<target name="static-lib" depends="run-configure">
+	<mkdir dir="${obj.dir}/cppunit_static"/>
+	<cc subsystem="console"
+		outfile="${build.dir}/cppunit"
+		objdir="${obj.dir}/cppunit_static"
+		outtype="static"
+		debug="${debug}"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+		name="${compiler}">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${src.dir}/cppunit"
+		   includes="*.cpp" excludes="DllMain.cpp"/>
+		<includepath path="${include.dir}"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<versioninfo extends="cppunit-version" filedescription="Cppunit static library"/>
+        <!-- writes static-lib.cbx  -->
+	<project outfile="${base.dir}/static-lib" type="cbuilderx" name="static-lib"/>
+		<project outfile="${base.dir}/cppunit_static" type="msvc5" name="cppunit"/>
+	</cc>
+</target>
+
+<target name="compile-static-test" depends="static-lib">
+	<mkdir dir="${obj.dir}/cppunittestmain_static"/>
+	<cc outfile="${build.dir}/cppunittestmain_static"
+	    outtype="executable"
+	    subsystem="console"
+	    objdir="${obj.dir}/cppunittestmain_static"
+	    debug="${debug}"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+	    name="${compiler}"
+	    outputfileproperty="test-static.exe">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${examples.dir}/cppunittest"
+		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>
+		<includepath path="${include.dir}"/>
+		<libset dir="${build.dir}" libs="cppunit"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<versioninfo extends="cppunit-version" filedescription="Self tests using static library"/>
+	        <project outfile="${base.dir}/static-test" type="cbuilderx" name="static-test"/>
+		<project outfile="${base.dir}/static_test" type="msvc5" name="cppunittestmain"/>
+	</cc>
+</target>
+
+<target name="compile-shared-test" depends="shared-lib">
+	<mkdir dir="${obj.dir}/cppunittestmain_shared_shared"/>
+	<cc outfile="${build.dir}/lib/cppunittestmain_shared"
+	    outtype="executable"
+		subsystem="console"
+		objdir="${obj.dir}/cppunittestmain_shared"
+		debug="${debug}"
+		name="${compiler}"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+		outputfileproperty="test.exe">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${examples.dir}/cppunittest"
+		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>
+		<includepath path="${include.dir}"/>
+		<libset dir="${build.dir}/lib" libs="cppunit"/>
+		<defineset define="CPPUNIT_DLL"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<versioninfo extends="cppunit-version" filedescription="Self tests using shared library"/>
+	        <project outfile="${base.dir}/shared-test" type="cbuilderx" name="shared-test"/>
+	</cc>
+</target>
+
+<!--
+compile CPPUnit implementation and unit tests into a single executable
+-->
+<target name="compile-mono-test" depends="run-configure">
+	<mkdir dir="${obj.dir}/cppunittestmain_mono"/>
+	<cc outfile="${build.dir}/lib/cppunittestmain"
+	    outtype="executable"
+		subsystem="console"
+		objdir="${obj.dir}/cppunittestmain_mono"
+		debug="${debug}"
+		name="${compiler}"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+	    outputfileproperty="test.exe">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${src.dir}/cppunit"
+		   includes="*.cpp" excludes="DllMain.cpp"/>
+		<libset libs="dl" unless="is-win32"/>
+		<fileset dir="${examples.dir}/cppunittest"
+		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>
+		<includepath path="${include.dir}"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<libset libs="stdc++" if="is-gcc"/>
+	    <versioninfo extends="cppunit-version" filedescription="Combined unit tests and implementation"/>
+	    <project outfile="${base.dir}/mono-test" type="cbuilderx" name="cppunittestmain_mono"/>
+	</cc>
+</target>
+
+<target name="test-static" depends="compile-static-test">
+	<!-- return value (or Ant's treatment of it) is
+	           inconsistent on Linux   -->
+	<exec dir="${build.dir}"
+	      executable="${test-static.exe}"
+	      failonerror="true"/>
+</target>
+
+<target name="test-shared" depends="compile-shared-test">
+	<!-- return value (or Ant's treatment of it) is
+	           inconsistent on Linux   -->
+	<exec dir="${build.dir}"
+	      executable="${build.dir}/lib/cppunittestmain_shared"
+	      failonerror="true">
+	      <env key="LD_LIBRARY_PATH" value="${build.dir}/lib:${env.LD_LIBRARY_PATH}"/>
+	</exec>
+</target>
+
+<target name="test-mono" depends="compile-mono-test">
+	<exec dir="${build.dir}"
+	      executable="${build.dir}/cppunittestmain"
+	      failonerror="true"/>
+</target>
+
+<target name="qttestrunner" depends="shared-lib">
+	<mkdir dir="${obj.dir}/qttestrunner"/>
+    <mkdir dir="${build.dir}/qttestrunner"/>
+	<cc outfile="${build.dir}/qttestrunner"
+	    outtype="shared"
+	    subsystem="console"
+	    objdir="${obj.dir}/qttestrunner"
+	    exceptions="true"
+	    name="${compiler}"
+	    rtti="true"
+	    optimize="speed"
+	    debug="${debug}">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${src.dir}/qttestrunner" includes="*.cpp"/>
+		<compiler name="uic">
+			<fileset dir="${src.dir}/qttestrunner" includes="*.ui"/>
+		</compiler>
+		<defineset define="_REENTRANT,QT_NO_DEBUG,QT_THREAD_SUPPORT,QT_SHARED,QT_TABLE_SUPPORT"/>
+		<includepath path="${include.dir}"/>
+		<includepath path="${obj.dir}/qttestrunner"/>
+		<includepath path="${qt.dir}/include"/>
+		<libset dir="${build.dir}/lib" libs="cppunit"/>
+		<libset dir="${qt.dir}/lib" libs="qt-mt"/>
+		<libset libs="pthread"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<versioninfo extends="cppunit-version" filedescription="Qt test runner"/>
+	</cc>
+
+</target>
+
+<target name="plugintester" depends="static-lib">
+	<mkdir dir="${obj.dir}/DllPlugInTester"/>
+	<cc outfile="${build.dir}/DllPlugInTester"
+	    outtype="executable"
+	    subsystem="console"
+	    objdir="${obj.dir}/DllPlugInTester"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+	    name="${compiler}"
+	    debug="${debug}">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${src.dir}/DllPlugInTester"
+		    includes="*.cpp"
+		    excludes="DllPlugInTesterTest.cpp"/>
+		<includepath path="${include.dir}"/>
+		<libset dir="${build.dir}" libs="cppunit"/>
+		<libset libs="dl" unless="is-windows"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<defineset define="WIN32" if="is-windows"/>
+		<versioninfo extends="cppunit-version" fileversion="Dll Plug-in tester"/>
+	</cc>
+</target>
+
+
+<target name="plugintestertest" depends="plugintester">
+	<mkdir dir="${obj.dir}/DllPlugInTester"/>
+	<cc outfile="${build.dir}/DllPlugInTesterTest"
+	    outtype="executable"
+	    subsystem="console"
+	    objdir="${obj.dir}/DllPlugInTester"
+	    name="${compiler}"
+	    exceptions="true"
+	    optimize="speed"
+	    rtti="true"
+	    debug="${debug}">
+		<fileset dir="${src.dir}/DllPlugInTester"
+		    includes="*.cpp"
+		    excludes="DllPlugInTester.cpp"/>
+		<includepath path="${include.dir}"/>
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<libset dir="${build.dir}" libs="cppunit"/>
+		<libset libs="dl" unless="is-windows"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<defineset define="WIN32" if="is-windows"/>
+		<versioninfo extends="cppunit-version" filedescription="Tests for Plugin tester"/>
+	</cc>
+</target>
+
+<target name="test-plugintestertest" depends="plugintestertest">
+	<exec executable="${build.dir}/DllPlugInTesterTest"/>
+</target>
+
+<target name="money" depends="static-lib">
+	<mkdir dir="${obj.dir}/money"/>
+	<cc outfile="${build.dir}/MoneyApp"
+	    outtype="executable"
+	    subsystem="console"
+	    name="${compiler}"
+	    objdir="${obj.dir}/money"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+	    debug="${debug}">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${examples.dir}/money"
+		    includes="*.cpp"/>
+		<includepath path="${include.dir}"/>
+		<libset dir="${build.dir}" libs="cppunit"/>
+		<libset libs="dl" unless="is-windows"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo extends="cppunit-version" filedescription="Money example"/>
+	</cc>
+</target>
+
+<target name="test-money" depends="money">
+	<exec executable="${build.dir}/MoneyApp"
+	      failonerror="true"/>
+</target>
+
+<target name="hierarchy" depends="static-lib">
+	<mkdir dir="${obj.dir}/hierarchy"/>
+	<cc outfile="${build.dir}/hierarchy"
+	    outtype="executable"
+	    subsystem="console"
+	    name="${compiler}"
+	    objdir="${obj.dir}/hierarchy"
+	    exceptions="true"
+	    rtti="true"
+	    optimize="speed"
+	    debug="${debug}">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${examples.dir}/hierarchy"
+		    includes="*.cpp"/>
+		<includepath path="${include.dir}"/>
+		<libset dir="${build.dir}" libs="cppunit"/>
+		<libset libs="dl" unless="is-windows"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo extends="cppunit-version" filedescription="Hierarchy example"/>
+	</cc>
+</target>
+
+<target name="test-hierarchy" depends="hierarchy">
+	<!--  some tests intentionally fail -->
+	<exec executable="${build.dir}/hierarchy"
+	      resultproperty="hierarchy-result"/>
+	<condition property="hierarchy-pass">
+		<equals arg1="${hierarchy-result}" arg2="0"/>
+	</condition>
+	<fail unless="hierarchy-pass"
+	      message="hierarchy erroneously passed all tests"/>
+</target>
+
+<target name="simple" depends="static-lib">
+	<mkdir dir="${obj.dir}/simple"/>
+	<cc outfile="${build.dir}/simple"
+	    outtype="executable"
+	    subsystem="console"
+	    name="${compiler}"
+	    exceptions="true"
+	    optimize="speed"
+	    rtti="true"
+	    objdir="${obj.dir}/simple"
+	    debug="${debug}">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${examples.dir}/simple"
+		    includes="*.cpp" excludes="SimplePlugIn.cpp"/>
+		<includepath path="${include.dir}"/>
+		<!--  original was shared, but changing gives
+		          an error loading library  -->
+		<libset dir="${build.dir}" libs="cppunit"/>
+		<libset libs="dl" unless="is-windows"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo extends="cppunit-version" filedescription="Sample plug-in"/>
+	</cc>
+</target>
+
+<target name="test-simple" depends="simple">
+	<!--  some tests intentionally fail -->
+	<exec executable="${build.dir}/simple"
+	      resultproperty="simple-result"/>
+	<condition property="simple-pass">
+		<equals arg1="${simple-result}" arg2="0"/>
+	</condition>
+	<!-- fail unless="simple-pass"
+	      message="simple erroneously passed all tests"/ -->
+</target>
+
+<target name="dsplugin" depends="static-lib" if="is-windows">
+	<mkdir dir="${obj.dir}/DSPlugIn"/>
+	<!--  DSPlugIn.rc required compiled tlb to be in same directory   -->
+	<cc objdir="${src.dir}/msvc6/DSPlugIn"
+		name="midl">
+		<fileset dir="${src.dir}/msvc6/DSPlugIn" includes="*.idl"/>
+	</cc>
+	<cc outfile="${build.dir}/TestRunnerDSPlugIn"
+	    outtype="shared"
+	    subsystem="gui"
+	    objdir="${obj.dir}/DSPlugIn"
+	    exceptions="true"
+	    name="${compiler}"
+	    optimize="speed"
+	    rtti="true"
+	    debug="${debug}">
+	    <compiler name="brc" if="use-brc"/>
+	    <compiler name="msrc"/>
+		<fileset dir="${src.dir}/msvc6/DSPlugIn"
+		    includes="*.cpp *.rc"/>
+		<compiler name="msrc"/>
+		<includepath path="${include.dir}"/>
+		<libset dir="${build.dir}" libs="cppunit"/>
+		<libset libs="stdc++" if="is-gcc"/>
+		<defineset define="WIN32" if="is-win32"/>
+		<versioninfo refid="cppunit-version"/>
+	</cc>
+</target>
+
+
+
+<target name="all-static" depends="static-lib,
+			    plugintestertest,
+			    money,
+			    hierarchy,
+			    simple"/>
+
+<target name="test-all-static" depends="test-static,
+			    test-plugintestertest,
+			    test-money,
+			    test-hierarchy,
+			    test-simple"/>
+
+<target name="all-but-qt" depends="shared-lib,all-static"/>
+
+<target name="test-all-but-qt" depends="test-shared,test-all-static"/>
+
+<target name="all-qt" depends="qttestrunner"/>
+
+<target name="test-all-qt" depends="qttestrunner"/>
+
+<target name="all" depends="all-but-qt, all-qt"/>
+
+<target name="test-all" depends="test-all-but-qt, test-all-qt"/>
+
+</project>
diff --git a/samples/xercesc.ant b/samples/xercesc.ant
index 2405431..b3072de 100644
--- a/samples/xercesc.ant
+++ b/samples/xercesc.ant
@@ -1,1113 +1,1113 @@
-<?xml version="1.0"?>

-

-<!--

-

-Copyright 2001-2004 The Ant-Contrib project

-

-   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.

--->

-<project default="main" basedir=".">

-

-  <!-- Give user a chance to override without editing this file

-       (and without typing -D each time it compiles it) -->

-  <property file=".ant.properties" />

-  <property file="${user.home}/.ant.properties" />

-

-  <property name="Name" value="Apache Xerces-C"/>

-  <property name="name" value="xercesc"/>

-  <property name="version" value="1.5"/>

-

-  <property name="compiler" value="gcc"/>

-  <property name="debug" value="true" />

-  <property name="chmod.fail" value="true" />

-  <property name="platform" value="linux"/>

-  <property name="messageloader" value="inmem"/>

-  <property name="netaccessor" value="native"/>

-  <property name="transcoder" value="iconv"/>

-  <property name="thread" value="pthread"/>

-  <property name="subsystem" value="gui"/>

-

-  <!--  property compiler="gcc"/ -->

-

-  <!--

-       ===================================================================

-         Set the properties related to the source tree

-       ===================================================================

-  -->

-  <property name="src.dir" value="."/>

-  <property name="include.dir" value=".."/>

-  <property name="samples.dir" value="../../samples"/>

-  <property name="tests.dir" value="../../tests"/>

-  <property name="scripts.dir" value="scripts"/>

-  <property name="docs.dir" value="doc"/>

-  <property name="tests.dir" value="tests"/>

-  <property name="xml4com.dir" value="../../Build/Win32/xml4com"/>

-

-

-  <!--

-       ===================================================================

-         Set the properties for the build area

-       ===================================================================

-  -->

-

-  <!--

-  <taskdef resource="cpptasks.tasks"/>

-  <typedef resource="cpptasks.types"/>

-  -->

-  <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>

-  <typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"/>

-  <typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"/>

-

-

-  <target name="pre-init">

-  	<condition property="windows">

-		<os family="windows"/>

-  	</condition>

-	<condition property="linux">

-        <equals arg1="${platform}" arg2="linux"/>

-	</condition>

-	<condition property="is-debug">

-        <isTrue value="${debug}"/>

-	</condition>

-	<condition property="use-msvc">

-	    <equals arg1="${compiler}" arg2="VC6"/>

-	</condition>

-	<condition property="use-gcc">

-		<equals arg1="${compiler}" arg2="gcc"/>

-	</condition>

-	<condition property="use-bcc">

-		<equals arg1="${compiler}" arg2="bcc"/>

-	</condition>

-	<condition property="use-icl">

-		<equals arg1="${compiler}" arg2="icl"/>

-	</condition>

-	<condition property="use-ecl">

-		<equals arg1="${compiler}" arg2="ecl"/>

-	</condition>

-	<condition property="use-icc">

-		<equals arg1="${compiler}" arg2="icc"/>

-	</condition>

-	<condition property="use-ecc">

-		<equals arg1="${compiler}" arg2="ecc"/>

-	</condition>

-    <condition property="use-CC">

-        <equals arg1="${compiler}" arg2="CC"/>

-    </condition>

-    <condition property="use-xlC">

-        <equals arg1="${compiler}" arg2="xlC"/>

-    </condition>

-    <condition property="inmem_messageloader">

-            <equals arg1="${messageloader}" arg2="inmem"/>

-    </condition>

-    <condition property="netaccessor_socket">

-            <equals arg1="${netaccessor}" arg2="socket"/>

-    </condition>

-    <condition property="native_transcoder">

-            <equals arg1="${transcoder}" arg2="native"/>

-    </condition>

-    <condition property="pthread">

-            <equals arg1="${thread}" arg2="pthread"/>

-    </condition>

-  </target>

-

-  <target name="win-debug-init" depends="pre-init" if="is-debug">

-	<property name="winbuild.dir" value="../../Build/Win32/${compiler}/Debug"/>

-	<property name="winbuild.obj.dir" value="${winbuild.dir}/obj"/>

-  </target>

-

-  <target name="exec-link">

-	<exec executable="link"/>

-  </target>

-

-  <target name="exec-link-bogus">

-	<exec executable="link">

-		<arg value="/bogus"/>

-	</exec>

-  </target>

-

-  <target name="win-release-init" depends="pre-init" unless="is-debug">

-	<property name="winbuild.dir" value="../../build/win32/${compiler}/Release"/>

-	<property name="winbuild.obj.dir" value="${winbuild.dir}/obj"/>

-  </target>

-

-  <target name="win-init" depends="win-debug-init,win-release-init" if="windows">

-	<echo message="is windows"/>

-      <property name="win32_transcoder" value=""/>

-      <property name="netaccessor_winsock" value=""/>

-      <property name="win32_msgloader" value=""/>

-      <property name="build.dir" value="${winbuild.dir}"/>

-      <property name="build.obj.dir" value="${winbuild.obj.dir}"/>

-  </target>

-

-  <target name="linux-init" depends="pre-init" if="linux">

-	<echo message="is linux"/>

-        <property name="build.obj.dir" value="../../antobj/LINUX"/>

-        <property name="build.dir" value="../../antlib"/>

-        <property name="netaccessor_socket" value=""/>

-        <property name="inmem_messageloader" value=""/>

-        <property name="pthreads" value=""/>

-        <property name="iconv_transcoder" value=""/>

-  </target>

-

-  <target name="init" depends="win-init,linux-init"/>

-

-  <target name="clean">

-	<delete dir="../../build"/>

-  </target>

-

-	<compiler id="base-msvc" name="msvc">

-		<!--  target Pentium Pro   -->

-		<compilerarg value="/G6"/>

-		<!--  display many warnings   -->

-		<compilerarg value="/W3"/>

-		<!--  maximize speed     -->

-		<compilerarg value="/O2" unless="is-debug"/>

-		<!--  auto-inlining    -->

-		<compilerarg value="/Ob2" unless="is-debug"/>

-		<defineset>

-			<define name="_CRTDBG_MAP_ALLOC" if="is-debug"/>

-		</defineset>

-	</compiler>

-

-	<compiler id="msvc" name="msvc" extends="base-msvc"  if="use-msvc">

-		<!--  disable Microsoft Extensions   -->

-		<compilerarg value="/Za"/>

-	</compiler>

-

-	<compiler id="msvc-with-extensions" extends="base-msvc"  if="use-msvc">

-		<!--  enable Microsoft Extensions   -->

-		<compilerarg value="/Ze"/>

-	</compiler>

-

-    <compiler id="icl" extends="base-msvc" name="icl" if="use-icl">

-		<!--  disable Microsoft Extensions   -->

-		<compilerarg value="/Za"/>

-	</compiler>

-	<compiler id="icl-with-extensions" extends="base-msvc" name="icl" if="use-icl">

-		<!--  enable Microsoft Extensions   -->

-		<compilerarg value="/Ze"/>

-	</compiler>

-

-    <compiler id="ecl" extends="base-msvc" name="ecl" if="use-ecl">

-		<!--  disable Microsoft Extensions   -->

-		<compilerarg value="/Za"/>

-	</compiler>

-	<compiler id="ecl-with-extensions" extends="base-msvc" name="ecl" if="use-ecl">

-		<!--  enable Microsoft Extensions   -->

-		<compilerarg value="/Ze"/>

-	</compiler>

-

-	<compiler id="bcc" name="bcc" if="use-bcc">

-		<!--  target Pentium Pro   -->

-		<compilerarg value="-6"/>

-		<!--  zero length empty class member functions -->

-		<compilerarg value="-Vx"/>

-		<compilerarg value="-Ve"/>

-		<!--   align on quad word boundaries   -->

-		<compilerarg value="-a8"/>

-		<!--   byte size enums   -->

-		<compilerarg value="-b-"/>

-		<compilerarg value="-k"/>

-		<compilerarg value="-y" if="is-debug"/>

-		<compilerarg value="-vi"/>

-		<compilerarg value="-r-" if="is-debug"/>

-		<!--  maximize speed     -->

-		<compilerarg value="-O2" unless="is-debug"/>

-	</compiler>

-

-	<compiler id="gcc" name="gcc" if="use-gcc">

-        <compilerarg value="-O" unless="is-debug"/>

-	</compiler>

-

-

-

-

-  <target name="XercesLib" depends="init">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="shared"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/xerces-c"

-	    multithreaded="true" exceptions="true" subsystem="${subsystem}" dependencyDepth="-1">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<compiler refid="icl"/>

-		<compiler refid="ecl"/>

-		<!-- speciality compiler for a few files that require MS extensions   -->

-		<compiler extends="msvc-with-extensions">

-			<fileset dir="${src.dir}">

-				<include name="util/Platforms/Win32/*.cpp"/>

-				<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader"/>

-				<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock"/>

-				<include name="util/Platforms/Win32/*.cpp"/>

-				<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder"/>

-			</fileset>

-		</compiler>

-		<compiler extends="icl-with-extensions">

-			<fileset dir="${src.dir}">

-				<include name="util/Platforms/Win32/*.cpp"/>

-				<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader"/>

-				<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock"/>

-				<include name="util/Platforms/Win32/*.cpp"/>

-				<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder"/>

-			</fileset>

-		</compiler>

-		<compiler extends="ecl-with-extensions">

-			<fileset dir="${src.dir}">

-				<include name="util/Platforms/Win32/*.cpp"/>

-				<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader"/>

-				<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock"/>

-				<include name="util/Platforms/Win32/*.cpp"/>

-				<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder"/>

-			</fileset>

-		</compiler>

-		<compiler name="msrc" if="use-msvc">

-			<compilerarg value="/l 0x409"/>

-			<fileset dir="${src.dir}" includes="util/Platforms/Win32/Version.rc"/>

-		</compiler>

-		<compiler name="brc" if="use-bcc" inherit="false">

-			<!--  version.rc includes afxres.h, I don't know why   -->

-			<includepath location="c:\msdev6\vc98\include"/>

-			<includepath location="c:\msdev6\vc98\mfc\include"/>

-			<fileset dir="${src.dir}" includes="util/Platforms/Win32/Version.rc"/>

-		</compiler>

-        <compiler if="linux" extends="gcc">

-           <defineset>

-              <define name="_GNU_SOURCE"/>

-              <define name="__USE_GNU"/>

-           </defineset>

-           <fileset dir="${src.dir}" includes="util/Platforms/Linux/*.cpp"/>

-        </compiler>

-		<linker name="gcc" if="use-gcc">

-			<syslibset libs="kernel32,user32,advapi32,ws2_32" if="windows"/>

-            <syslibset libs="pthread" if="pthreads"/>

-		</linker>

-		<!--  base is 0x12000000     -->

-    	<linker name="msvc" base="301989888" if="use-msvc">

-			<syslibset libs="kernel32,user32,advapi32,ws2_32"/>

-		</linker>

-    	<linker name="icl" base="301989888" if="use-icl">

-			<syslibset libs="kernel32,user32,advapi32,ws2_32"/>

-		</linker>

-		<linker name="bcc" if="use-bcc">

-			<syslibset libs="import32,cw32,ws2_32"/>

-		</linker>

-		<fileset dir="${src.dir}">

-			<include name="dom/*.cpp"/>

-			<include name="framework/*.cpp"/>

-			<include name="idom/*.cpp"/>

-			<include name="internal/*.cpp"/>

-			<include name="parsers/*.cpp"/>

-			<include name="sax/*.cpp"/>

-			<include name="sax2/*.cpp"/>

-			<include name="util/*.cpp"/>

-			<include name="validators/*.cpp"/>

-			<include name="validators/common/*.cpp"/>

-			<include name="validators/datatype/*.cpp"/>

-			<include name="validators/DTD/*.cpp"/>

-			<include name="validators/schema/*.cpp"/>

-			<include name="validators/schema/identity/*.cpp"/>

-			<include name="util/regx/*.cpp"/>

-			<!--   if using MS Visual C,

-						these must be compiled with MS Extension enabled

-				   otherwise they can compile with everything else  -->

-			<include name="util/Platforms/Win32/*.cpp" if="windows" unless="use-msvc"/>

-			<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader" unless="use-msvc"/>

-            <include name="util/MsgLoaders/InMemory/*.cpp" if="inmem_messageloader"/>

-			<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock" unless="use-msvc"/>

-            <include name="util/NetAccessors/Socket/*.cpp" if="netaccessor_socket"/>

-			<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder" unless="use-msvc"/>

-            <include name="util/Transcoders/Iconv/*.cpp" if="iconv_transcoder"/>

-            <include name="util/Transcoders/ICU/*.cpp" if="icu_transcoder"/>

-            <include name="util/Compilers/GCCDefs.cpp" if="use-gcc"/>

-		</fileset>

-		<!--   parent of the source directory   -->

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="PROJ_SAX2"/>

-			<define name="PROJ_XMLPARSER"/>

-			<define name="PROJ_XMLUTIL"/>

-			<define name="PROJ_PARSERS"/>

-			<define name="PROJ_SAX4C"/>

-			<define name="PROJ_DOM"/>

-			<define name="PROJ_VALIDATORS"/>

-			<define name="XML_SINGLEDLL"/>

-			<define name="WIN32" if="windows"/>

-			<define name="_WINDOWS" if="windows"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-			<define name="XML_USE_WIN32_TRANSCODER" if="win32_transcoder"/>

-			<define name="XML_USE_WIN32_MSGLOADER" if="win32_msgloader"/>

-			<define name="XML_USE_NETACCESSOR_WINSOCK" if="netaccessor_winsock"/>

-            <define name="LINUX" if="linux"/>

-            <define name="_REENTRANT" if="linux"/>

-            <define name="XML_USE_NATIVE_TRANSCODER" if="native_transcoder"/>

-            <define name="XML_USE_ICU_TRANSCODER" if="icu_transcoder"/>

-            <define name="XML_USE_INMEM_MESSAGELOADER" if="inmem_messageloader"/>

-            <define name="XML_USE_PTHREADS" if="pthreads"/>

-            <define name="XML_USE_NETACCESSOR_SOCKET" if="netaccessor_socket"/>

-		</defineset>

-	</cc>

-

-  </target>

-

-  <target name="CreateDOMDocument" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/CreateDOMDocument"

-	    multithreaded="true" exceptions="true">

-		<compiler extends="gcc">

-                   <compilerarg value="-fpic"/>

-                   <compilerarg value="-w"/>

-                   <compilerarg value="-O"/>

-                </compiler>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="CreateDOMDocument/CreateDOMDocument.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="DOMCount" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMCount"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="DOMCount/DOMCount.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="DOMIDTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMIDTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="DOM/DOMIDTest/DOMIDTest.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-

-  <target name="DOMMemTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMMemTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="DOM/DOMMemTest/DOMMemTest.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-

-  </target>

-

-

-  <target name="DOMPrint" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMPrint"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="DOMPrint/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-

-  </target>

-

-

-  <target name="DOMTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="DOM/DOMTest/*.cpp"/>

-		<fileset dir="${build.dir}" includes="xerces-c.lib"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-

-  </target>

-

-

-

-  <target name="DOMTraversalTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMTraversalTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="DOM/Traversal/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-

-  </target>

-

-

-  <target name="EncodingTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/EncodingTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="EncodingTest/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-

-  </target>

-

-

-  <target name="EnumVal" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/EnumVal"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="EnumVal/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-            <define name="LINUX" if="linux"/>

-            <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-

-  </target>

-

-

-  <target name="IDOMCount" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMCount"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="IDOMCount/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-

-  </target>

-

-

-  <target name="IDOMMemTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMMemTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="IDom/IDOMMemTest/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="IDOMPrint" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMPrint"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="IDOMPrint/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="IDOMTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="IDom/IDOMTest/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="InitTermTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/InitTermTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="InitTermTest/*.cpp"/>

-		<fileset dir="${build.dir}" includes="xerces-c.lib"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="IRangeTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/IRangeTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="IDom/IRangeTest/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="ITraversal" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/ITraversal"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="IDom/ITraversal/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="MemParse" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/MemParse"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="MemParse/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="PParse" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/PParse"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="PParse/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="RangeTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/RangeTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="DOM/RangeTest/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="Redirect" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/Redirect"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	        <linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="Redirect/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="SAX2Count" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/SAX2Count"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-    	<linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="SAX2Count/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="SAXCount" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/SAXCount"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-        	<linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="SAXCount/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="SAXPrint" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/SAXPrint"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-        	<linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="SAXPrint/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="SEnumVal" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/SEnumVal"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-        	<linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="SEnumVal/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="StdInParse" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/StdInParse"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-        	<linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${samples.dir}" includes="StdInParse/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-

-  <target name="ThreadTest" depends="XercesLib">

-    <mkdir dir="${build.obj.dir}"/>

-    <mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="executable"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/ThreadTest"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="gcc"/>

-		<compiler refid="msvc-with-extensions"/>

-		<compiler refid="bcc"/>

-		<linker name="gcc" if="use-gcc"/>

-        	<linker name="msvc" if="use-msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${tests.dir}" includes="ThreadTest/*.cpp"/>

-		<includepath location="${include.dir}"/>

-		<defineset>

-			<define name="CONSOLE"/>

-			<define name="PLATFORM_WIN32" if="windows"/>

-                        <define name="LINUX" if="linux"/>

-                        <define name="_REENTRANT" if="linux"/>

-		</defineset>

-        <libset dir="${build.dir}" libs="xerces-c"/>

-        <syslibset libs="c,stdc++" if="linux"/>

-	</cc>

-  </target>

-

-  <target name="XercesCOM_tlb" depends="init" if="windows">

-    <mkdir dir="${xml4com.dir}"/>

-	<cc debug="${debug}" objdir="${xml4com.dir}" name="midl">

-		<!--  output generated header file to use in next step  -->

-		<compilerarg value="/h"/>

-		<compilerarg value="xml4com.h"/>

-		<compilerarg value="/iid"/>

-		<compilerarg value="xml4com_i.c"/>

-		<fileset dir="${src.dir}" includes="com/xml4com.idl"/>

-		<includepath location="${src.dir}/com"/>

-	</cc>

-  </target>

-

-  <target name="XercesCOM" depends="XercesCOM_tlb,XercesLib" if="windows">

-    <mkdir dir="${build.obj.dir}"/>

-	<mkdir dir="${build.dir}"/>

-	<cc debug="${debug}" link="shared"

-	    objdir="${build.obj.dir}" outfile="${build.dir}/xml4com"

-	    multithreaded="true" exceptions="true">

-		<compiler refid="msvc-with-extensions"/>

-		<compiler refid="bcc"/>

-		<compiler name="msrc" if="use-msvc">

-			<compilerarg value="/l 0x409"/>

-			<fileset dir="${src.dir}" includes="com/*.rc"/>

-		</compiler>

-        <precompile prototype="${src.dir}/com/StdAfx.cpp">

-            <except>

-                <fileset dir="${src.dir}" includes="com/XMLDOM*.cpp"/>

-            </except>

-        </precompile>

-    	<linker name="msvc"/>

-		<linker name="bcc" if="use-bcc"/>

-		<fileset dir="${src.dir}" includes="com/*.cpp"/>

-		<fileset dir="${build.dir}" includes="xerces-c.lib"/>

-		<includepath location="${xml4com.dir}"/>

-		<includepath location="${include.dir}"/>

-		<includepath location="."/>

-		<defineset>

-			<define name="PLATFORM_WIN32" if="windows"/>

-		</defineset>

-		<syslibset libs="wininet,shlwapi"/>

-	</cc>

-  </target>

-

-

-  <target name="Samples" depends="CreateDOMDocument,DOMCount,

-  								  DOMPrint,

-  								  EnumVal,

-  								  IDOMCount,

-  								  IDOMPrint,

-  								  MemParse,

-  								  PParse,

-  								  Redirect,SAX2Count,

-  								  SAXCount,SAXPrint,

-  								  SEnumVal,StdInParse"/>

-

-  <target name="Tests" depends="DOMIDTest,DOMMemTest,

-  								  DOMTest,DOMTraversalTest,

-  								  EncodingTest,IDOMMemTest,

-  								  IDOMTest,ITraversal,

-  								  InitTermTest,IRangeTest,

-								  RangeTest,ThreadTest"/>

-

-  <target name="XercesAll" depends="Samples,Tests,XercesCOM"/>

-

-  <target name="main"

-          depends="XercesAll" />

-

-</project>

+<?xml version="1.0"?>
+
+<!--
+
+Copyright 2001-2004 The Ant-Contrib project
+
+   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.
+-->
+<project default="main" basedir=".">
+
+  <!-- Give user a chance to override without editing this file
+       (and without typing -D each time it compiles it) -->
+  <property file=".ant.properties" />
+  <property file="${user.home}/.ant.properties" />
+
+  <property name="Name" value="Apache Xerces-C"/>
+  <property name="name" value="xercesc"/>
+  <property name="version" value="1.5"/>
+
+  <property name="compiler" value="gcc"/>
+  <property name="debug" value="true" />
+  <property name="chmod.fail" value="true" />
+  <property name="platform" value="linux"/>
+  <property name="messageloader" value="inmem"/>
+  <property name="netaccessor" value="native"/>
+  <property name="transcoder" value="iconv"/>
+  <property name="thread" value="pthread"/>
+  <property name="subsystem" value="gui"/>
+
+  <!--  property compiler="gcc"/ -->
+
+  <!--
+       ===================================================================
+         Set the properties related to the source tree
+       ===================================================================
+  -->
+  <property name="src.dir" value="."/>
+  <property name="include.dir" value=".."/>
+  <property name="samples.dir" value="../../samples"/>
+  <property name="tests.dir" value="../../tests"/>
+  <property name="scripts.dir" value="scripts"/>
+  <property name="docs.dir" value="doc"/>
+  <property name="tests.dir" value="tests"/>
+  <property name="xml4com.dir" value="../../Build/Win32/xml4com"/>
+
+
+  <!--
+       ===================================================================
+         Set the properties for the build area
+       ===================================================================
+  -->
+
+  <!--
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  -->
+  <taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
+  <typedef name="linker" classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
+  <typedef name="compiler" classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
+
+
+  <target name="pre-init">
+  	<condition property="windows">
+		<os family="windows"/>
+  	</condition>
+	<condition property="linux">
+        <equals arg1="${platform}" arg2="linux"/>
+	</condition>
+	<condition property="is-debug">
+        <isTrue value="${debug}"/>
+	</condition>
+	<condition property="use-msvc">
+	    <equals arg1="${compiler}" arg2="VC6"/>
+	</condition>
+	<condition property="use-gcc">
+		<equals arg1="${compiler}" arg2="gcc"/>
+	</condition>
+	<condition property="use-bcc">
+		<equals arg1="${compiler}" arg2="bcc"/>
+	</condition>
+	<condition property="use-icl">
+		<equals arg1="${compiler}" arg2="icl"/>
+	</condition>
+	<condition property="use-ecl">
+		<equals arg1="${compiler}" arg2="ecl"/>
+	</condition>
+	<condition property="use-icc">
+		<equals arg1="${compiler}" arg2="icc"/>
+	</condition>
+	<condition property="use-ecc">
+		<equals arg1="${compiler}" arg2="ecc"/>
+	</condition>
+    <condition property="use-CC">
+        <equals arg1="${compiler}" arg2="CC"/>
+    </condition>
+    <condition property="use-xlC">
+        <equals arg1="${compiler}" arg2="xlC"/>
+    </condition>
+    <condition property="inmem_messageloader">
+            <equals arg1="${messageloader}" arg2="inmem"/>
+    </condition>
+    <condition property="netaccessor_socket">
+            <equals arg1="${netaccessor}" arg2="socket"/>
+    </condition>
+    <condition property="native_transcoder">
+            <equals arg1="${transcoder}" arg2="native"/>
+    </condition>
+    <condition property="pthread">
+            <equals arg1="${thread}" arg2="pthread"/>
+    </condition>
+  </target>
+
+  <target name="win-debug-init" depends="pre-init" if="is-debug">
+	<property name="winbuild.dir" value="../../Build/Win32/${compiler}/Debug"/>
+	<property name="winbuild.obj.dir" value="${winbuild.dir}/obj"/>
+  </target>
+
+  <target name="exec-link">
+	<exec executable="link"/>
+  </target>
+
+  <target name="exec-link-bogus">
+	<exec executable="link">
+		<arg value="/bogus"/>
+	</exec>
+  </target>
+
+  <target name="win-release-init" depends="pre-init" unless="is-debug">
+	<property name="winbuild.dir" value="../../build/win32/${compiler}/Release"/>
+	<property name="winbuild.obj.dir" value="${winbuild.dir}/obj"/>
+  </target>
+
+  <target name="win-init" depends="win-debug-init,win-release-init" if="windows">
+	<echo message="is windows"/>
+      <property name="win32_transcoder" value=""/>
+      <property name="netaccessor_winsock" value=""/>
+      <property name="win32_msgloader" value=""/>
+      <property name="build.dir" value="${winbuild.dir}"/>
+      <property name="build.obj.dir" value="${winbuild.obj.dir}"/>
+  </target>
+
+  <target name="linux-init" depends="pre-init" if="linux">
+	<echo message="is linux"/>
+        <property name="build.obj.dir" value="../../antobj/LINUX"/>
+        <property name="build.dir" value="../../antlib"/>
+        <property name="netaccessor_socket" value=""/>
+        <property name="inmem_messageloader" value=""/>
+        <property name="pthreads" value=""/>
+        <property name="iconv_transcoder" value=""/>
+  </target>
+
+  <target name="init" depends="win-init,linux-init"/>
+
+  <target name="clean">
+	<delete dir="../../build"/>
+  </target>
+
+	<compiler id="base-msvc" name="msvc">
+		<!--  target Pentium Pro   -->
+		<compilerarg value="/G6"/>
+		<!--  display many warnings   -->
+		<compilerarg value="/W3"/>
+		<!--  maximize speed     -->
+		<compilerarg value="/O2" unless="is-debug"/>
+		<!--  auto-inlining    -->
+		<compilerarg value="/Ob2" unless="is-debug"/>
+		<defineset>
+			<define name="_CRTDBG_MAP_ALLOC" if="is-debug"/>
+		</defineset>
+	</compiler>
+
+	<compiler id="msvc" name="msvc" extends="base-msvc"  if="use-msvc">
+		<!--  disable Microsoft Extensions   -->
+		<compilerarg value="/Za"/>
+	</compiler>
+
+	<compiler id="msvc-with-extensions" extends="base-msvc"  if="use-msvc">
+		<!--  enable Microsoft Extensions   -->
+		<compilerarg value="/Ze"/>
+	</compiler>
+
+    <compiler id="icl" extends="base-msvc" name="icl" if="use-icl">
+		<!--  disable Microsoft Extensions   -->
+		<compilerarg value="/Za"/>
+	</compiler>
+	<compiler id="icl-with-extensions" extends="base-msvc" name="icl" if="use-icl">
+		<!--  enable Microsoft Extensions   -->
+		<compilerarg value="/Ze"/>
+	</compiler>
+
+    <compiler id="ecl" extends="base-msvc" name="ecl" if="use-ecl">
+		<!--  disable Microsoft Extensions   -->
+		<compilerarg value="/Za"/>
+	</compiler>
+	<compiler id="ecl-with-extensions" extends="base-msvc" name="ecl" if="use-ecl">
+		<!--  enable Microsoft Extensions   -->
+		<compilerarg value="/Ze"/>
+	</compiler>
+
+	<compiler id="bcc" name="bcc" if="use-bcc">
+		<!--  target Pentium Pro   -->
+		<compilerarg value="-6"/>
+		<!--  zero length empty class member functions -->
+		<compilerarg value="-Vx"/>
+		<compilerarg value="-Ve"/>
+		<!--   align on quad word boundaries   -->
+		<compilerarg value="-a8"/>
+		<!--   byte size enums   -->
+		<compilerarg value="-b-"/>
+		<compilerarg value="-k"/>
+		<compilerarg value="-y" if="is-debug"/>
+		<compilerarg value="-vi"/>
+		<compilerarg value="-r-" if="is-debug"/>
+		<!--  maximize speed     -->
+		<compilerarg value="-O2" unless="is-debug"/>
+	</compiler>
+
+	<compiler id="gcc" name="gcc" if="use-gcc">
+        <compilerarg value="-O" unless="is-debug"/>
+	</compiler>
+
+
+
+
+  <target name="XercesLib" depends="init">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="shared"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/xerces-c"
+	    multithreaded="true" exceptions="true" subsystem="${subsystem}" dependencyDepth="-1">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<compiler refid="icl"/>
+		<compiler refid="ecl"/>
+		<!-- speciality compiler for a few files that require MS extensions   -->
+		<compiler extends="msvc-with-extensions">
+			<fileset dir="${src.dir}">
+				<include name="util/Platforms/Win32/*.cpp"/>
+				<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader"/>
+				<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock"/>
+				<include name="util/Platforms/Win32/*.cpp"/>
+				<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder"/>
+			</fileset>
+		</compiler>
+		<compiler extends="icl-with-extensions">
+			<fileset dir="${src.dir}">
+				<include name="util/Platforms/Win32/*.cpp"/>
+				<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader"/>
+				<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock"/>
+				<include name="util/Platforms/Win32/*.cpp"/>
+				<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder"/>
+			</fileset>
+		</compiler>
+		<compiler extends="ecl-with-extensions">
+			<fileset dir="${src.dir}">
+				<include name="util/Platforms/Win32/*.cpp"/>
+				<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader"/>
+				<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock"/>
+				<include name="util/Platforms/Win32/*.cpp"/>
+				<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder"/>
+			</fileset>
+		</compiler>
+		<compiler name="msrc" if="use-msvc">
+			<compilerarg value="/l 0x409"/>
+			<fileset dir="${src.dir}" includes="util/Platforms/Win32/Version.rc"/>
+		</compiler>
+		<compiler name="brc" if="use-bcc" inherit="false">
+			<!--  version.rc includes afxres.h, I don't know why   -->
+			<includepath location="c:\msdev6\vc98\include"/>
+			<includepath location="c:\msdev6\vc98\mfc\include"/>
+			<fileset dir="${src.dir}" includes="util/Platforms/Win32/Version.rc"/>
+		</compiler>
+        <compiler if="linux" extends="gcc">
+           <defineset>
+              <define name="_GNU_SOURCE"/>
+              <define name="__USE_GNU"/>
+           </defineset>
+           <fileset dir="${src.dir}" includes="util/Platforms/Linux/*.cpp"/>
+        </compiler>
+		<linker name="gcc" if="use-gcc">
+			<syslibset libs="kernel32,user32,advapi32,ws2_32" if="windows"/>
+            <syslibset libs="pthread" if="pthreads"/>
+		</linker>
+		<!--  base is 0x12000000     -->
+    	<linker name="msvc" base="301989888" if="use-msvc">
+			<syslibset libs="kernel32,user32,advapi32,ws2_32"/>
+		</linker>
+    	<linker name="icl" base="301989888" if="use-icl">
+			<syslibset libs="kernel32,user32,advapi32,ws2_32"/>
+		</linker>
+		<linker name="bcc" if="use-bcc">
+			<syslibset libs="import32,cw32,ws2_32"/>
+		</linker>
+		<fileset dir="${src.dir}">
+			<include name="dom/*.cpp"/>
+			<include name="framework/*.cpp"/>
+			<include name="idom/*.cpp"/>
+			<include name="internal/*.cpp"/>
+			<include name="parsers/*.cpp"/>
+			<include name="sax/*.cpp"/>
+			<include name="sax2/*.cpp"/>
+			<include name="util/*.cpp"/>
+			<include name="validators/*.cpp"/>
+			<include name="validators/common/*.cpp"/>
+			<include name="validators/datatype/*.cpp"/>
+			<include name="validators/DTD/*.cpp"/>
+			<include name="validators/schema/*.cpp"/>
+			<include name="validators/schema/identity/*.cpp"/>
+			<include name="util/regx/*.cpp"/>
+			<!--   if using MS Visual C,
+						these must be compiled with MS Extension enabled
+				   otherwise they can compile with everything else  -->
+			<include name="util/Platforms/Win32/*.cpp" if="windows" unless="use-msvc"/>
+			<include name="util/MsgLoaders/Win32/*.cpp" if="win32_msgloader" unless="use-msvc"/>
+            <include name="util/MsgLoaders/InMemory/*.cpp" if="inmem_messageloader"/>
+			<include name="util/NetAccessors/WinSock/*.cpp" if="netaccessor_winsock" unless="use-msvc"/>
+            <include name="util/NetAccessors/Socket/*.cpp" if="netaccessor_socket"/>
+			<include name="util/Transcoders/Win32/*.cpp" if="win32_transcoder" unless="use-msvc"/>
+            <include name="util/Transcoders/Iconv/*.cpp" if="iconv_transcoder"/>
+            <include name="util/Transcoders/ICU/*.cpp" if="icu_transcoder"/>
+            <include name="util/Compilers/GCCDefs.cpp" if="use-gcc"/>
+		</fileset>
+		<!--   parent of the source directory   -->
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="PROJ_SAX2"/>
+			<define name="PROJ_XMLPARSER"/>
+			<define name="PROJ_XMLUTIL"/>
+			<define name="PROJ_PARSERS"/>
+			<define name="PROJ_SAX4C"/>
+			<define name="PROJ_DOM"/>
+			<define name="PROJ_VALIDATORS"/>
+			<define name="XML_SINGLEDLL"/>
+			<define name="WIN32" if="windows"/>
+			<define name="_WINDOWS" if="windows"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+			<define name="XML_USE_WIN32_TRANSCODER" if="win32_transcoder"/>
+			<define name="XML_USE_WIN32_MSGLOADER" if="win32_msgloader"/>
+			<define name="XML_USE_NETACCESSOR_WINSOCK" if="netaccessor_winsock"/>
+            <define name="LINUX" if="linux"/>
+            <define name="_REENTRANT" if="linux"/>
+            <define name="XML_USE_NATIVE_TRANSCODER" if="native_transcoder"/>
+            <define name="XML_USE_ICU_TRANSCODER" if="icu_transcoder"/>
+            <define name="XML_USE_INMEM_MESSAGELOADER" if="inmem_messageloader"/>
+            <define name="XML_USE_PTHREADS" if="pthreads"/>
+            <define name="XML_USE_NETACCESSOR_SOCKET" if="netaccessor_socket"/>
+		</defineset>
+	</cc>
+
+  </target>
+
+  <target name="CreateDOMDocument" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/CreateDOMDocument"
+	    multithreaded="true" exceptions="true">
+		<compiler extends="gcc">
+                   <compilerarg value="-fpic"/>
+                   <compilerarg value="-w"/>
+                   <compilerarg value="-O"/>
+                </compiler>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="CreateDOMDocument/CreateDOMDocument.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="DOMCount" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMCount"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="DOMCount/DOMCount.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="DOMIDTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMIDTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="DOM/DOMIDTest/DOMIDTest.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+
+  <target name="DOMMemTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMMemTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="DOM/DOMMemTest/DOMMemTest.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+
+  </target>
+
+
+  <target name="DOMPrint" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMPrint"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="DOMPrint/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+
+  </target>
+
+
+  <target name="DOMTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="DOM/DOMTest/*.cpp"/>
+		<fileset dir="${build.dir}" includes="xerces-c.lib"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+
+  </target>
+
+
+
+  <target name="DOMTraversalTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/DOMTraversalTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="DOM/Traversal/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+
+  </target>
+
+
+  <target name="EncodingTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/EncodingTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="EncodingTest/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+
+  </target>
+
+
+  <target name="EnumVal" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/EnumVal"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="EnumVal/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+            <define name="LINUX" if="linux"/>
+            <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+
+  </target>
+
+
+  <target name="IDOMCount" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMCount"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="IDOMCount/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+
+  </target>
+
+
+  <target name="IDOMMemTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMMemTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="IDom/IDOMMemTest/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="IDOMPrint" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMPrint"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="IDOMPrint/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="IDOMTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/IDOMTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="IDom/IDOMTest/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="InitTermTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/InitTermTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="InitTermTest/*.cpp"/>
+		<fileset dir="${build.dir}" includes="xerces-c.lib"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="IRangeTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/IRangeTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="IDom/IRangeTest/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="ITraversal" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/ITraversal"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="IDom/ITraversal/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="MemParse" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/MemParse"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="MemParse/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="PParse" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/PParse"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="PParse/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="RangeTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/RangeTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="DOM/RangeTest/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="Redirect" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/Redirect"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	        <linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="Redirect/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="SAX2Count" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/SAX2Count"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+    	<linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="SAX2Count/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="SAXCount" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/SAXCount"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+        	<linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="SAXCount/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="SAXPrint" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/SAXPrint"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+        	<linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="SAXPrint/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="SEnumVal" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/SEnumVal"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+        	<linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="SEnumVal/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="StdInParse" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/StdInParse"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+        	<linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${samples.dir}" includes="StdInParse/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+
+  <target name="ThreadTest" depends="XercesLib">
+    <mkdir dir="${build.obj.dir}"/>
+    <mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="executable"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/ThreadTest"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="gcc"/>
+		<compiler refid="msvc-with-extensions"/>
+		<compiler refid="bcc"/>
+		<linker name="gcc" if="use-gcc"/>
+        	<linker name="msvc" if="use-msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${tests.dir}" includes="ThreadTest/*.cpp"/>
+		<includepath location="${include.dir}"/>
+		<defineset>
+			<define name="CONSOLE"/>
+			<define name="PLATFORM_WIN32" if="windows"/>
+                        <define name="LINUX" if="linux"/>
+                        <define name="_REENTRANT" if="linux"/>
+		</defineset>
+        <libset dir="${build.dir}" libs="xerces-c"/>
+        <syslibset libs="c,stdc++" if="linux"/>
+	</cc>
+  </target>
+
+  <target name="XercesCOM_tlb" depends="init" if="windows">
+    <mkdir dir="${xml4com.dir}"/>
+	<cc debug="${debug}" objdir="${xml4com.dir}" name="midl">
+		<!--  output generated header file to use in next step  -->
+		<compilerarg value="/h"/>
+		<compilerarg value="xml4com.h"/>
+		<compilerarg value="/iid"/>
+		<compilerarg value="xml4com_i.c"/>
+		<fileset dir="${src.dir}" includes="com/xml4com.idl"/>
+		<includepath location="${src.dir}/com"/>
+	</cc>
+  </target>
+
+  <target name="XercesCOM" depends="XercesCOM_tlb,XercesLib" if="windows">
+    <mkdir dir="${build.obj.dir}"/>
+	<mkdir dir="${build.dir}"/>
+	<cc debug="${debug}" link="shared"
+	    objdir="${build.obj.dir}" outfile="${build.dir}/xml4com"
+	    multithreaded="true" exceptions="true">
+		<compiler refid="msvc-with-extensions"/>
+		<compiler refid="bcc"/>
+		<compiler name="msrc" if="use-msvc">
+			<compilerarg value="/l 0x409"/>
+			<fileset dir="${src.dir}" includes="com/*.rc"/>
+		</compiler>
+        <precompile prototype="${src.dir}/com/StdAfx.cpp">
+            <except>
+                <fileset dir="${src.dir}" includes="com/XMLDOM*.cpp"/>
+            </except>
+        </precompile>
+    	<linker name="msvc"/>
+		<linker name="bcc" if="use-bcc"/>
+		<fileset dir="${src.dir}" includes="com/*.cpp"/>
+		<fileset dir="${build.dir}" includes="xerces-c.lib"/>
+		<includepath location="${xml4com.dir}"/>
+		<includepath location="${include.dir}"/>
+		<includepath location="."/>
+		<defineset>
+			<define name="PLATFORM_WIN32" if="windows"/>
+		</defineset>
+		<syslibset libs="wininet,shlwapi"/>
+	</cc>
+  </target>
+
+
+  <target name="Samples" depends="CreateDOMDocument,DOMCount,
+  								  DOMPrint,
+  								  EnumVal,
+  								  IDOMCount,
+  								  IDOMPrint,
+  								  MemParse,
+  								  PParse,
+  								  Redirect,SAX2Count,
+  								  SAXCount,SAXPrint,
+  								  SEnumVal,StdInParse"/>
+
+  <target name="Tests" depends="DOMIDTest,DOMMemTest,
+  								  DOMTest,DOMTraversalTest,
+  								  EncodingTest,IDOMMemTest,
+  								  IDOMTest,ITraversal,
+  								  InitTermTest,IRangeTest,
+								  RangeTest,ThreadTest"/>
+
+  <target name="XercesAll" depends="Samples,Tests,XercesCOM"/>
+
+  <target name="main"
+          depends="XercesAll" />
+
+</project>
diff --git a/src/CVS/Entries b/src/CVS/Entries
index 7426227..2d837a6 100644
--- a/src/CVS/Entries
+++ b/src/CVS/Entries
@@ -1,4 +1,4 @@
-/cpptasks.mf/1.1/Fri May 10 04:47:34 2002//

-/cpptasks.tasks/1.1/Wed Apr 10 03:31:53 2002//

-/cpptasks.types/1.2/Fri Apr 23 20:15:49 2004//

-D/net////

+/cpptasks.mf/1.1/Fri May 10 04:47:34 2002//
+/cpptasks.tasks/1.1/Wed Apr 10 03:31:53 2002//
+/cpptasks.types/1.2/Fri Apr 23 20:15:49 2004//
+D/net////
diff --git a/src/CVS/Entries.Log b/src/CVS/Entries.Log
index 0747779..2485930 100644
--- a/src/CVS/Entries.Log
+++ b/src/CVS/Entries.Log
@@ -1,2 +1,2 @@
-A D/etc////

-R D/etc////

+A D/etc////
+R D/etc////
diff --git a/src/CVS/Repository b/src/CVS/Repository
index 3c9617e..e3ac9b2 100644
--- a/src/CVS/Repository
+++ b/src/CVS/Repository
@@ -1 +1 @@
-cpptasks/src

+cpptasks/src
diff --git a/src/CVS/Root b/src/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/CVS/Root
+++ b/src/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/cpptasks.mf b/src/cpptasks.mf
index a2bf638..8f3b6d0 100644
--- a/src/cpptasks.mf
+++ b/src/cpptasks.mf
@@ -1,7 +1,7 @@
-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

+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/cpptasks.types b/src/cpptasks.types
index 5959d6f..a14401b 100644
--- a/src/cpptasks.types
+++ b/src/cpptasks.types
@@ -1,6 +1,6 @@
-defineset=net.sf.antcontrib.cpptasks.types.DefineSet

-compiler=net.sf.antcontrib.cpptasks.CompilerDef

-linker=net.sf.antcontrib.cpptasks.LinkerDef

-targetplatform=net.sf.antcontrib.cpptasks.TargetDef

-versioninfo=net.sf.antcontrib.cpptasks.VersionInfo

-distributer=net.sf.antcontrib.cpptasks.DistributerDef

+defineset=net.sf.antcontrib.cpptasks.types.DefineSet
+compiler=net.sf.antcontrib.cpptasks.CompilerDef
+linker=net.sf.antcontrib.cpptasks.LinkerDef
+targetplatform=net.sf.antcontrib.cpptasks.TargetDef
+versioninfo=net.sf.antcontrib.cpptasks.VersionInfo
+distributer=net.sf.antcontrib.cpptasks.DistributerDef
diff --git a/src/net/CVS/Entries b/src/net/CVS/Entries
index 04c4303..5f3f0ed 100644
--- a/src/net/CVS/Entries
+++ b/src/net/CVS/Entries
@@ -1 +1 @@
-D/sf////

+D/sf////
diff --git a/src/net/CVS/Repository b/src/net/CVS/Repository
index e9caa58..a0f5c99 100644
--- a/src/net/CVS/Repository
+++ b/src/net/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net

+cpptasks/src/net
diff --git a/src/net/CVS/Root b/src/net/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/CVS/Root
+++ b/src/net/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/CVS/Entries b/src/net/sf/CVS/Entries
index f19339c..b1561c7 100644
--- a/src/net/sf/CVS/Entries
+++ b/src/net/sf/CVS/Entries
@@ -1 +1 @@
-D/antcontrib////

+D/antcontrib////
diff --git a/src/net/sf/CVS/Repository b/src/net/sf/CVS/Repository
index 3cf3722..06bb864 100644
--- a/src/net/sf/CVS/Repository
+++ b/src/net/sf/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf

+cpptasks/src/net/sf
diff --git a/src/net/sf/CVS/Root b/src/net/sf/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/CVS/Root
+++ b/src/net/sf/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/CVS/Entries b/src/net/sf/antcontrib/CVS/Entries
index 18d9c65..a4257d2 100644
--- a/src/net/sf/antcontrib/CVS/Entries
+++ b/src/net/sf/antcontrib/CVS/Entries
@@ -1 +1 @@
-D/cpptasks////

+D/cpptasks////
diff --git a/src/net/sf/antcontrib/CVS/Repository b/src/net/sf/antcontrib/CVS/Repository
index b7c2595..5dfe938 100644
--- a/src/net/sf/antcontrib/CVS/Repository
+++ b/src/net/sf/antcontrib/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib

+cpptasks/src/net/sf/antcontrib
diff --git a/src/net/sf/antcontrib/CVS/Root b/src/net/sf/antcontrib/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/CVS/Root
+++ b/src/net/sf/antcontrib/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/CVS/Entries b/src/net/sf/antcontrib/cpptasks/CVS/Entries
index b739b7f..f80878b 100644
--- a/src/net/sf/antcontrib/cpptasks/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/CVS/Entries
@@ -1,60 +1,60 @@
-/AboutCCTask.java/1.7/Sat Feb 28 19:04:02 2004//

-/ArchEnum.java/1.2/Fri Apr 23 21:07:56 2004//

-/CCTask.java/1.61/Fri Jan 21 20:18:58 2005//

-/CCTaskProgressMonitor.java/1.8/Tue May 11 03:50:10 2004//

-/CPUEnum.java/1.2/Wed Apr 28 17:23:27 2004//

-/CUtil.java/1.26/Wed May  5 02:50:46 2004//

-/CompilerDef.java/1.33/Thu Jan 20 05:44:22 2005//

-/CompilerEnum.java/1.18/Thu Jul  8 21:30:53 2004//

-/CompilerParam.java/1.2/Sat Feb 28 19:04:02 2004//

-/DependencyInfo.java/1.8/Sat Feb 28 19:04:02 2004//

-/DependencyTable.java/1.20/Fri Jul  9 02:22:37 2004//

-/DistributerDef.java/1.2/Wed Apr 28 17:23:27 2004//

-/DistributerMap.java/1.1/Fri Apr 23 20:15:45 2004//

-/DistributerProtocolEnum.java/1.1/Fri Apr 23 20:15:44 2004//

-/FileVisitor.java/1.6/Sat Feb 28 19:04:02 2004//

-/LinkerDef.java/1.35/Thu Jul  8 21:30:53 2004//

-/LinkerEnum.java/1.16/Thu Jul  8 21:30:53 2004//

-/LinkerParam.java/1.2/Sat Feb 28 19:04:02 2004//

-/OSFamilyEnum.java/1.1/Fri Apr 23 20:15:44 2004//

-/ObjectFileCollector.java/1.4/Sat Feb 28 19:04:02 2004/-ko/

-/OptimizationEnum.java/1.4/Sun May 29 03:51:52 2005//

-/OutputTypeEnum.java/1.6/Sat Feb 28 19:04:02 2004//

-/PrecompileDef.java/1.11/Fri Apr 23 20:15:44 2004//

-/PrecompileExceptDef.java/1.8/Sat Feb 28 19:04:02 2004//

-/ProcessorDef.java/1.26/Tue May 11 03:50:10 2004//

-/ProcessorEnumValue.java/1.5/Sat Feb 28 19:04:02 2004//

-/ProcessorParam.java/1.2/Sat Feb 28 19:04:02 2004//

-/RuntimeType.java/1.4/Sat Feb 28 19:04:02 2004/-ko/

-/SourceHistory.java/1.6/Sat Feb 28 19:04:02 2004//

-/SubsystemEnum.java/1.7/Sat Feb 28 19:04:02 2004//

-/TargetDef.java/1.2/Wed Apr 28 17:23:27 2004//

-/TargetHistory.java/1.8/Sat Feb 28 19:04:02 2004//

-/TargetHistoryTable.java/1.17/Tue May 11 03:50:10 2004//

-/TargetInfo.java/1.9/Sat Feb 28 19:04:02 2004//

-/TargetMatcher.java/1.12/Tue May 11 03:50:10 2004//

-/VersionInfo.java/1.3/Tue May 11 03:50:10 2004//

-/WarningLevelEnum.java/1.2/Tue May 11 03:50:10 2004//

-/antlib.xml/1.1/Sat May  1 01:40:39 2004//

-/package.html/1.1/Fri Apr 23 20:15:44 2004//

-D/apple////

-D/arm////

-D/borland////

-D/compaq////

-D/compiler////

-D/devstudio////

-D/gcc////

-D/hp////

-D/ibm////

-D/ide////

-D/intel////

-D/mozilla////

-D/openwatcom////

-D/os390////

-D/os400////

-D/parser////

-D/platforms////

-D/sun////

-D/ti////

-D/trolltech////

-D/types////

+/AboutCCTask.java/1.7/Sat Feb 28 19:04:02 2004//
+/ArchEnum.java/1.2/Fri Apr 23 21:07:56 2004//
+/CCTask.java/1.61/Fri Jan 21 20:18:58 2005//
+/CCTaskProgressMonitor.java/1.8/Tue May 11 03:50:10 2004//
+/CPUEnum.java/1.2/Wed Apr 28 17:23:27 2004//
+/CUtil.java/1.26/Wed May  5 02:50:46 2004//
+/CompilerDef.java/1.33/Thu Jan 20 05:44:22 2005//
+/CompilerEnum.java/1.18/Thu Jul  8 21:30:53 2004//
+/CompilerParam.java/1.2/Sat Feb 28 19:04:02 2004//
+/DependencyInfo.java/1.8/Sat Feb 28 19:04:02 2004//
+/DependencyTable.java/1.20/Fri Jul  9 02:22:37 2004//
+/DistributerDef.java/1.2/Wed Apr 28 17:23:27 2004//
+/DistributerMap.java/1.1/Fri Apr 23 20:15:45 2004//
+/DistributerProtocolEnum.java/1.1/Fri Apr 23 20:15:44 2004//
+/FileVisitor.java/1.6/Sat Feb 28 19:04:02 2004//
+/LinkerDef.java/1.35/Thu Jul  8 21:30:53 2004//
+/LinkerEnum.java/1.16/Thu Jul  8 21:30:53 2004//
+/LinkerParam.java/1.2/Sat Feb 28 19:04:02 2004//
+/OSFamilyEnum.java/1.1/Fri Apr 23 20:15:44 2004//
+/ObjectFileCollector.java/1.4/Sat Feb 28 19:04:02 2004/-ko/
+/OptimizationEnum.java/1.4/Sun May 29 03:51:52 2005//
+/OutputTypeEnum.java/1.6/Sat Feb 28 19:04:02 2004//
+/PrecompileDef.java/1.11/Fri Apr 23 20:15:44 2004//
+/PrecompileExceptDef.java/1.8/Sat Feb 28 19:04:02 2004//
+/ProcessorDef.java/1.26/Tue May 11 03:50:10 2004//
+/ProcessorEnumValue.java/1.5/Sat Feb 28 19:04:02 2004//
+/ProcessorParam.java/1.2/Sat Feb 28 19:04:02 2004//
+/RuntimeType.java/1.4/Sat Feb 28 19:04:02 2004/-ko/
+/SourceHistory.java/1.6/Sat Feb 28 19:04:02 2004//
+/SubsystemEnum.java/1.7/Sat Feb 28 19:04:02 2004//
+/TargetDef.java/1.2/Wed Apr 28 17:23:27 2004//
+/TargetHistory.java/1.8/Sat Feb 28 19:04:02 2004//
+/TargetHistoryTable.java/1.17/Tue May 11 03:50:10 2004//
+/TargetInfo.java/1.9/Sat Feb 28 19:04:02 2004//
+/TargetMatcher.java/1.12/Tue May 11 03:50:10 2004//
+/VersionInfo.java/1.3/Tue May 11 03:50:10 2004//
+/WarningLevelEnum.java/1.2/Tue May 11 03:50:10 2004//
+/antlib.xml/1.1/Sat May  1 01:40:39 2004//
+/package.html/1.1/Fri Apr 23 20:15:44 2004//
+D/apple////
+D/arm////
+D/borland////
+D/compaq////
+D/compiler////
+D/devstudio////
+D/gcc////
+D/hp////
+D/ibm////
+D/ide////
+D/intel////
+D/mozilla////
+D/openwatcom////
+D/os390////
+D/os400////
+D/parser////
+D/platforms////
+D/sun////
+D/ti////
+D/trolltech////
+D/types////
diff --git a/src/net/sf/antcontrib/cpptasks/CVS/Entries.Log b/src/net/sf/antcontrib/cpptasks/CVS/Entries.Log
index a8df982..b81a6c0 100644
--- a/src/net/sf/antcontrib/cpptasks/CVS/Entries.Log
+++ b/src/net/sf/antcontrib/cpptasks/CVS/Entries.Log
@@ -1,4 +1,4 @@
-A D/libtool////

-A D/os////

-R D/os////

-R D/libtool////

+A D/libtool////
+A D/os////
+R D/os////
+R D/libtool////
diff --git a/src/net/sf/antcontrib/cpptasks/CVS/Repository b/src/net/sf/antcontrib/cpptasks/CVS/Repository
index e7635c7..ca15c9b 100644
--- a/src/net/sf/antcontrib/cpptasks/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks

+cpptasks/src/net/sf/antcontrib/cpptasks
diff --git a/src/net/sf/antcontrib/cpptasks/CVS/Root b/src/net/sf/antcontrib/cpptasks/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/apple/CVS/Entries b/src/net/sf/antcontrib/cpptasks/apple/CVS/Entries
index 5690dd9..5d5c29b 100644
--- a/src/net/sf/antcontrib/cpptasks/apple/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/apple/CVS/Entries
@@ -1,3 +1,3 @@
-/XcodeProjectWriter.java/1.5/Fri Jan 28 15:50:24 2005//

-/package.html/1.1/Tue Jul 13 03:31:03 2004//

-D

+/XcodeProjectWriter.java/1.5/Fri Jan 28 15:50:24 2005//
+/package.html/1.1/Tue Jul 13 03:31:03 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/apple/CVS/Repository b/src/net/sf/antcontrib/cpptasks/apple/CVS/Repository
index aeac1e7..c34fb71 100644
--- a/src/net/sf/antcontrib/cpptasks/apple/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/apple/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/apple

+cpptasks/src/net/sf/antcontrib/cpptasks/apple
diff --git a/src/net/sf/antcontrib/cpptasks/apple/CVS/Root b/src/net/sf/antcontrib/cpptasks/apple/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/apple/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/apple/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/arm/CVS/Entries b/src/net/sf/antcontrib/cpptasks/arm/CVS/Entries
index afd7834..8eaa298 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/arm/CVS/Entries
@@ -1,4 +1,4 @@
-/ADSCCompiler.java/1.3/Fri Apr 23 20:15:46 2004//

-/ADSLibrarian.java/1.4/Thu Apr 22 08:06:54 2004//

-/ADSLinker.java/1.4/Thu Apr 22 08:06:54 2004//

-D

+/ADSCCompiler.java/1.3/Fri Apr 23 20:15:46 2004//
+/ADSLibrarian.java/1.4/Thu Apr 22 08:06:54 2004//
+/ADSLinker.java/1.4/Thu Apr 22 08:06:54 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/arm/CVS/Repository b/src/net/sf/antcontrib/cpptasks/arm/CVS/Repository
index 43a1f4e..5d4a01e 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/arm/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/arm

+cpptasks/src/net/sf/antcontrib/cpptasks/arm
diff --git a/src/net/sf/antcontrib/cpptasks/arm/CVS/Root b/src/net/sf/antcontrib/cpptasks/arm/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/arm/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/arm/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/borland/CVS/Entries b/src/net/sf/antcontrib/cpptasks/borland/CVS/Entries
index f185634..0cdec62 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/borland/CVS/Entries
@@ -1,12 +1,12 @@
-/BorlandCCompiler.java/1.17/Fri Apr 23 20:15:46 2004//

-/BorlandCfgParser.java/1.7/Sat Feb 28 19:00:01 2004//

-/BorlandLibrarian.java/1.19/Sun Feb 13 04:58:21 2005//

-/BorlandLinker.java/1.23/Tue Mar  1 22:33:39 2005//

-/BorlandProcessor.java/1.19/Sun Feb 13 04:58:21 2005//

-/BorlandResourceCompiler.java/1.22/Tue May 11 03:50:12 2004//

-/CBuilderXProjectWriter.java/1.8/Mon Aug 15 14:51:54 2005//

-/CfgFilenameState.java/1.6/Sat Feb 28 19:00:01 2004//

-/ConsumeToSpaceOrNewLine.java/1.6/Sat Feb 28 19:00:01 2004//

-/QuoteBranchState.java/1.6/Sat Feb 28 19:00:01 2004//

-/package.html/1.1/Sat Jun 26 02:45:17 2004//

-D

+/BorlandCCompiler.java/1.17/Fri Apr 23 20:15:46 2004//
+/BorlandCfgParser.java/1.7/Sat Feb 28 19:00:01 2004//
+/BorlandLibrarian.java/1.19/Sun Feb 13 04:58:21 2005//
+/BorlandLinker.java/1.23/Tue Mar  1 22:33:39 2005//
+/BorlandProcessor.java/1.19/Sun Feb 13 04:58:21 2005//
+/BorlandResourceCompiler.java/1.22/Tue May 11 03:50:12 2004//
+/CBuilderXProjectWriter.java/1.8/Mon Aug 15 14:51:54 2005//
+/CfgFilenameState.java/1.6/Sat Feb 28 19:00:01 2004//
+/ConsumeToSpaceOrNewLine.java/1.6/Sat Feb 28 19:00:01 2004//
+/QuoteBranchState.java/1.6/Sat Feb 28 19:00:01 2004//
+/package.html/1.1/Sat Jun 26 02:45:17 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/borland/CVS/Repository b/src/net/sf/antcontrib/cpptasks/borland/CVS/Repository
index c06cbfe..fa6ccfe 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/borland/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/borland

+cpptasks/src/net/sf/antcontrib/cpptasks/borland
diff --git a/src/net/sf/antcontrib/cpptasks/borland/CVS/Root b/src/net/sf/antcontrib/cpptasks/borland/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/borland/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/borland/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CVS/Entries b/src/net/sf/antcontrib/cpptasks/compaq/CVS/Entries
index e1816aa..f5f44bf 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/compaq/CVS/Entries
@@ -1,4 +1,4 @@
-/CompaqVisualFortranCompiler.java/1.14/Fri Apr 23 20:15:49 2004//

-/CompaqVisualFortranLibrarian.java/1.12/Thu Apr 22 08:06:54 2004//

-/CompaqVisualFortranLinker.java/1.11/Sat Feb 28 19:00:15 2004//

-D

+/CompaqVisualFortranCompiler.java/1.14/Fri Apr 23 20:15:49 2004//
+/CompaqVisualFortranLibrarian.java/1.12/Thu Apr 22 08:06:54 2004//
+/CompaqVisualFortranLinker.java/1.11/Sat Feb 28 19:00:15 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CVS/Repository b/src/net/sf/antcontrib/cpptasks/compaq/CVS/Repository
index 002b6a4..1c759f3 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/compaq/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/compaq

+cpptasks/src/net/sf/antcontrib/cpptasks/compaq
diff --git a/src/net/sf/antcontrib/cpptasks/compaq/CVS/Root b/src/net/sf/antcontrib/cpptasks/compaq/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/compaq/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/compaq/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CVS/Entries b/src/net/sf/antcontrib/cpptasks/compiler/CVS/Entries
index 7c8c246..573314b 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/compiler/CVS/Entries
@@ -1,22 +1,22 @@
-/AbstractCompiler.java/1.26/Tue May 11 03:50:13 2004//

-/AbstractLinker.java/1.28/Tue May 11 03:50:13 2004//

-/AbstractProcessor.java/1.18/Sat Feb 28 19:00:40 2004//

-/CaptureStreamHandler.java/1.12/Sat Feb 28 19:00:40 2004//

-/CommandLineCCompiler.java/1.17/Sat Feb 28 19:00:40 2004//

-/CommandLineCompiler.java/1.27/Tue May 11 03:50:13 2004//

-/CommandLineCompilerConfiguration.java/1.20/Tue Aug 24 22:46:08 2004//

-/CommandLineFortranCompiler.java/1.11/Sat Feb 28 19:00:40 2004//

-/CommandLineLinker.java/1.40/Tue May 11 03:50:13 2004//

-/CommandLineLinkerConfiguration.java/1.20/Tue May 11 03:50:13 2004//

-/Compiler.java/1.9/Sat Feb 28 19:00:40 2004//

-/CompilerConfiguration.java/1.12/Sat Feb 28 19:00:40 2004//

-/LinkType.java/1.16/Tue Jul 13 03:08:37 2004//

-/Linker.java/1.19/Tue May 11 03:50:13 2004//

-/LinkerConfiguration.java/1.11/Tue May 11 03:50:13 2004//

-/PrecompilingCommandLineCCompiler.java/1.9/Sat Feb 28 19:00:40 2004//

-/PrecompilingCommandLineCompiler.java/1.9/Sat Feb 28 19:00:40 2004//

-/PrecompilingCompiler.java/1.6/Sat Feb 28 19:00:40 2004//

-/Processor.java/1.18/Tue May 11 03:50:13 2004//

-/ProcessorConfiguration.java/1.12/Tue May 11 03:50:13 2004//

-/ProgressMonitor.java/1.4/Sat Feb 28 19:00:40 2004//

-D

+/AbstractCompiler.java/1.26/Tue May 11 03:50:13 2004//
+/AbstractLinker.java/1.28/Tue May 11 03:50:13 2004//
+/AbstractProcessor.java/1.18/Sat Feb 28 19:00:40 2004//
+/CaptureStreamHandler.java/1.12/Sat Feb 28 19:00:40 2004//
+/CommandLineCCompiler.java/1.17/Sat Feb 28 19:00:40 2004//
+/CommandLineCompiler.java/1.27/Tue May 11 03:50:13 2004//
+/CommandLineCompilerConfiguration.java/1.20/Tue Aug 24 22:46:08 2004//
+/CommandLineFortranCompiler.java/1.11/Sat Feb 28 19:00:40 2004//
+/CommandLineLinker.java/1.40/Tue May 11 03:50:13 2004//
+/CommandLineLinkerConfiguration.java/1.20/Tue May 11 03:50:13 2004//
+/Compiler.java/1.9/Sat Feb 28 19:00:40 2004//
+/CompilerConfiguration.java/1.12/Sat Feb 28 19:00:40 2004//
+/LinkType.java/1.16/Tue Jul 13 03:08:37 2004//
+/Linker.java/1.19/Tue May 11 03:50:13 2004//
+/LinkerConfiguration.java/1.11/Tue May 11 03:50:13 2004//
+/PrecompilingCommandLineCCompiler.java/1.9/Sat Feb 28 19:00:40 2004//
+/PrecompilingCommandLineCompiler.java/1.9/Sat Feb 28 19:00:40 2004//
+/PrecompilingCompiler.java/1.6/Sat Feb 28 19:00:40 2004//
+/Processor.java/1.18/Tue May 11 03:50:13 2004//
+/ProcessorConfiguration.java/1.12/Tue May 11 03:50:13 2004//
+/ProgressMonitor.java/1.4/Sat Feb 28 19:00:40 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CVS/Repository b/src/net/sf/antcontrib/cpptasks/compiler/CVS/Repository
index bc30bc5..71c3c09 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/compiler/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/compiler

+cpptasks/src/net/sf/antcontrib/cpptasks/compiler
diff --git a/src/net/sf/antcontrib/cpptasks/compiler/CVS/Root b/src/net/sf/antcontrib/cpptasks/compiler/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/compiler/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/compiler/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries b/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries
index 35f1652..9c3f878 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries
@@ -1,13 +1,13 @@
-/DevStudioCCompiler.java/1.21/Sat Feb 28 19:01:00 2004//

-/DevStudioCompatibleCCompiler.java/1.10/Fri Apr 23 20:15:45 2004//

-/DevStudioCompatibleLibrarian.java/1.10/Thu Apr 22 08:06:53 2004//

-/DevStudioCompatibleLinker.java/1.12/Tue May 11 03:50:11 2004//

-/DevStudioLibrarian.java/1.19/Sat Feb 28 19:01:00 2004//

-/DevStudioLinker.java/1.27/Thu Apr 22 13:54:52 2004//

-/DevStudioMIDLCompiler.java/1.20/Tue May 11 03:50:11 2004//

-/DevStudioProcessor.java/1.14/Sat Feb 28 19:01:00 2004//

-/DevStudioProjectWriter.java/1.6/Fri Jan 21 20:18:57 2005//

-/DevStudioResourceCompiler.java/1.19/Tue May 11 03:50:11 2004//

-/VisualStudioNETProjectWriter.java/1.5/Fri Jan 21 20:18:57 2005//

-/package.html/1.1/Sat Jun 26 02:45:17 2004//

-D

+/DevStudioCCompiler.java/1.21/Sat Feb 28 19:01:00 2004//
+/DevStudioCompatibleCCompiler.java/1.10/Fri Apr 23 20:15:45 2004//
+/DevStudioCompatibleLibrarian.java/1.10/Thu Apr 22 08:06:53 2004//
+/DevStudioCompatibleLinker.java/1.12/Tue May 11 03:50:11 2004//
+/DevStudioLibrarian.java/1.19/Sat Feb 28 19:01:00 2004//
+/DevStudioLinker.java/1.27/Thu Apr 22 13:54:52 2004//
+/DevStudioMIDLCompiler.java/1.20/Tue May 11 03:50:11 2004//
+/DevStudioProcessor.java/1.14/Sat Feb 28 19:01:00 2004//
+/DevStudioProjectWriter.java/1.6/Fri Jan 21 20:18:57 2005//
+/DevStudioResourceCompiler.java/1.19/Tue May 11 03:50:11 2004//
+/VisualStudioNETProjectWriter.java/1.5/Fri Jan 21 20:18:57 2005//
+/package.html/1.1/Sat Jun 26 02:45:17 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository b/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository
index e7764bc..fa1792f 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/devstudio

+cpptasks/src/net/sf/antcontrib/cpptasks/devstudio
diff --git a/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Root b/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/devstudio/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/CVS/Entries b/src/net/sf/antcontrib/cpptasks/gcc/CVS/Entries
index e1419fa..0a39c0d 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/gcc/CVS/Entries
@@ -1,10 +1,10 @@
-/AbstractArLibrarian.java/1.16/Tue May 11 03:50:12 2004//

-/AbstractLdLinker.java/1.19/Tue May 11 04:13:57 2004//

-/GccCCompiler.java/1.29/Fri Apr 23 20:15:47 2004//

-/GccCompatibleCCompiler.java/1.14/Fri Apr 23 20:15:47 2004//

-/GccLibrarian.java/1.22/Sat Feb 28 19:01:15 2004//

-/GccLinker.java/1.32/Sat Feb 28 19:01:15 2004//

-/GccProcessor.java/1.15/Fri Apr 23 20:15:47 2004//

-/GppLinker.java/1.2/Sat Feb 28 19:01:15 2004//

-/LdLinker.java/1.7/Sat Feb 28 19:01:15 2004//

-D/cross////

+/AbstractArLibrarian.java/1.16/Tue May 11 03:50:12 2004//
+/AbstractLdLinker.java/1.19/Tue May 11 04:13:57 2004//
+/GccCCompiler.java/1.29/Fri Apr 23 20:15:47 2004//
+/GccCompatibleCCompiler.java/1.14/Fri Apr 23 20:15:47 2004//
+/GccLibrarian.java/1.22/Sat Feb 28 19:01:15 2004//
+/GccLinker.java/1.32/Sat Feb 28 19:01:15 2004//
+/GccProcessor.java/1.15/Fri Apr 23 20:15:47 2004//
+/GppLinker.java/1.2/Sat Feb 28 19:01:15 2004//
+/LdLinker.java/1.7/Sat Feb 28 19:01:15 2004//
+D/cross////
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/CVS/Repository b/src/net/sf/antcontrib/cpptasks/gcc/CVS/Repository
index f84241b..9286bfb 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/gcc/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/gcc

+cpptasks/src/net/sf/antcontrib/cpptasks/gcc
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/CVS/Root b/src/net/sf/antcontrib/cpptasks/gcc/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/gcc/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Entries b/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Entries
index f894f85..937a475 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Entries
@@ -1,7 +1,7 @@
-/GccCCompiler.java/1.3/Fri Apr 23 20:15:48 2004//

-/GccLibrarian.java/1.2/Sat Feb 28 19:01:15 2004//

-/GccLinker.java/1.2/Sat Feb 28 19:01:15 2004//

-/GccProcessor.java/1.3/Wed Apr 21 21:47:36 2004//

-/GppLinker.java/1.2/Sat Feb 28 19:01:15 2004//

-/LdLinker.java/1.2/Sat Feb 28 19:01:15 2004//

-D/sparc_sun_solaris2////

+/GccCCompiler.java/1.3/Fri Apr 23 20:15:48 2004//
+/GccLibrarian.java/1.2/Sat Feb 28 19:01:15 2004//
+/GccLinker.java/1.2/Sat Feb 28 19:01:15 2004//
+/GccProcessor.java/1.3/Wed Apr 21 21:47:36 2004//
+/GppLinker.java/1.2/Sat Feb 28 19:01:15 2004//
+/LdLinker.java/1.2/Sat Feb 28 19:01:15 2004//
+D/sparc_sun_solaris2////
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Repository b/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Repository
index 28216ad..6c822e3 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/gcc/cross

+cpptasks/src/net/sf/antcontrib/cpptasks/gcc/cross
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Root b/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/gcc/cross/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Entries b/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Entries
index 8ff801c..89c6972 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Entries
@@ -1,7 +1,7 @@
-/GccCCompiler.java/1.3/Fri Apr 23 20:15:48 2004//

-/GccLibrarian.java/1.2/Sat Feb 28 19:01:14 2004//

-/GccLinker.java/1.3/Sat Feb 28 19:01:14 2004//

-/GccProcessor.java/1.3/Wed Apr 21 21:48:41 2004//

-/GppLinker.java/1.2/Sat Feb 28 19:01:14 2004//

-/LdLinker.java/1.2/Sat Feb 28 19:01:14 2004//

-D

+/GccCCompiler.java/1.3/Fri Apr 23 20:15:48 2004//
+/GccLibrarian.java/1.2/Sat Feb 28 19:01:14 2004//
+/GccLinker.java/1.3/Sat Feb 28 19:01:14 2004//
+/GccProcessor.java/1.3/Wed Apr 21 21:48:41 2004//
+/GppLinker.java/1.2/Sat Feb 28 19:01:14 2004//
+/LdLinker.java/1.2/Sat Feb 28 19:01:14 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Repository b/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Repository
index e8ecf70..68e95cd 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2

+cpptasks/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Root b/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/hp/CVS/Entries b/src/net/sf/antcontrib/cpptasks/hp/CVS/Entries
index 34e542e..88bb067 100644
--- a/src/net/sf/antcontrib/cpptasks/hp/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/hp/CVS/Entries
@@ -1,3 +1,3 @@
-/aCCCompiler.java/1.9/Sat Apr 24 19:07:19 2004//

-/aCCLinker.java/1.5/Sat Feb 28 19:01:30 2004//

-D

+/aCCCompiler.java/1.9/Sat Apr 24 19:07:19 2004//
+/aCCLinker.java/1.5/Sat Feb 28 19:01:30 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/hp/CVS/Repository b/src/net/sf/antcontrib/cpptasks/hp/CVS/Repository
index 29df68a..5e348f0 100644
--- a/src/net/sf/antcontrib/cpptasks/hp/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/hp/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/hp

+cpptasks/src/net/sf/antcontrib/cpptasks/hp
diff --git a/src/net/sf/antcontrib/cpptasks/hp/CVS/Root b/src/net/sf/antcontrib/cpptasks/hp/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/hp/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/hp/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/ibm/CVS/Entries b/src/net/sf/antcontrib/cpptasks/ibm/CVS/Entries
index fedd0a3..766d34f 100644
--- a/src/net/sf/antcontrib/cpptasks/ibm/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/ibm/CVS/Entries
@@ -1,3 +1,3 @@
-/VisualAgeCCompiler.java/1.12/Sat Apr 24 19:07:19 2004//

-/VisualAgeLinker.java/1.10/Wed Apr 21 05:22:11 2004//

-D

+/VisualAgeCCompiler.java/1.12/Sat Apr 24 19:07:19 2004//
+/VisualAgeLinker.java/1.10/Wed Apr 21 05:22:11 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/ibm/CVS/Repository b/src/net/sf/antcontrib/cpptasks/ibm/CVS/Repository
index 6df66d6..88f2c57 100644
--- a/src/net/sf/antcontrib/cpptasks/ibm/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/ibm/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/ibm

+cpptasks/src/net/sf/antcontrib/cpptasks/ibm
diff --git a/src/net/sf/antcontrib/cpptasks/ibm/CVS/Root b/src/net/sf/antcontrib/cpptasks/ibm/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/ibm/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/ibm/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/ide/CVS/Entries b/src/net/sf/antcontrib/cpptasks/ide/CVS/Entries
index 7e1ddbc..6add529 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/ide/CVS/Entries
@@ -1,6 +1,6 @@
-/DebugDef.java/1.1/Wed Jan  5 22:13:42 2005//

-/ProjectDef.java/1.6/Fri Jan 21 20:18:57 2005//

-/ProjectWriter.java/1.2/Fri Jan 21 20:18:56 2005//

-/ProjectWriterEnum.java/1.2/Tue Jul 13 03:31:04 2004//

-/package.html/1.1/Sat Jun 26 02:45:17 2004//

-D

+/DebugDef.java/1.1/Wed Jan  5 22:13:42 2005//
+/ProjectDef.java/1.6/Fri Jan 21 20:18:57 2005//
+/ProjectWriter.java/1.2/Fri Jan 21 20:18:56 2005//
+/ProjectWriterEnum.java/1.2/Tue Jul 13 03:31:04 2004//
+/package.html/1.1/Sat Jun 26 02:45:17 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/ide/CVS/Repository b/src/net/sf/antcontrib/cpptasks/ide/CVS/Repository
index cdb7c39..379ffb0 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/ide/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/ide

+cpptasks/src/net/sf/antcontrib/cpptasks/ide
diff --git a/src/net/sf/antcontrib/cpptasks/ide/CVS/Root b/src/net/sf/antcontrib/cpptasks/ide/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/ide/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/ide/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/intel/CVS/Entries b/src/net/sf/antcontrib/cpptasks/intel/CVS/Entries
index 644406b..6b58496 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/intel/CVS/Entries
@@ -1,10 +1,10 @@
-/IntelLinux32CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//

-/IntelLinux32Linker.java/1.7/Sat Feb 28 19:02:03 2004//

-/IntelLinux64CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//

-/IntelLinux64Linker.java/1.6/Sat Feb 28 19:02:03 2004//

-/IntelProcessor.java/1.9/Sat Feb 28 19:02:03 2004//

-/IntelWin32CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//

-/IntelWin32Librarian.java/1.7/Sat Feb 28 19:02:03 2004//

-/IntelWin32Linker.java/1.7/Sat Feb 28 19:02:03 2004//

-/IntelWin64CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//

-D

+/IntelLinux32CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//
+/IntelLinux32Linker.java/1.7/Sat Feb 28 19:02:03 2004//
+/IntelLinux64CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//
+/IntelLinux64Linker.java/1.6/Sat Feb 28 19:02:03 2004//
+/IntelProcessor.java/1.9/Sat Feb 28 19:02:03 2004//
+/IntelWin32CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//
+/IntelWin32Librarian.java/1.7/Sat Feb 28 19:02:03 2004//
+/IntelWin32Linker.java/1.7/Sat Feb 28 19:02:03 2004//
+/IntelWin64CCompiler.java/1.9/Sat Feb 28 19:02:03 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/intel/CVS/Repository b/src/net/sf/antcontrib/cpptasks/intel/CVS/Repository
index 526020a..5c4ca5e 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/intel/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/intel

+cpptasks/src/net/sf/antcontrib/cpptasks/intel
diff --git a/src/net/sf/antcontrib/cpptasks/intel/CVS/Root b/src/net/sf/antcontrib/cpptasks/intel/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/intel/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/intel/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Entries b/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Entries
index b9338cf..1052ba7 100644
--- a/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Entries
@@ -1,3 +1,3 @@
-/XpidlCompiler.java/1.3/Sat Jun 26 02:45:16 2004//

-/package.html/1.1/Wed May  5 02:50:44 2004//

-D

+/XpidlCompiler.java/1.3/Sat Jun 26 02:45:16 2004//
+/package.html/1.1/Wed May  5 02:50:44 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Repository b/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Repository
index 465b097..e451ca6 100644
--- a/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/mozilla

+cpptasks/src/net/sf/antcontrib/cpptasks/mozilla
diff --git a/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Root b/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/mozilla/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Entries b/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Entries
index 4777cd4..b2c3af5 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Entries
@@ -1,10 +1,10 @@
-/OpenWatcomCCompiler.java/1.1/Thu Jul  8 21:30:54 2004//

-/OpenWatcomCLinker.java/1.1/Thu Jul  8 21:30:54 2004//

-/OpenWatcomCompiler.java/1.1/Thu Jul  8 21:30:54 2004//

-/OpenWatcomFortranCompiler.java/1.1/Thu Jul  8 21:30:54 2004//

-/OpenWatcomFortranLinker.java/1.1/Thu Jul  8 21:30:54 2004//

-/OpenWatcomLibrarian.java/1.1/Thu Jul  8 21:30:54 2004//

-/OpenWatcomLinker.java/1.1/Thu Jul  8 21:30:54 2004//

-/OpenWatcomProcessor.java/1.1/Thu Jul  8 21:30:54 2004//

-/package.html/1.1/Tue Jul 13 03:31:04 2004//

-D

+/OpenWatcomCCompiler.java/1.1/Thu Jul  8 21:30:54 2004//
+/OpenWatcomCLinker.java/1.1/Thu Jul  8 21:30:54 2004//
+/OpenWatcomCompiler.java/1.1/Thu Jul  8 21:30:54 2004//
+/OpenWatcomFortranCompiler.java/1.1/Thu Jul  8 21:30:54 2004//
+/OpenWatcomFortranLinker.java/1.1/Thu Jul  8 21:30:54 2004//
+/OpenWatcomLibrarian.java/1.1/Thu Jul  8 21:30:54 2004//
+/OpenWatcomLinker.java/1.1/Thu Jul  8 21:30:54 2004//
+/OpenWatcomProcessor.java/1.1/Thu Jul  8 21:30:54 2004//
+/package.html/1.1/Tue Jul 13 03:31:04 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Repository b/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Repository
index ef2bef3..635ada6 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/openwatcom

+cpptasks/src/net/sf/antcontrib/cpptasks/openwatcom
diff --git a/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Root b/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/openwatcom/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/os390/CVS/Entries b/src/net/sf/antcontrib/cpptasks/os390/CVS/Entries
index 7482668..eed8dfa 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/os390/CVS/Entries
@@ -1,4 +1,4 @@
-/OS390CCompiler.java/1.18/Fri Apr 23 20:15:47 2004//

-/OS390Linker.java/1.19/Tue May 11 03:50:15 2004//

-/OS390Processor.java/1.11/Wed Apr 21 21:46:51 2004//

-D

+/OS390CCompiler.java/1.18/Fri Apr 23 20:15:47 2004//
+/OS390Linker.java/1.19/Tue May 11 03:50:15 2004//
+/OS390Processor.java/1.11/Wed Apr 21 21:46:51 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/os390/CVS/Repository b/src/net/sf/antcontrib/cpptasks/os390/CVS/Repository
index 241f585..3bcd2ae 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/os390/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/os390

+cpptasks/src/net/sf/antcontrib/cpptasks/os390
diff --git a/src/net/sf/antcontrib/cpptasks/os390/CVS/Root b/src/net/sf/antcontrib/cpptasks/os390/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/os390/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/os390/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/os400/CVS/Entries b/src/net/sf/antcontrib/cpptasks/os400/CVS/Entries
index ff17450..73b127c 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/os400/CVS/Entries
@@ -1,4 +1,4 @@
-/IccCompiler.java/1.8/Fri Apr 23 20:15:46 2004//

-/IccLinker.java/1.9/Tue May 11 03:50:15 2004//

-/IccProcessor.java/1.5/Wed Apr 21 21:47:06 2004//

-D

+/IccCompiler.java/1.8/Fri Apr 23 20:15:46 2004//
+/IccLinker.java/1.9/Tue May 11 03:50:15 2004//
+/IccProcessor.java/1.5/Wed Apr 21 21:47:06 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/os400/CVS/Repository b/src/net/sf/antcontrib/cpptasks/os400/CVS/Repository
index 6bc3715..f88d293 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/os400/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/os400

+cpptasks/src/net/sf/antcontrib/cpptasks/os400
diff --git a/src/net/sf/antcontrib/cpptasks/os400/CVS/Root b/src/net/sf/antcontrib/cpptasks/os400/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/os400/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/os400/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/parser/CVS/Entries b/src/net/sf/antcontrib/cpptasks/parser/CVS/Entries
index 67699c9..d28c0e2 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/parser/CVS/Entries
@@ -1,14 +1,14 @@
-/AbstractParser.java/1.7/Sat Feb 28 19:02:48 2004//

-/AbstractParserState.java/1.6/Sat Feb 28 19:02:48 2004//

-/BranchState.java/1.7/Sat Feb 28 19:02:48 2004//

-/CParser.java/1.9/Mon Aug 15 13:58:27 2005//

-/CaseInsensitiveLetterState.java/1.1/Mon Mar  1 05:11:01 2004//

-/FilenameState.java/1.6/Sat Feb 28 19:02:48 2004//

-/FortranParser.java/1.7/Mon Mar  1 05:11:01 2004//

-/LetterState.java/1.7/Mon Mar  1 05:11:01 2004//

-/Parser.java/1.6/Sat Feb 28 19:02:48 2004//

-/PostE.java/1.6/Sat Feb 28 19:02:48 2004//

-/WhitespaceOrCaseInsensitiveLetterState.java/1.1/Mon Mar  1 05:11:01 2004//

-/WhitespaceOrLetterState.java/1.7/Mon Mar  1 05:11:01 2004//

-/package.html/1.1/Fri Apr 16 04:04:11 2004//

-D

+/AbstractParser.java/1.7/Sat Feb 28 19:02:48 2004//
+/AbstractParserState.java/1.6/Sat Feb 28 19:02:48 2004//
+/BranchState.java/1.7/Sat Feb 28 19:02:48 2004//
+/CParser.java/1.9/Mon Aug 15 13:58:27 2005//
+/CaseInsensitiveLetterState.java/1.1/Mon Mar  1 05:11:01 2004//
+/FilenameState.java/1.6/Sat Feb 28 19:02:48 2004//
+/FortranParser.java/1.7/Mon Mar  1 05:11:01 2004//
+/LetterState.java/1.7/Mon Mar  1 05:11:01 2004//
+/Parser.java/1.6/Sat Feb 28 19:02:48 2004//
+/PostE.java/1.6/Sat Feb 28 19:02:48 2004//
+/WhitespaceOrCaseInsensitiveLetterState.java/1.1/Mon Mar  1 05:11:01 2004//
+/WhitespaceOrLetterState.java/1.7/Mon Mar  1 05:11:01 2004//
+/package.html/1.1/Fri Apr 16 04:04:11 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/parser/CVS/Repository b/src/net/sf/antcontrib/cpptasks/parser/CVS/Repository
index 102547a..98503b5 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/parser/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/parser

+cpptasks/src/net/sf/antcontrib/cpptasks/parser
diff --git a/src/net/sf/antcontrib/cpptasks/parser/CVS/Root b/src/net/sf/antcontrib/cpptasks/parser/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/parser/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/parser/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/platforms/CVS/Entries b/src/net/sf/antcontrib/cpptasks/platforms/CVS/Entries
index d8385c4..bab700a 100644
--- a/src/net/sf/antcontrib/cpptasks/platforms/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/platforms/CVS/Entries
@@ -1,3 +1,3 @@
-/WindowsPlatform.java/1.2/Fri May 21 01:35:58 2004//

-/package.html/1.1/Tue May 11 03:50:13 2004//

-D

+/WindowsPlatform.java/1.2/Fri May 21 01:35:58 2004//
+/package.html/1.1/Tue May 11 03:50:13 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/platforms/CVS/Repository b/src/net/sf/antcontrib/cpptasks/platforms/CVS/Repository
index bacc0be..b8597c2 100644
--- a/src/net/sf/antcontrib/cpptasks/platforms/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/platforms/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/platforms

+cpptasks/src/net/sf/antcontrib/cpptasks/platforms
diff --git a/src/net/sf/antcontrib/cpptasks/platforms/CVS/Root b/src/net/sf/antcontrib/cpptasks/platforms/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/platforms/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/platforms/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/sun/CVS/Entries b/src/net/sf/antcontrib/cpptasks/sun/CVS/Entries
index 6bef4b3..75d173a 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/sun/CVS/Entries
@@ -1,6 +1,6 @@
-/C89CCompiler.java/1.8/Fri Apr 23 20:15:49 2004//

-/C89Linker.java/1.10/Tue May 11 03:50:14 2004//

-/C89Processor.java/1.6/Wed Apr 21 21:48:41 2004//

-/ForteCCCompiler.java/1.12/Sat Apr 24 19:07:20 2004//

-/ForteCCLinker.java/1.11/Sat Apr 24 18:22:19 2004//

-D

+/C89CCompiler.java/1.8/Fri Apr 23 20:15:49 2004//
+/C89Linker.java/1.10/Tue May 11 03:50:14 2004//
+/C89Processor.java/1.6/Wed Apr 21 21:48:41 2004//
+/ForteCCCompiler.java/1.12/Sat Apr 24 19:07:20 2004//
+/ForteCCLinker.java/1.11/Sat Apr 24 18:22:19 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/sun/CVS/Repository b/src/net/sf/antcontrib/cpptasks/sun/CVS/Repository
index 7372803..c47726d 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/sun/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/sun

+cpptasks/src/net/sf/antcontrib/cpptasks/sun
diff --git a/src/net/sf/antcontrib/cpptasks/sun/CVS/Root b/src/net/sf/antcontrib/cpptasks/sun/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/sun/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/sun/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/ti/CVS/Entries b/src/net/sf/antcontrib/cpptasks/ti/CVS/Entries
index 1599815..d1850be 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/ti/CVS/Entries
@@ -1,4 +1,4 @@
-/ClxxCCompiler.java/1.3/Fri Apr 23 20:15:47 2004//

-/ClxxLibrarian.java/1.4/Thu Apr 22 08:06:54 2004//

-/ClxxLinker.java/1.4/Thu Apr 22 08:06:55 2004//

-D

+/ClxxCCompiler.java/1.3/Fri Apr 23 20:15:47 2004//
+/ClxxLibrarian.java/1.4/Thu Apr 22 08:06:54 2004//
+/ClxxLinker.java/1.4/Thu Apr 22 08:06:55 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/ti/CVS/Repository b/src/net/sf/antcontrib/cpptasks/ti/CVS/Repository
index c05a718..691afd5 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/ti/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/ti

+cpptasks/src/net/sf/antcontrib/cpptasks/ti
diff --git a/src/net/sf/antcontrib/cpptasks/ti/CVS/Root b/src/net/sf/antcontrib/cpptasks/ti/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/ti/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/ti/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries b/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries
index 60ffa7c..fc58128 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries
@@ -1,6 +1,6 @@
-/MetaObjectCompiler.java/1.2/Tue May 11 03:50:15 2004//

-/MetaObjectParser.java/1.2/Tue May 11 03:50:14 2004//

-/UserInterfaceCompiler.java/1.2/Tue May 11 03:50:15 2004//

-/UserInterfaceParser.java/1.1/Wed May  5 02:50:45 2004//

-/package.html/1.1/Wed May  5 02:50:45 2004//

-D

+/MetaObjectCompiler.java/1.2/Tue May 11 03:50:15 2004//
+/MetaObjectParser.java/1.2/Tue May 11 03:50:14 2004//
+/UserInterfaceCompiler.java/1.2/Tue May 11 03:50:15 2004//
+/UserInterfaceParser.java/1.1/Wed May  5 02:50:45 2004//
+/package.html/1.1/Wed May  5 02:50:45 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository b/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository
index e4f3388..1de7f14 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/trolltech

+cpptasks/src/net/sf/antcontrib/cpptasks/trolltech
diff --git a/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Root b/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/trolltech/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/src/net/sf/antcontrib/cpptasks/types/CVS/Entries b/src/net/sf/antcontrib/cpptasks/types/CVS/Entries
index 80db835..6b17d5b 100644
--- a/src/net/sf/antcontrib/cpptasks/types/CVS/Entries
+++ b/src/net/sf/antcontrib/cpptasks/types/CVS/Entries
@@ -1,15 +1,15 @@
-/CommandLineArgument.java/1.7/Sat Feb 28 19:03:43 2004//

-/CompilerArgument.java/1.4/Sat Feb 28 19:03:43 2004//

-/ConditionalFileSet.java/1.8/Sat Feb 28 19:03:43 2004//

-/ConditionalPath.java/1.8/Sat Feb 28 19:03:43 2004//

-/DefineArgument.java/1.12/Sat Feb 28 19:03:43 2004//

-/DefineSet.java/1.8/Sat Feb 28 19:03:43 2004//

-/FlexLong.java/1.7/Sat Feb 28 19:03:43 2004//

-/IncludePath.java/1.4/Sat Feb 28 19:03:43 2004//

-/LibrarySet.java/1.27/Wed Apr 21 21:47:31 2004//

-/LibraryTypeEnum.java/1.1/Wed Apr 21 21:47:31 2004//

-/LinkerArgument.java/1.4/Sat Feb 28 19:03:43 2004//

-/SystemIncludePath.java/1.4/Sat Feb 28 19:03:43 2004//

-/SystemLibrarySet.java/1.6/Sat Feb 28 19:03:43 2004//

-/UndefineArgument.java/1.4/Sat Feb 28 19:03:43 2004//

-D

+/CommandLineArgument.java/1.7/Sat Feb 28 19:03:43 2004//
+/CompilerArgument.java/1.4/Sat Feb 28 19:03:43 2004//
+/ConditionalFileSet.java/1.8/Sat Feb 28 19:03:43 2004//
+/ConditionalPath.java/1.8/Sat Feb 28 19:03:43 2004//
+/DefineArgument.java/1.12/Sat Feb 28 19:03:43 2004//
+/DefineSet.java/1.8/Sat Feb 28 19:03:43 2004//
+/FlexLong.java/1.7/Sat Feb 28 19:03:43 2004//
+/IncludePath.java/1.4/Sat Feb 28 19:03:43 2004//
+/LibrarySet.java/1.27/Wed Apr 21 21:47:31 2004//
+/LibraryTypeEnum.java/1.1/Wed Apr 21 21:47:31 2004//
+/LinkerArgument.java/1.4/Sat Feb 28 19:03:43 2004//
+/SystemIncludePath.java/1.4/Sat Feb 28 19:03:43 2004//
+/SystemLibrarySet.java/1.6/Sat Feb 28 19:03:43 2004//
+/UndefineArgument.java/1.4/Sat Feb 28 19:03:43 2004//
+D
diff --git a/src/net/sf/antcontrib/cpptasks/types/CVS/Repository b/src/net/sf/antcontrib/cpptasks/types/CVS/Repository
index fed2715..6e39e37 100644
--- a/src/net/sf/antcontrib/cpptasks/types/CVS/Repository
+++ b/src/net/sf/antcontrib/cpptasks/types/CVS/Repository
@@ -1 +1 @@
-cpptasks/src/net/sf/antcontrib/cpptasks/types

+cpptasks/src/net/sf/antcontrib/cpptasks/types
diff --git a/src/net/sf/antcontrib/cpptasks/types/CVS/Root b/src/net/sf/antcontrib/cpptasks/types/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/src/net/sf/antcontrib/cpptasks/types/CVS/Root
+++ b/src/net/sf/antcontrib/cpptasks/types/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/CVS/Entries b/test/CVS/Entries
index 2e3eea4..b5ea3f5 100644
--- a/test/CVS/Entries
+++ b/test/CVS/Entries
@@ -1 +1 @@
-D/junit////

+D/junit////
diff --git a/test/CVS/Entries.Log b/test/CVS/Entries.Log
index d7e6626..46c40bc 100644
--- a/test/CVS/Entries.Log
+++ b/test/CVS/Entries.Log
@@ -1,4 +1,4 @@
-A D/c-src////

-A D/f-src////

-R D/f-src////

-R D/c-src////

+A D/c-src////
+A D/f-src////
+R D/f-src////
+R D/c-src////
diff --git a/test/CVS/Repository b/test/CVS/Repository
index f8775ef..3eb8c57 100644
--- a/test/CVS/Repository
+++ b/test/CVS/Repository
@@ -1 +1 @@
-cpptasks/test

+cpptasks/test
diff --git a/test/CVS/Root b/test/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/CVS/Root
+++ b/test/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/CVS/Entries b/test/junit/CVS/Entries
index 704c0ea..94a519b 100644
--- a/test/junit/CVS/Entries
+++ b/test/junit/CVS/Entries
@@ -1,2 +1,2 @@
-D/files////

-D/net////

+D/files////
+D/net////
diff --git a/test/junit/CVS/Repository b/test/junit/CVS/Repository
index e7bec73..f706fd8 100644
--- a/test/junit/CVS/Repository
+++ b/test/junit/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit

+cpptasks/test/junit
diff --git a/test/junit/CVS/Root b/test/junit/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/CVS/Root
+++ b/test/junit/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/files/CVS/Entries b/test/junit/files/CVS/Entries
index d812dcd..4306138 100644
--- a/test/junit/files/CVS/Entries
+++ b/test/junit/files/CVS/Entries
@@ -1,2 +1,2 @@
-D/openshore////

-D/xerces-c////

+D/openshore////
+D/xerces-c////
diff --git a/test/junit/files/CVS/Repository b/test/junit/files/CVS/Repository
index bcd4407..1c8cf96 100644
--- a/test/junit/files/CVS/Repository
+++ b/test/junit/files/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/files

+cpptasks/test/junit/files
diff --git a/test/junit/files/CVS/Root b/test/junit/files/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/files/CVS/Root
+++ b/test/junit/files/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/files/openshore/CVS/Entries b/test/junit/files/openshore/CVS/Entries
index 07fc670..602d5e0 100644
--- a/test/junit/files/openshore/CVS/Entries
+++ b/test/junit/files/openshore/CVS/Entries
@@ -1,3 +1,3 @@
-/dependencies.xml/1.1/Mon Oct 13 03:34:56 2003//

-/history.xml/1.1/Mon Oct 13 03:34:56 2003//

-D

+/dependencies.xml/1.1/Mon Oct 13 03:34:56 2003//
+/history.xml/1.1/Mon Oct 13 03:34:56 2003//
+D
diff --git a/test/junit/files/openshore/CVS/Repository b/test/junit/files/openshore/CVS/Repository
index 37b56ba..b91bc04 100644
--- a/test/junit/files/openshore/CVS/Repository
+++ b/test/junit/files/openshore/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/files/openshore

+cpptasks/test/junit/files/openshore
diff --git a/test/junit/files/openshore/CVS/Root b/test/junit/files/openshore/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/files/openshore/CVS/Root
+++ b/test/junit/files/openshore/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/files/xerces-c/CVS/Entries b/test/junit/files/xerces-c/CVS/Entries
index 07fc670..602d5e0 100644
--- a/test/junit/files/xerces-c/CVS/Entries
+++ b/test/junit/files/xerces-c/CVS/Entries
@@ -1,3 +1,3 @@
-/dependencies.xml/1.1/Mon Oct 13 03:34:56 2003//

-/history.xml/1.1/Mon Oct 13 03:34:56 2003//

-D

+/dependencies.xml/1.1/Mon Oct 13 03:34:56 2003//
+/history.xml/1.1/Mon Oct 13 03:34:56 2003//
+D
diff --git a/test/junit/files/xerces-c/CVS/Repository b/test/junit/files/xerces-c/CVS/Repository
index 1851a2f..14d2480 100644
--- a/test/junit/files/xerces-c/CVS/Repository
+++ b/test/junit/files/xerces-c/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/files/xerces-c

+cpptasks/test/junit/files/xerces-c
diff --git a/test/junit/files/xerces-c/CVS/Root b/test/junit/files/xerces-c/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/files/xerces-c/CVS/Root
+++ b/test/junit/files/xerces-c/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/CVS/Entries b/test/junit/net/CVS/Entries
index 04c4303..5f3f0ed 100644
--- a/test/junit/net/CVS/Entries
+++ b/test/junit/net/CVS/Entries
@@ -1 +1 @@
-D/sf////

+D/sf////
diff --git a/test/junit/net/CVS/Repository b/test/junit/net/CVS/Repository
index 7c6da67..e5e82d2 100644
--- a/test/junit/net/CVS/Repository
+++ b/test/junit/net/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net

+cpptasks/test/junit/net
diff --git a/test/junit/net/CVS/Root b/test/junit/net/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/CVS/Root
+++ b/test/junit/net/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/CVS/Entries b/test/junit/net/sf/CVS/Entries
index f19339c..b1561c7 100644
--- a/test/junit/net/sf/CVS/Entries
+++ b/test/junit/net/sf/CVS/Entries
@@ -1 +1 @@
-D/antcontrib////

+D/antcontrib////
diff --git a/test/junit/net/sf/CVS/Repository b/test/junit/net/sf/CVS/Repository
index 854d26b..679aaf6 100644
--- a/test/junit/net/sf/CVS/Repository
+++ b/test/junit/net/sf/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf

+cpptasks/test/junit/net/sf
diff --git a/test/junit/net/sf/CVS/Root b/test/junit/net/sf/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/CVS/Root
+++ b/test/junit/net/sf/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/CVS/Entries b/test/junit/net/sf/antcontrib/CVS/Entries
index 18d9c65..a4257d2 100644
--- a/test/junit/net/sf/antcontrib/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/CVS/Entries
@@ -1 +1 @@
-D/cpptasks////

+D/cpptasks////
diff --git a/test/junit/net/sf/antcontrib/CVS/Repository b/test/junit/net/sf/antcontrib/CVS/Repository
index cf57a7e..f73271d 100644
--- a/test/junit/net/sf/antcontrib/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib

+cpptasks/test/junit/net/sf/antcontrib
diff --git a/test/junit/net/sf/antcontrib/CVS/Root b/test/junit/net/sf/antcontrib/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/CVS/Root
+++ b/test/junit/net/sf/antcontrib/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/CVS/Entries
index 34f5f14..6274dc9 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/CVS/Entries
@@ -1,23 +1,23 @@
-/MockBuildListener.java/1.2/Sat Feb 28 19:04:46 2004//

-/MockFileCollector.java/1.2/Thu Apr 22 08:06:53 2004//

-/TestAllClasses.java/1.26/Thu Apr 22 08:06:53 2004//

-/TestCCTask.java/1.15/Sat May  1 01:40:39 2004//

-/TestCUtil.java/1.11/Sat Feb 28 19:04:46 2004//

-/TestCompilerDef.java/1.14/Tue May 11 03:50:11 2004//

-/TestCompilerEnum.java/1.5/Mon Aug 15 13:57:31 2005/-ko/

-/TestDependencyTable.java/1.2/Sat Feb 28 19:04:46 2004//

-/TestLinkerDef.java/1.11/Thu Apr 22 08:06:53 2004//

-/TestLinkerEnum.java/1.3/Sat Feb 28 19:04:46 2004//

-/TestOutputTypeEnum.java/1.3/Sat Feb 28 19:04:46 2004//

-/TestProcessorDef.java/1.12/Tue May 11 03:50:11 2004//

-/TestTargetHistoryTable.java/1.10/Tue May 11 03:50:11 2004//

-/TestTargetInfo.java/1.13/Tue May 11 03:50:11 2004//

-/TestXMLConsumer.java/1.2/Sat Feb 28 19:04:46 2004//

-/package.html/1.1/Fri Apr 16 04:04:11 2004//

-D/borland////

-D/compiler////

-D/devstudio////

-D/gcc////

-D/parser////

-D/trolltech////

-D/types////

+/MockBuildListener.java/1.2/Sat Feb 28 19:04:46 2004//
+/MockFileCollector.java/1.2/Thu Apr 22 08:06:53 2004//
+/TestAllClasses.java/1.26/Thu Apr 22 08:06:53 2004//
+/TestCCTask.java/1.15/Sat May  1 01:40:39 2004//
+/TestCUtil.java/1.11/Sat Feb 28 19:04:46 2004//
+/TestCompilerDef.java/1.14/Tue May 11 03:50:11 2004//
+/TestCompilerEnum.java/1.5/Mon Aug 15 13:57:31 2005/-ko/
+/TestDependencyTable.java/1.2/Sat Feb 28 19:04:46 2004//
+/TestLinkerDef.java/1.11/Thu Apr 22 08:06:53 2004//
+/TestLinkerEnum.java/1.3/Sat Feb 28 19:04:46 2004//
+/TestOutputTypeEnum.java/1.3/Sat Feb 28 19:04:46 2004//
+/TestProcessorDef.java/1.12/Tue May 11 03:50:11 2004//
+/TestTargetHistoryTable.java/1.10/Tue May 11 03:50:11 2004//
+/TestTargetInfo.java/1.13/Tue May 11 03:50:11 2004//
+/TestXMLConsumer.java/1.2/Sat Feb 28 19:04:46 2004//
+/package.html/1.1/Fri Apr 16 04:04:11 2004//
+D/borland////
+D/compiler////
+D/devstudio////
+D/gcc////
+D/parser////
+D/trolltech////
+D/types////
diff --git a/test/junit/net/sf/antcontrib/cpptasks/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/CVS/Repository
index 04ae15a..3facfa9 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks

+cpptasks/test/junit/net/sf/antcontrib/cpptasks
diff --git a/test/junit/net/sf/antcontrib/cpptasks/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Entries
index 67679a7..92a7abf 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Entries
@@ -1,2 +1,2 @@
-/TestBorlandCCompiler.java/1.4/Sat Feb 28 19:04:47 2004/-ko/

-D

+/TestBorlandCCompiler.java/1.4/Sat Feb 28 19:04:47 2004/-ko/
+D
diff --git a/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Repository
index f147a09..830183a 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks/borland

+cpptasks/test/junit/net/sf/antcontrib/cpptasks/borland
diff --git a/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/borland/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Entries
index 07eeda9..2ea4222 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Entries
@@ -1,7 +1,7 @@
-/TestAbstractCompiler.java/1.21/Tue May 11 03:50:12 2004//

-/TestAbstractLinker.java/1.20/Tue May 11 03:50:13 2004//

-/TestAbstractProcessor.java/1.17/Tue May 11 03:50:12 2004//

-/TestCommandLineCompilerConfiguration.java/1.10/Sat Feb 28 19:04:47 2004//

-/TestCompilerConfiguration.java/1.9/Tue May 11 03:50:13 2004//

-/TestLinkType.java/1.2/Sat Feb 28 19:04:47 2004//

-D

+/TestAbstractCompiler.java/1.21/Tue May 11 03:50:12 2004//
+/TestAbstractLinker.java/1.20/Tue May 11 03:50:13 2004//
+/TestAbstractProcessor.java/1.17/Tue May 11 03:50:12 2004//
+/TestCommandLineCompilerConfiguration.java/1.10/Sat Feb 28 19:04:47 2004//
+/TestCompilerConfiguration.java/1.9/Tue May 11 03:50:13 2004//
+/TestLinkType.java/1.2/Sat Feb 28 19:04:47 2004//
+D
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Repository
index 43e8cff..494317a 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks/compiler

+cpptasks/test/junit/net/sf/antcontrib/cpptasks/compiler
diff --git a/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/compiler/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries
index a84cfa7..4428115 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Entries
@@ -1,4 +1,4 @@
-/TestDevStudioLinker.java/1.10/Mon Apr  5 09:34:15 2004//

-/TestInstalledDevStudio.java/1.6/Sat Feb 28 19:04:47 2004//

-/TestInstalledDevStudioLinker.java/1.7/Sat Feb 28 19:04:47 2004//

-D

+/TestDevStudioLinker.java/1.10/Mon Apr  5 09:34:15 2004//
+/TestInstalledDevStudio.java/1.6/Sat Feb 28 19:04:47 2004//
+/TestInstalledDevStudioLinker.java/1.7/Sat Feb 28 19:04:47 2004//
+D
diff --git a/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository
index 54d7855..7ece1b8 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks/devstudio

+cpptasks/test/junit/net/sf/antcontrib/cpptasks/devstudio
diff --git a/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/devstudio/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Entries
index f6cc3a6..2ddb545 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Entries
@@ -1,6 +1,6 @@
-/TestAbstractArLibrarian.java/1.6/Tue May 11 03:50:12 2004//

-/TestAbstractLdLinker.java/1.7/Wed Apr 21 21:46:50 2004//

-/TestGccCCompiler.java/1.7/Sat Feb 28 19:04:47 2004//

-/TestGccCompatibleCCompiler.java/1.3/Sat Feb 28 19:04:47 2004//

-/TestGccLinker.java/1.5/Tue May 11 03:50:12 2004//

-D

+/TestAbstractArLibrarian.java/1.6/Tue May 11 03:50:12 2004//
+/TestAbstractLdLinker.java/1.7/Wed Apr 21 21:46:50 2004//
+/TestGccCCompiler.java/1.7/Sat Feb 28 19:04:47 2004//
+/TestGccCompatibleCCompiler.java/1.3/Sat Feb 28 19:04:47 2004//
+/TestGccLinker.java/1.5/Tue May 11 03:50:12 2004//
+D
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Repository
index 288ae90..9a87a17 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks/gcc

+cpptasks/test/junit/net/sf/antcontrib/cpptasks/gcc
diff --git a/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/gcc/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Entries
index 8bec227..82b4f8e 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Entries
@@ -1,5 +1,5 @@
-/TestAbstractParser.java/1.6/Sat Feb 28 19:04:46 2004//

-/TestCParser.java/1.9/Mon Aug 15 13:58:27 2005//

-/TestFortranParser.java/1.2/Sat Jun 26 02:45:18 2004//

-/package.html/1.1/Fri Apr 16 04:04:15 2004//

-D

+/TestAbstractParser.java/1.6/Sat Feb 28 19:04:46 2004//
+/TestCParser.java/1.9/Mon Aug 15 13:58:27 2005//
+/TestFortranParser.java/1.2/Sat Jun 26 02:45:18 2004//
+/package.html/1.1/Fri Apr 16 04:04:15 2004//
+D
diff --git a/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Repository
index b216e97..b84cda4 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks/parser

+cpptasks/test/junit/net/sf/antcontrib/cpptasks/parser
diff --git a/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/parser/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries
index 4f19176..02806e7 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Entries
@@ -1,4 +1,4 @@
-/TestMetaObjectCompiler.java/1.2/Tue May 11 03:50:16 2004//

-/TestMetaObjectParser.java/1.1/Wed May  5 02:50:44 2004//

-/package.html/1.1/Wed May  5 02:50:44 2004//

-D

+/TestMetaObjectCompiler.java/1.2/Tue May 11 03:50:16 2004//
+/TestMetaObjectParser.java/1.1/Wed May  5 02:50:44 2004//
+/package.html/1.1/Wed May  5 02:50:44 2004//
+D
diff --git a/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository
index 6a899c0..c774c7a 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks/trolltech

+cpptasks/test/junit/net/sf/antcontrib/cpptasks/trolltech
diff --git a/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/trolltech/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib
diff --git a/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Entries b/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Entries
index 319dc2e..6e6e9f1 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Entries
+++ b/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Entries
@@ -1,4 +1,4 @@
-/TestDefineArgument.java/1.8/Sat Feb 28 19:04:47 2004//

-/TestLibrarySet.java/1.14/Thu Apr 22 08:06:55 2004//

-/package.html/1.1/Fri Apr 16 04:04:11 2004//

-D

+/TestDefineArgument.java/1.8/Sat Feb 28 19:04:47 2004//
+/TestLibrarySet.java/1.14/Thu Apr 22 08:06:55 2004//
+/package.html/1.1/Fri Apr 16 04:04:11 2004//
+D
diff --git a/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Repository b/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Repository
index 5b7ecc7..95fa881 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Repository
+++ b/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Repository
@@ -1 +1 @@
-cpptasks/test/junit/net/sf/antcontrib/cpptasks/types

+cpptasks/test/junit/net/sf/antcontrib/cpptasks/types
diff --git a/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Root b/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Root
index 1ac95cd..5e83ed6 100644
--- a/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Root
+++ b/test/junit/net/sf/antcontrib/cpptasks/types/CVS/Root
@@ -1 +1 @@
-:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib

+:pserver:anonymous@cvs.sourceforge.net:/cvsroot/ant-contrib