From b03f055da64b4bc24b0ccfc5a439827131016226 Mon Sep 17 00:00:00 2001
From: Mark Donszelmann <Mark.Donszelmann@gmail.com>
Date: Thu, 5 Jul 2007 21:41:16 +0000
Subject: Updated extra files

---
 samples/cppunit.ant | 230 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 127 insertions(+), 103 deletions(-)

(limited to 'samples/cppunit.ant')

diff --git a/samples/cppunit.ant b/samples/cppunit.ant
index a2441a4..9b0938b 100644
--- a/samples/cppunit.ant
+++ b/samples/cppunit.ant
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-Copyright 2004 The Ant-Contrib project
+Copyright 2004-2006 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.
@@ -23,12 +23,13 @@ Copyright 2004 The Ant-Contrib project
 <property name="src.dir" location="${base.dir}/src"/>
 <property name="examples.dir" location="${base.dir}/examples"/>
 <property name="build.dir" location="build"/>
+<property name="projects.dir" location="${build.dir}"/>
 <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"/>
+<property name="minor" value="10"/>
+<property name="build" value="2"/>
 <!-- specify api="unix" or api="win32" override platform default -->
 <property name="api" value="default"/>
 
@@ -38,7 +39,7 @@ Copyright 2004 The Ant-Contrib project
 <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="ant -f cppunit.ant -Dbase.dir=c:\cppunit-1.10.2"/>
 	<echo message="    -Dcompiler=[gcc | msvc | icc | bcc ...]"/>
 	<echo message="Status:"/>
 	<echo message="test-all will pass for gcc and icc on Linux"/>
@@ -55,63 +56,14 @@ Copyright 2004 The Ant-Contrib project
          if definitions are processed, not functional at this time
 -->
 <versioninfo id="cppunit-version"
-             fileversion="1.9.14"
-             productversion="1.9.14"
+             fileversion="${major}.${minor}.${build}"
+             productversion="${major}.${minor}.${build}"
              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"/>
@@ -128,7 +80,12 @@ Copyright 2004 The Ant-Contrib project
 		</or>
 	</condition>
 	<condition property="is-windows"><os family="windows"/></condition>
-	<condition property="is-win32">
+  <condition property="not-windows">
+    <not>
+      <isset property="is-windows"/>
+    </not>
+  </condition>
+  <condition property="is-win32">
 		<or>
 			<equals arg1="${api}" arg2="win32"/>
 			<and>
@@ -140,16 +97,44 @@ Copyright 2004 The Ant-Contrib project
 	<property environment="env"/>
 	<!--  in case not set in environment, use an insignificant value -->
 	<property name="env.LD_LIBRARY_PATH" value="."/>
+  <available property="configure-available"
+	           file="${base.dir}/configure"/>
+  <available property="config-auto-available"
+	           file="${include.dir}/cppunit/config-auto.h"/>
+  <condition property="use-brc">
+    <equals arg1="${compiler}" arg2="bcc"/>
+  </condition>
 </target>
 
-<target name="clean">
-	<delete dir="${build.dir}"/>
-</target>
+  <target name="autogen"
+          depends="init"
+          if="not-windows" unless="configure-available">
+    <exec dir="${base.dir}" executable="bash">
+      <arg value="autogen.sh"/>
+    </exec>
+  </target>
 
 
-<target name="shared-lib" depends="run-configure">
+  <target name="configure"
+          depends="autogen"
+          if="not-windows" unless="config-available">
+    <exec dir="${base.dir}" executable="bash">
+      <arg value="configure"/>
+    </exec>
+  </target>
+
+
+
+  <target name="clean">
+	  <delete dir="${build.dir}"/>
+    <delete dir="${projects.dir}"/>
+  </target>
+
+
+<target name="shared-lib" depends="configure">
 	<mkdir dir="${obj.dir}/cppunit_shared"/>
 	<mkdir dir="${build.dir}/lib"/>
+  <mkdir dir="${projects.dir}"/>
 	<cc subsystem="console"
 	    objdir="${obj.dir}/cppunit_shared"
 	    debug="${debug}"
@@ -166,26 +151,24 @@ Copyright 2004 The Ant-Contrib project
 		<fileset dir="${src.dir}/cppunit"
 			includes="DllMain.cpp"
 			if="is-windows"/>
+    <fileset dir="${include.dir}/cppunit" includes="**/*.h" excludes="**/MfcTestRunner.h"/>
 		<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>
+    <project outfile="${projects.dir}/shared" type="cbuilderx" name="cppunit" failonerror="false"/>
+    <project outfile="${projects.dir}/shared" type="msvc6" name="cppunit"  failonerror="false"/>
+    <project outfile="${projects.dir}/shared" type="msvc8" name="cppunit"  failonerror="false"/>
+    <project outfile="${projects.dir}/shared" type="xcode" name="cppunit" failonerror="false"/>
+  </cc>
 </target>
 
-<target name="static-lib" depends="run-configure">
+<target name="static-lib" depends="configure">
 	<mkdir dir="${obj.dir}/cppunit_static"/>
-	<cc subsystem="console"
+  <mkdir dir="${projects.dir}"/>
+  <cc subsystem="console"
 		outfile="${build.dir}/cppunit"
 		objdir="${obj.dir}/cppunit_static"
 		outtype="static"
@@ -198,19 +181,21 @@ Copyright 2004 The Ant-Contrib project
 	    <compiler name="msrc"/>
 		<fileset dir="${src.dir}/cppunit"
 		   includes="*.cpp" excludes="DllMain.cpp"/>
-		<includepath path="${include.dir}"/>
+    <fileset dir="${include.dir}/cppunit" includes="**/*.h" excludes="**/MfcTestRunner.h"/>
+    <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>
+	  <project outfile="${projects.dir}/static" type="cbuilderx" name="cppunit" failonerror="false"/>
+		<project outfile="${projects.dir}/static" type="msvc6" name="cppunit"  failonerror="false"/>
+    <project outfile="${projects.dir}/static" type="msvc8" name="cppunit"  failonerror="false"/>
+    <project outfile="${projects.dir}/static" type="xcode" name="cppunit" failonerror="false"/>
+  </cc>
 </target>
 
 <target name="compile-static-test" depends="static-lib">
 	<mkdir dir="${obj.dir}/cppunittestmain_static"/>
-	<cc outfile="${build.dir}/cppunittestmain_static"
+  <cc outfile="${build.dir}/cppunittestmain_static"
 	    outtype="executable"
 	    subsystem="console"
 	    objdir="${obj.dir}/cppunittestmain_static"
@@ -223,19 +208,21 @@ Copyright 2004 The Ant-Contrib project
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
 		<fileset dir="${examples.dir}/cppunittest"
-		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>
+		   includes="*.cpp, *.h" excludes="CppUnitTestPlugIn.cpp, MockProtector.h"/>
 		<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"/>
+    <project outfile="${projects.dir}/test_static" type="cbuilderx" name="unittest" failonerror="false"/>
+    <project outfile="${projects.dir}/test_static" type="msvc6" name="unittest"  failonerror="false"/>
+    <project outfile="${projects.dir}/test_static" type="msvc8" name="unittest"  failonerror="false"/>
+    <project outfile="${projects.dir}/test_static" type="xcode" name="unittest" failonerror="false"/>
 	</cc>
 </target>
 
 <target name="compile-shared-test" depends="shared-lib">
-	<mkdir dir="${obj.dir}/cppunittestmain_shared_shared"/>
+	<mkdir dir="${obj.dir}/cppunittestmain_shared"/>
 	<cc outfile="${build.dir}/lib/cppunittestmain_shared"
 	    outtype="executable"
 		subsystem="console"
@@ -249,22 +236,26 @@ Copyright 2004 The Ant-Contrib project
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
 		<fileset dir="${examples.dir}/cppunittest"
-		   includes="*.cpp" excludes="CppUnitTestPlugIn.cpp"/>
+		   includes="*.cpp, *.h" excludes="CppUnitTestPlugIn.cpp, MockProtector.h"/>
 		<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>
+    <project outfile="${projects.dir}/test_shared" type="cbuilderx" name="unittest" failonerror="false"/>
+    <project outfile="${projects.dir}/test_shared" type="msvc6" name="unittest"  failonerror="false"/>
+    <project outfile="${projects.dir}/test_shared" type="msvc8" name="unittest"  failonerror="false"/>
+    <project outfile="${projects.dir}/test_shared" type="xcode" name="unittest" failonerror="false"/>
+  </cc>
 </target>
 
 <!--
 compile CPPUnit implementation and unit tests into a single executable
 -->
-<target name="compile-mono-test" depends="run-configure">
+<target name="compile-mono-test" depends="configure">
 	<mkdir dir="${obj.dir}/cppunittestmain_mono"/>
+  <mkdir dir="${build.dir}/lib"/>
 	<cc outfile="${build.dir}/lib/cppunittestmain"
 	    outtype="executable"
 		subsystem="console"
@@ -281,12 +272,17 @@ compile CPPUnit implementation and unit tests into a single executable
 		   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}"/>
+		   includes="*.cpp, *.h" excludes="CppUnitTestPlugIn.cpp, MockProtector.h"/>
+         <fileset dir="${include.dir}/cppunit" includes="**/*.h" 
+                  excludes="**/MfcTestRunner.h"/>
+    <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"/>
+    <project outfile="${projects.dir}/test" type="cbuilderx" name="unittest" failonerror="false"/>
+    <project outfile="${projects.dir}/test" type="msvc6" name="unittest"  failonerror="false"/>
+    <project outfile="${projects.dir}/test" type="msvc8" name="unittest"  failonerror="false"/>
+    <project outfile="${projects.dir}/test" type="xcode" name="unittest" failonerror="false"/>
 	</cc>
 </target>
 
@@ -310,7 +306,7 @@ compile CPPUnit implementation and unit tests into a single executable
 
 <target name="test-mono" depends="compile-mono-test">
 	<exec dir="${build.dir}"
-	      executable="${build.dir}/cppunittestmain"
+	      executable="${build.dir}/lib/cppunittestmain"
 	      failonerror="true"/>
 </target>
 
@@ -328,7 +324,7 @@ compile CPPUnit implementation and unit tests into a single executable
 	    debug="${debug}">
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
-		<fileset dir="${src.dir}/qttestrunner" includes="*.cpp"/>
+		<fileset dir="${src.dir}/qttestrunner" includes="*.cpp, *.h"/>
 		<compiler name="uic">
 			<fileset dir="${src.dir}/qttestrunner" includes="*.ui"/>
 		</compiler>
@@ -341,7 +337,11 @@ compile CPPUnit implementation and unit tests into a single executable
 		<libset libs="pthread"/>
 		<libset libs="stdc++" if="is-gcc"/>
 		<versioninfo extends="cppunit-version" filedescription="Qt test runner"/>
-	</cc>
+    <project outfile="${projects.dir}/qttestrunner" type="cbuilderx" name="qttestrunner" failonerror="false"/>
+    <project outfile="${projects.dir}/qttestrunner" type="msvc6" name="qttestrunner"  failonerror="false"/>
+    <project outfile="${projects.dir}/qttestrunner" type="msvc8" name="qttestrunner"  failonerror="false"/>
+    <project outfile="${projects.dir}/qttestrunner" type="xcode" name="qttestrunner" failonerror="false"/>
+  </cc>
 
 </target>
 
@@ -359,7 +359,7 @@ compile CPPUnit implementation and unit tests into a single executable
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
 		<fileset dir="${src.dir}/DllPlugInTester"
-		    includes="*.cpp"
+		    includes="*.cpp, *.h"
 		    excludes="DllPlugInTesterTest.cpp"/>
 		<includepath path="${include.dir}"/>
 		<libset dir="${build.dir}" libs="cppunit"/>
@@ -367,7 +367,11 @@ compile CPPUnit implementation and unit tests into a single executable
 		<libset libs="stdc++" if="is-gcc"/>
 		<defineset define="WIN32" if="is-windows"/>
 		<versioninfo extends="cppunit-version" fileversion="Dll Plug-in tester"/>
-	</cc>
+    <project outfile="${projects.dir}/plugintester" type="cbuilderx" name="plugintester" failonerror="false"/>
+    <project outfile="${projects.dir}/plugintester" type="msvc6" name="plugintester"  failonerror="false"/>
+    <project outfile="${projects.dir}/plugintester" type="msvc8" name="plugintester"  failonerror="false"/>
+    <project outfile="${projects.dir}/plugintester" type="xcode" name="plugintester" failonerror="false"/>
+  </cc>
 </target>
 
 
@@ -383,7 +387,7 @@ compile CPPUnit implementation and unit tests into a single executable
 	    rtti="true"
 	    debug="${debug}">
 		<fileset dir="${src.dir}/DllPlugInTester"
-		    includes="*.cpp"
+		    includes="*.cpp, *.h"
 		    excludes="DllPlugInTester.cpp"/>
 		<includepath path="${include.dir}"/>
 	    <compiler name="brc" if="use-brc"/>
@@ -393,7 +397,11 @@ compile CPPUnit implementation and unit tests into a single executable
 		<libset libs="stdc++" if="is-gcc"/>
 		<defineset define="WIN32" if="is-windows"/>
 		<versioninfo extends="cppunit-version" filedescription="Tests for Plugin tester"/>
-	</cc>
+    <project outfile="${projects.dir}/plugintester-test" type="cbuilderx" name="plugintester-test" failonerror="false"/>
+    <project outfile="${projects.dir}/plugintester-test" type="msvc6" name="plugintester-test"  failonerror="false"/>
+    <project outfile="${projects.dir}/plugintester-test" type="msvc8" name="plugintester-test"  failonerror="false"/>
+    <project outfile="${projects.dir}/plugintester-test" type="xcode" name="plugintester-test" failonerror="false"/>
+  </cc>
 </target>
 
 <target name="test-plugintestertest" depends="plugintestertest">
@@ -414,14 +422,18 @@ compile CPPUnit implementation and unit tests into a single executable
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
 		<fileset dir="${examples.dir}/money"
-		    includes="*.cpp"/>
+		    includes="*.cpp, *.h"/>
 		<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>
+    <project outfile="${projects.dir}/money" type="cbuilderx" name="money" failonerror="false"/>
+    <project outfile="${projects.dir}/money" type="msvc6" name="money"  failonerror="false"/>
+    <project outfile="${projects.dir}/money" type="msvc8" name="money"  failonerror="false"/>
+    <project outfile="${projects.dir}/money" type="xcode" name="money" failonerror="false"/>
+  </cc>
 </target>
 
 <target name="test-money" depends="money">
@@ -443,14 +455,18 @@ compile CPPUnit implementation and unit tests into a single executable
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
 		<fileset dir="${examples.dir}/hierarchy"
-		    includes="*.cpp"/>
+		    includes="*.cpp, *.h"/>
 		<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>
+    <project outfile="${projects.dir}/hierarchy" type="cbuilderx" name="hierarchy" failonerror="false"/>
+    <project outfile="${projects.dir}/hierarchy" type="msvc6" name="hierarchy"  failonerror="false"/>
+    <project outfile="${projects.dir}/hierarchy" type="msvc8" name="hierarchy"  failonerror="false"/>
+    <project outfile="${projects.dir}/hierarchy" type="xcode" name="hierarchy" failonerror="false"/>
+  </cc>
 </target>
 
 <target name="test-hierarchy" depends="hierarchy">
@@ -478,7 +494,7 @@ compile CPPUnit implementation and unit tests into a single executable
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
 		<fileset dir="${examples.dir}/simple"
-		    includes="*.cpp" excludes="SimplePlugIn.cpp"/>
+		    includes="*.cpp, *.h" excludes="SimplePlugIn.cpp"/>
 		<includepath path="${include.dir}"/>
 		<!--  original was shared, but changing gives
 		          an error loading library  -->
@@ -487,7 +503,11 @@ compile CPPUnit implementation and unit tests into a single executable
 		<libset libs="stdc++" if="is-gcc"/>
 		<defineset define="WIN32" if="is-win32"/>
 		<versioninfo extends="cppunit-version" filedescription="Sample plug-in"/>
-	</cc>
+    <project outfile="${projects.dir}/simple" type="cbuilderx" name="simple" failonerror="false"/>
+    <project outfile="${projects.dir}/simple" type="msvc6" name="simple"  failonerror="false"/>
+    <project outfile="${projects.dir}/simple" type="msvc8" name="simple"  failonerror="false"/>
+    <project outfile="${projects.dir}/simple" type="xcode" name="simple" failonerror="false"/>
+  </cc>
 </target>
 
 <target name="test-simple" depends="simple">
@@ -520,14 +540,18 @@ compile CPPUnit implementation and unit tests into a single executable
 	    <compiler name="brc" if="use-brc"/>
 	    <compiler name="msrc"/>
 		<fileset dir="${src.dir}/msvc6/DSPlugIn"
-		    includes="*.cpp *.rc"/>
+		    includes="*.cpp *.rc, *.h"/>
 		<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>
+    <project outfile="${projects.dir}/TestRunnerDSPlugIn" type="cbuilderx" name="TestRunnerDSPlugIn" failonerror="false"/>
+    <project outfile="${projects.dir}/TestRunnerDSPlugIn" type="msvc6" name="TestRunnerDSPlugIn"  failonerror="false"/>
+    <project outfile="${projects.dir}/TestRunnerDSPlugIn" type="msvc8" name="TestRunnerDSPlugIn"  failonerror="false"/>
+    <project outfile="${projects.dir}/TestRunnerDSPlugIn" type="xcode" name="TestRunnerDSPlugIn" failonerror="false"/>
+  </cc>
 </target>
 
 
-- 
cgit v1.2.3