mockpp-commits Mailing List for Mock Objects for C++ (Page 17)

Brought to you by: ewald-arnold

mockpp-commits

You can subscribe to this list here.

2005	_Jan	_Feb (17)	_Mar (178)	_Apr (119)	_May (60)	_Jun (3)	_Jul (60)	_Aug (16)	_Sep (55)	_Oct (156)	_Nov (136)	_Dec (255)
2006	_Jan (98)	_Feb (8)	_Mar (57)	_Apr (43)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 51 > >> (Page 17 of 51)

[Mockpp-commits] mockpp/3party/cxxtest/cxxtest .cvsignore,NONE,1.1 Makefile.am,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-09 16:19:24

Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4161/3party/cxxtest/cxxtest

Added Files:
	.cvsignore Makefile.am 
Log Message:
new

--- NEW FILE: .cvsignore ---
Makefile.in

--- NEW FILE: Makefile.am ---
cxxtest_SOURCES =
Descriptions.cpp \
DummyDescriptions.cpp \
GlobalFixture.cpp \
LinkedList.cpp \
RealDescriptions.cpp \
Root.cpp \
TestSuite.cpp \
TestTracker.cpp \
ValueTraits.cpp 
    
cxxtest_HEADERS=
Descriptions.h \
DummyDescriptions.h \
ErrorFormatter.h \
ErrorPrinter.h \
Flags.h \
GlobalFixture.h \
Gui.h \
LinkedList.h \
Mock.h \
ParenPrinter.h \
QtGui.h \
RealDescriptions.h \
SelfTest.h \
StdHeaders.h \
StdioFilePrinter.h \
StdioPrinter.h \
StdValueTraits.h \
TeeListener.h \
TestListener.h \
TestRunner.h \
TestSuite.h \
TestTracker.h \
ValueTraits.h \
Win32Gui.h \
X11Gui.h \
YesNoRunner.h

[Mockpp-commits] mockpp/3party/cxxtest/docs convert.pl,NONE,1.1 guide.html,NONE,1.1 index.html,NONE,1.1 qt.png,NONE,1.1 qt2.png,NONE,1.1 win32.png,NONE,1.1 x11.png,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-09 16:00:19

Update of /cvsroot/mockpp/mockpp/3party/cxxtest/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31938/3party/cxxtest/docs

Added Files:
	convert.pl guide.html index.html qt.png qt2.png win32.png 
	x11.png 
Log Message:


--- NEW FILE: index.html ---
<html>
<title>CxxTest</title>
<h1>Introduction</h1>

<p>CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.

<p>Its advantages over existing alternatives are that it:
<ul>
<li>Doesn't require RTTI
<li>Doesn't require member template functions
<li>Doesn't require exception handling
<li>Doesn't require any external libraries (including memory management,
   file/console I/O, graphics libraries)
<li>Is distributed entirely as a set of header files
</ul>

<p>This makes it extremely portable and usable.

<p>CxxTest is available under the <a href="http://www.gnu.org/copyleft/lesser.html">GNU
Lesser General Public License</a>.

<p>See <a href="guide.html">the user's guide</a> for information.
It is also available as <a href="http://cxxtest.sourceforge.net/guide.pdf">a PDF file</a>.

<p>The version history is available <a href="http://cxxtest.sourceforge.net/Versions.html">here</a>.

<h1>Getting CxxTest</h1>
You can always get the latest release from 
<a href="http://sourceforge.net/project/showfiles.php?group_id=52834">here</a> or
<a href="http://dl.sourceforge.net/cxxtest">here</a>.

<p>There are several files you can download: 
<ul>
<li><code>cxxtest-<i>version</i>-1.noarch.rpm</code>
<li><code>cxxtest-<i>version</i>.tar.gz</code>
<li><code>cxxtest-<i>version</i>.zip</code>
<li><code>cxxtest-guide-<i>version</i>.pdf</code> (the user's guide)
</ul>
Note that, since CxxTest consists entirely of header files, 
there is no distinction between source and binary distribution.

<p>There are also files called <code>cxxtest-selftest-*</code>: these
are used (usually by me) to test the portability of CxxTest, so you
can probably do without them.

<p>If you just can't wait for the next release, I sometimes upload betas
to <a href="http://cxxtest.sourceforge.net/beta">here</a>.

<h1>Getting started</h1>
Get the sources and build the samples in the sample subdirectory.

<br>
<p>
<A href="http://sourceforge.net"> <IMG src="http://sourceforge.net/sflogo.php?group_id=52834&type=4" border="0" alt="SourceForge Logo"></A> 

</html>

--- NEW FILE: qt.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: qt2.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: guide.html ---
<html lang="en">
<head>
<title>CxxTest User's Guide</title>
<meta http-equiv="Content-Type" content="text/html">
<meta name="description" content="CxxTest User's Guide">
<meta name="generator" content="makeinfo 4.3">
<link href="http://www.gnu.org/software/texinfo/" rel="generator-home">
</head>
<body>
<h1 class="settitle">CxxTest User's Guide</h1>
<a href="#contents">Table of contents</a>

<h2 class="chapter"><a name="TOC0"></a>1 Introduction</h2>

   <p>CxxTest is a <a href="http://junit.org/">JUnit</a>/<a href="http://cppunit.sourceforge.net">CppUnit</a>/<a href="http://xprogramming.com/software.html">xUnit</a>-like framework for C++.

   <p>Its advantages over existing alternatives are that it:
     <ul>
<li>Doesn't require RTTI
[...1921 lines suppressed...]
<li><a href="#TOC88">B.3 <code>CXXTEST_ABORT_TEST_ON_FAIL</code></a>
<li><a href="#TOC89">B.4 <code>CXXTEST_USER_VALUE_TRAITS</code></a>
<li><a href="#TOC90">B.5 <code>CXXTEST_OLD_TEMPLATE_SYNTAX</code></a>
<li><a href="#TOC91">B.6 <code>CXXTEST_OLD_STD</code></a>
<li><a href="#TOC92">B.7 <code>CXXTEST_MAX_DUMP_SIZE</code></a>
<li><a href="#TOC93">B.8 <code>CXXTEST_DEFAULT_ABORT</code></a>
<li><a href="#TOC94">B.9 <code>CXXTEST_LONGLONG</code></a>
</li></ul>
<li><a name="toc_TOC95" href="#TOC95">Appendix C Runtime options</a>
<ul>
<li><a href="#TOC96">C.1 <code>setAbortTestOnFail( bool )</code></a>
<li><a href="#TOC97">C.2 <code>setMaxDumpSize( unsigned )</code></a>
</li></ul>
<li><a name="toc_TOC98" href="#TOC98">Appendix D Version history</a>
</li></ul>
</div>


   </body></html>


--- NEW FILE: x11.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: win32.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: convert.pl ---
#!/usr/bin/perl

die "Usage: $0 <text file> <html file> <TexInfo file>\n"
  unless scalar @ARGV == 3;

my ($text, $html, $texi) = @ARGV;

open TEXT, "<$text" or die "Cannot open text file \"$text\"\n";
open HTML, ">$html" or die "Cannot create html file \"$html\"\n";
open TEXI, ">$texi" or die "Cannot create TexInfo file \"$texi\"\n";

print HTML "<html>";

sub analyze($) {
  my ($line) = @_;
  my ($htmlLine, $texiLine) = ($line, $line);

  # command line options
  $texiLine =~ s/ (--?[a-z-]*)/ \@option{$1}/g;
  $htmlLine =~ s/ (--?[a-z-]*)/ <tt>$1<\/tt>/g;

  # [Class::]function()
  $texiLine =~ s/([^A-Za-z])(([A-Z][A-Za-z0-9]*::)?[A-Za-z0-9]+\(\))/$1\@code{$2}/g;
  $htmlLine =~ s/([^A-Za-z])(([A-Z][A-Za-z0-9]*::)?[A-Za-z0-9]+\(\))/$1<code>$2<\/code>/g;

  # `file'
  $texiLine =~ s/`([A-Za-z.\/]*)'/\@file{$1}/g;
  $htmlLine =~ s/`([A-Za-z.\/]*)'/<tt>`$1'<\/tt>/g;

  # TS...
  $texiLine =~ s/(^|[^A-Z])(TS[A-Za-z_*()]*)/$1\@code{$2}/g;
  $htmlLine =~ s/(^|[^A-Z])(TS[A-Za-z_*()]*)/$1<code>$2<\/code>/g;

  # CXXTEST_
  $texiLine =~ s/(CXXTEST_[A-Z_]*)/\@code{$1}/g;
  $htmlLine =~ s/(CXXTEST_[A-Z_]*)/<tt>$1<\/tt>/g;

  return ($htmlLine, $texiLine);
}

my $line;
my $inRelease = 0;
while ( defined( $line = <TEXT> ) ) {
  chomp $line;
  if ( $line =~ m/^CxxTest Releases/ ) {
    print HTML "<title>CxxTest Releases</title>\n";
    print HTML "<h1>CxxTest Releases</h1>\n\n";

    print TEXI "\@appendix Version history\n";
    print TEXI "\@itemize \@bullet\n";
  }
  elsif ( $line =~ m/^(.*):$/ ) {
    if ( $inRelease ) {
      print HTML "</ul>\n\n";
      print TEXI "\@end itemize\n";
    }

    print HTML "<h2>$1</h2>\n";
    print HTML "<ul>\n";

    print TEXI "\@item\n\@strong{$1}\n";
    print TEXI "\@itemize \@minus\n";

    $inRelease = 1;
  }
  elsif ( $line =~ m/^ - (.*)$/ ) {
    my ($htmlLine, $texiLine) = analyze($1);
    print HTML "<li>$htmlLine</li>\n";
    print TEXI "\@item\n$texiLine\n";
  }
}

if ( $inRelease ) {
  print HTML "</ul>\n\n";
  print TEXI "\@end itemize\n\n";
}

print HTML "</html>\n";
print TEXI "\@end itemize\n";

close TEXT or die "Error closing text file \"$text\"\n";
close HTML or die "Error closing html file \"$html\"\n";
close TEXI or die "Error closing TexInfo file \"$texi\"\n";

[Mockpp-commits] mockpp/3party/cxxtest COPYING,NONE,1.1 cxxtestgen.pl,NONE,1.1 cxxtestgen.py,NONE,1.1 cxxtest.spec,NONE,1.1 README,NONE,1.1 TODO,NONE,1.1 Versions,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-09 15:59:19

Update of /cvsroot/mockpp/mockpp/3party/cxxtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31736/3party/cxxtest

Added Files:
	COPYING cxxtestgen.pl cxxtestgen.py cxxtest.spec README TODO 
	Versions 
Log Message:
new

--- NEW FILE: cxxtest.spec ---
Name: cxxtest
Summary: CxxTest Testing Framework for C++
Version: 3.10.1
Release: 1
Copyright: LGPL
Group: Development/C++
Source: cxxtest-%{version}.tar.gz
BuildRoot: /tmp/cxxtest-build
BuildArch: noarch
Prefix: /usr

%description
CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.
Its advantages over existing alternatives are that it:
 - Doesn't require RTTI
 - Doesn't require member template functions
 - Doesn't require exception handling
 - Doesn't require any external libraries (including memory management, 
   file/console I/O, graphics libraries)

%prep
%setup -n cxxtest

%build

%install
install -m 755 -d $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/usr/include/cxxtest
install -m 755 cxxtestgen.p[ly] $RPM_BUILD_ROOT/usr/bin/
install -m 644 cxxtest/* $RPM_BUILD_ROOT/usr/include/cxxtest/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%attr(-, root, root) %doc README
%attr(-, root, root) %doc sample
%attr(-, root, root) /usr/include/cxxtest
%attr(-, root, root) /usr/bin/cxxtestgen.pl
%attr(-, root, root) /usr/bin/cxxtestgen.py


--- NEW FILE: Versions ---
CxxTest Releases
================

Version 3.10.1 (2004-12-01):
----------------------------
 - Improved support for VC7
 - Fixed clash with some versions of STL

Version 3.10.0 (2004-11-20):
----------------------------
 - Added mock framework for global functions
 - Added TS_ASSERT_THROWS_ASSERT and TS_ASSERT_THROWS_EQUALS
 - Added CXXTEST_ENUM_TRAITS
 - Improved support for STL classes (vector, map etc.)
 - Added support for Digital Mars compiler
 - Reduced root/part compilation time and binary size
 - Support C++-style commenting of tests

Version 3.9.1 (2004-01-19):
---------------------------
 - Fixed small bug with runner exit code
 - Embedded test suites are now deprecated

Version 3.9.0 (2004-01-17):
---------------------------
 - Added TS_TRACE
 - Added --no-static-init
 - CxxTest::setAbortTestOnFail() works even without --abort-on-fail

Version 3.8.5 (2004-01-08):
---------------------------
 - Added --no-eh
 - Added CxxTest::setAbortTestOnFail() and CXXTEST_DEFAULT_ABORT
 - Added CxxTest::setMaxDumpSize()
 - Added StdioFilePrinter

Version 3.8.4 (2003-12-31):
---------------------------
 - Split distribution into cxxtest and cxxtest-selftest
 - Added `sample/msvc/FixFiles.bat'

Version 3.8.3 (2003-12-24):
---------------------------
 - Added TS_ASSERT_PREDICATE
 - Template files can now specify where to insert the preamble
 - Added a sample Visual Studio workspace in `sample/msvc'
 - Can compile in MSVC with warning level 4
 - Changed output format slightly

Version 3.8.1 (2003-12-21):
---------------------------
 - Fixed small bug when using multiple --part files.
 - Fixed X11 GUI crash when there's no X server.
 - Added GlobalFixture::setUpWorld()/tearDownWorld()
 - Added leaveOnly(), activateAllTests() and `sample/only.tpl'
 - Should now run without warnings on Sun compiler.

Version 3.8.0 (2003-12-13):
---------------------------
 - Fixed bug where `Root.cpp' needed exception handling
 - Added TS_ASSERT_RELATION
 - TSM_ macros now also tell you what went wrong
 - Renamed Win32Gui::free() to avoid clashes
 - Now compatible with more versions of Borland compiler
 - Improved the documentation

Version 3.7.1 (2003-09-29):
---------------------------
 - Added --version
 - Compiles with even more exotic g++ warnings
 - Win32 Gui compiles with UNICODE
 - Should compile on some more platforms (Sun Forte, HP aCC)

Version 3.7.0 (2003-09-20):
---------------------------
 - Added TS_ASSERT_LESS_THAN_EQUALS
 - Minor cleanups

Version 3.6.1 (2003-09-15):
---------------------------
 - Improved QT GUI
 - Improved portability some more

Version 3.6.0 (2003-09-04):
---------------------------
 - Added --longlong
 - Some portability improvements

Version 3.5.1 (2003-09-03):
---------------------------
 - Major internal rewrite of macros
 - Added TS_ASSERT_SAME_DATA
 - Added --include option
 - Added --part and --root to enable splitting the test runner
 - Added global fixtures
 - Enhanced Win32 GUI with timers, -keep and -title
 - Now compiles with strict warnings

Version 3.1.1 (2003-08-27):
---------------------------
 - Fixed small bug in TS_ASSERT_THROWS_*()

Version 3.1.0 (2003-08-23):
---------------------------
 - Default ValueTraits now dumps value as hex bytes
 - Fixed double invocation bug (e.g. TS_FAIL(functionWithSideEffects()))
 - TS_ASSERT_THROWS*() are now "abort on fail"-friendly
 - Win32 GUI now supports Windows 98 and doesn't need comctl32.lib

Version 3.0.1 (2003-08-07):
---------------------------
 - Added simple GUI for X11, Win32 and Qt
 - Added TS_WARN() macro
 - Removed --exit-code
 - Improved samples
 - Improved support for older (pre-std::) compilers
 - Made a PDF version of the User's Guide

Version 2.8.4 (2003-07-21):
---------------------------
 - Now supports g++-3.3
 - Added --have-eh
 - Fixed bug in numberToString()

Version 2.8.3 (2003-06-30):
---------------------------
 - Fixed bugs in cxxtestgen.pl
 - Fixed warning for some compilers in ErrorPrinter/StdioPrinter
 - Thanks Martin Jost for pointing out these problems!

Version 2.8.2 (2003-06-10):
---------------------------
 - Fixed bug when using CXXTEST_ABORT_TEST_ON_FAIL without standard library
 - Added CXXTEST_USER_TRAITS
 - Added --abort-on-fail

Version 2.8.1 (2003-01-16):
---------------------------
 - Fixed charToString() for negative chars

Version 2.8.0 (2003-01-13):
---------------------------
 - Added CXXTEST_ABORT_TEST_ON_FAIL for xUnit-like behaviour
 - Added `sample/winddk'
 - Improved ValueTraits
 - Improved output formatter
 - Started version history

Version 2.7.0 (2002-09-29):
---------------------------
 - Added embedded test suites
 - Major internal improvements

--- NEW FILE: cxxtestgen.pl ---
#!/usr/bin/perl -w
use strict;
use Getopt::Long;

sub usage() {
  print STDERR "Usage: $0 [OPTIONS] <input file(s)>\n";
  print STDERR "Generate test source file for CxxTest.\n";
  print STDERR "\n";
  print STDERR "  -v, --version        Write CxxTest version\n";
  print STDERR "  -o, --output=NAME    Write output to file NAME\n";
  print STDERR "  --runner=CLASS       Create a main() function that runs CxxTest::CLASS\n";
  print STDERR "  --gui=CLASS          Like --runner, with GUI component\n";
  print STDERR "  --error-printer      Same as --runner=ErrorPrinter\n";
  print STDERR "  --abort-on-fail      Abort tests on failed asserts (like xUnit)\n";
  print STDERR "  --have-std           Use standard library (even if not found in tests)\n";
  print STDERR "  --no-std             Don't use standard library (even if found in tests)\n";
  print STDERR "  --have-eh            Use exception handling (even if not found in tests)\n";
  print STDERR "  --no-eh              Don't use exception handling (even if found in tests)\n";
  print STDERR "  --longlong=[TYPE]    Use TYPE as `long long' (defaut = long long)\n";
  print STDERR "  --template=TEMPLATE  Use TEMPLATE file to generate the test runner\n";
  print STDERR "  --include=HEADER     Include \"HEADER\" in test runner before other headers\n";
  print STDERR "  --root               Write CxxTest globals\n";
  print STDERR "  --part               Don't write CxxTest globals\n";
  print STDERR "  --no-static-init     Don't rely on static initialization\n";
  exit -1;
}

main();

sub main {
  parseCommandline();
  scanInputFiles();
  writeOutput();
}

#
# Handling the command line
#

my ($output, $runner, $gui, $template, $abortOnFail, $haveEh, $noEh, $haveStd, $noStd);
my ($root, $part, $noStaticInit, $longlong, $factor);
my @headers = ();

sub parseCommandline() {
  @ARGV = expandWildcards(@ARGV);
  GetOptions( 'version'        => \&printVersion,
	      'output=s'       => \$output,
	      'template=s'     => \$template,
	      'runner=s'       => \$runner,
	      'gui=s',         => \$gui,
	      'error-printer'  => sub { $runner = 'ErrorPrinter'; $haveStd = 1; },
	      'abort-on-fail'  => \$abortOnFail,
	      'have-eh'        => \$haveEh,
	      'no-eh'          => \$noEh,
	      'have-std'        => \$haveStd,
	      'no-std'          => \$noStd,
	      'include=s'      => \@headers,
	      'root'           => \$root,
	      'part'           => \$part,
	      'no-static-init' => \$noStaticInit,
	      'factor'         => \$factor,
	      'longlong:s'     => \$longlong
	    ) or usage();
  scalar @ARGV or $root or usage();

  if ( defined($noStaticInit) && (defined($root) || defined($part)) ) {
    die "--no-static-init cannot be used with --root/--part\n";
  }

  if ( $gui && !$runner ) {
    $runner = 'StdioPrinter';
  }

  if ( defined($longlong) && !$longlong ) {
    $longlong = 'long long';
  }

  foreach my $header (@headers) {
    if ( !($header =~ m/^["<].*[>"]$/) ) {
      $header = "\"$header\"";
    }
  }
}

sub printVersion() {
  print "This is CxxTest version 3.10.1.\n";
  exit 0;
}

sub expandWildcards() {
  my @result = ();
  while( my $fn = shift @_ ) {
    push @result, glob($fn);
  }
  return @result;
}

#
# Reading the input files and scanning for test cases
#

my (@suites, $suite, $test, $inBlock);
my $numTotalTests = 0;

sub scanInputFiles() {
  foreach my $file (@ARGV) {
    scanInputFile( $file );
  }
  scalar @suites or $root or die("No tests defined\n");
}

sub scanInputFile($) {
  my ($file) = @_;
  open FILE, "<$file" or die("Cannot open input file \"$file\"\n");

  my $line;
  while (defined($line = <FILE>)) {
    scanLineForExceptionHandling( $line );
    scanLineForStandardLibrary( $line );

    scanLineForSuiteStart( $file, $., $line );

    if ( $suite ) {
      if ( lineBelongsToSuite( $suite, $., $line ) ) {
	scanLineForTest( $., $line );
	scanLineForCreate( $., $line );
	scanLineForDestroy( $., $line );
      }
    }
  }
  closeSuite();
  close FILE;
}

sub lineBelongsToSuite($$$) {
  my ($suite, $lineNo, $line) = @_;
  if ( !$suite->{'generated'} ) {
    return 1;
  }

  if ( !$inBlock ) {
    $inBlock = lineStartsBlock( $line );
  }
  if ( $inBlock ) {
    addLineToBlock( $suite->{'file'}, $lineNo, $line );
  }
  return $inBlock;
}

sub scanLineForExceptionHandling($) {
  my ($line) = @_;
  if ( $line =~ m/\b(try|throw|catch|TSM?_ASSERT_THROWS[A-Z_]*)\b/ ) {
    addExceptionHandling();
  }
}

sub scanLineForStandardLibrary($) {
  my ($line) = @_;
  if ( $line =~ m/\b(std\s*::|CXXTEST_STD|using\s+namespace\s+std\b|^\s*\#\s*include\s+<[a-z0-9]+>)/ ) {
    addStandardLibrary();
  }
}

sub scanLineForSuiteStart($$$) {
  my ($fileName, $lineNo, $line) = @_;
  if ( $line =~ m/\bclass\s+(\w+)\s*:\s*public\s+((::)?\s*CxxTest\s*::\s*)?TestSuite\b/ ) {
    startSuite( $1, $fileName, $lineNo, 0 );
  }
  if ( $line =~ m/\bCXXTEST_SUITE\s*\(\s*(\w*)\s*\)/ ) {
    print "$fileName:$lineNo: Warning: Inline test suites are deprecated.\n";
    startSuite( $1, $fileName, $lineNo, 1 );
  }
}

sub startSuite($$$$) {
  my ($name, $file, $line, $generated) = @_;
  closeSuite();
  $suite = { 'name' => $name,
	     'file' => $file,
	     'line' => $line,
	     'generated' => $generated,
	     'create' => 0,
	     'destroy' => 0,
	     'tests' => [],
	     'lines' => [] };
}

sub lineStartsBlock($) {
  my ($line) = @_;
  return $line =~ m/\bCXXTEST_CODE\s*\(/;
}

sub scanLineForTest($$) {
  my ($lineNo, $line) = @_;
  if ( $line =~ m/^([^\/]|\/[^\/])*\bvoid\s+([Tt]est\w+)\s*\(\s*(void)?\s*\)/ ) {
    addTest( $2, $lineNo );
  }
}

sub addTest($$$) {
  my ($name, $line) = @_;
  $test = { 'name' => $name,
	    'line' => $line };
  push @{suiteTests()}, $test;
}

sub addLineToBlock($$$) {
  my ($fileName, $lineNo, $line) = @_;
  $line = fixBlockLine( $fileName, $lineNo, $line );
  $line =~ s/^.*\{\{//;
  my $end = ($line =~ s/\}\}.*//s);
  push @{$suite->{'lines'}}, $line;
  if ( $end ) {
    $inBlock = 0;
  }
}

sub fixBlockLine($$$) {
  my ($fileName, $lineNo, $line) = @_;
  my $fileLine = cstr($fileName) . "," . $lineNo;
  $line =~ s/\b(E?TSM?_(ASSERT[A-Z_]*|FAIL))\s*\(/_$1($fileLine,/g;
  return $line;
}

sub scanLineForCreate($$) {
  my ($lineNo, $line) = @_;
  if ( $line =~ m/\bstatic\s+\w+\s*\*\s*createSuite\s*\(\s*(void)?\s*\)/ ) {
    addCreateSuite( $lineNo );
  }
}

sub scanLineForDestroy($$) {
  my ($lineNo, $line) = @_;
  if ( $line =~ m/\bstatic\s+void\s+destroySuite\s*\(\s*\w+\s*\*\s*\w*\s*\)/ ) {
    addDestroySuite( $lineNo );
  }
}

sub closeSuite() {
  if ( $suite && scalar @{suiteTests()} ) {
    verifySuite();
    rememberSuite();
  }
  undef $suite;
}

sub addCreateSuite($) {
  $suite->{'createSuite'} = $_[0];
}

sub addDestroySuite($) {
  $suite->{'destroySuite'} = $_[0];
}

sub addExceptionHandling() {
  $haveEh = 1 unless defined($noEh);
}

sub addStandardLibrary() {
  $haveStd = 1 unless defined($noStd);
}

sub verifySuite() {
  if (suiteCreateLine() || suiteDestroyLine()) {
    die("Suite ", suiteName(), "  must have both createSuite() and destroySuite()\n")
      unless (suiteCreateLine() && suiteDestroyLine());
  }
}

sub rememberSuite() {
  push @suites, $suite;
  $numTotalTests += scalar @{$suite->{'tests'}};
}

sub suiteName() { return $suite->{'name'}; }
sub suiteTests() { return $suite->{'tests'}; }
sub suiteCreateLine() { return $suite->{'createSuite'}; }
sub suiteDestroyLine() { return $suite->{'destroySuite'}; }
sub fileName() { return $suite->{'file'}; }
sub fileString() { return cstr(fileName()); }
sub testName() { return $test->{'name'}; }
sub testLine() { return $test->{'line'}; }

sub suiteObject() { return "suite_".suiteName(); }

sub cstr($) {
  my $file = $_[0];
  $file =~ s/\\/\\\\/g;
  return "\"".$file."\"";
}

#
# Writing the test source file
#

sub writeOutput() {
  $template ? writeTemplateOutput() : writeSimpleOutput();
}

sub startOutputFile() {
  if ( !standardOutput() ) {
    open OUTPUT_FILE,">$output" or die("Cannot create output file \"$output\"\n");
    select OUTPUT_FILE;
  }
  print "/* Generated file, do not edit */\n\n";
}

sub standardOutput() {
  return !$output;
}

sub writeSimpleOutput() {
  startOutputFile();
  writePreamble();
  writeMain();
  writeWorld();
}

my ($didPreamble, $didWorld);

sub writeTemplateOutput() {
  openTemplateFile();
  startOutputFile();
  my $line;
  while (defined($line = <TEMPLATE_FILE>)) {
    if ( $line =~ m/^\s*\#\s*include\s*<cxxtest\// ) {
      writePreamble();
      print $line;
    } elsif ( $line =~ m/^\s*<CxxTest\s+preamble>\s*$/ ) {
      writePreamble();
    } elsif ( $line =~ m/^\s*<CxxTest\s+world>\s*$/ ) {
      writeWorld();
    } else {
      print $line;
    }
  }
}

sub openTemplateFile() {
  open TEMPLATE_FILE, "<$template" or die("Cannot open template file \"$template\"\n");
}

sub writePreamble() {
  return if $didPreamble;
  print "#ifndef CXXTEST_RUNNING\n";
  print "#define CXXTEST_RUNNING\n";
  print "#endif\n";
  print "\n";
  if ( $haveStd ) {
    print "#define _CXXTEST_HAVE_STD\n";
  }
  if ( $haveEh ) {
    print "#define _CXXTEST_HAVE_EH\n";
  }
  if ( $abortOnFail ) {
    print "#define _CXXTEST_ABORT_TEST_ON_FAIL\n";
  }
  if ( $longlong ) {
    print "#define _CXXTEST_LONGLONG $longlong\n";
  }
  if ( $factor ) {
    print "#define _CXXTEST_FACTOR\n";
  }
  foreach my $header (@headers) {
    print "#include $header\n";
  }
  print "#include <cxxtest/TestListener.h>\n";
  print "#include <cxxtest/TestTracker.h>\n";
  print "#include <cxxtest/TestRunner.h>\n";
  print "#include <cxxtest/RealDescriptions.h>\n";
  print "#include <cxxtest/$runner.h>\n" if $runner;
  print "#include <cxxtest/$gui.h>\n" if $gui;
  print "\n";
  $didPreamble = 1;
}

sub writeWorld() {
  return if $didWorld;
  writePreamble();
  writeSuites();
  ($root or !$part) and writeRoot();
  $noStaticInit and writeInitialize();
  $didWorld = 1;
}

sub writeSuites() {
  foreach (@suites) {
    $suite = $_;
    writeInclude(fileName());
    if ( $suite->{'generated'} ) { generateSuite(); }
    dynamicSuite() ? writeSuitePointer() : writeSuiteObject();
    writeTestList();
    writeSuiteDescription();
    writeTestDescriptions();
  }
}

sub dynamicSuite() {
  return suiteCreateLine();
}

my $lastIncluded;

sub writeInclude($) {
  my $file = $_[0];
  return if $lastIncluded && ($file eq $lastIncluded);
  print "#include \"$file\"\n\n";
  $lastIncluded = $file;
}

sub generateSuite() {
  print "class ", suiteName(), " : public CxxTest::TestSuite {\n";
  print "public:\n";
  foreach my $line (@{$suite->{'lines'}}) {
    print $line;
  }
  print "};\n\n";
}

sub writeTestDescriptionsBase() {
  my $class = "TestDescriptionBase_" . suiteName();
  print "class $class : public CxxTest::TestDescription {\n";
  print "public:\n";
  print " const char *file() const { return ", fileString(), "; }\n";
  print " const char *suiteName() const { return \"", suiteName(), "\"; }\n";
  print "};\n\n";
}

sub writeSuitePointer() {
  if ( $noStaticInit ) {
    print "static ", suiteName(), " *", suiteObject(), ";\n\n";
  } else {
    print "static ", suiteName(), " *", suiteObject(), " = 0;\n\n";
  }
}

sub writeSuiteObject() {
  print "static ", suiteName(), " ", suiteObject(), ";\n\n";
}

sub testList() {
  return "Tests_" . suiteName();
}

sub writeTestList() {
  if ( $noStaticInit ) {
    printf "static CxxTest::List %s;\n", testList();
  } else {
    printf "static CxxTest::List %s = { 0, 0 };\n", testList();
  }
}

sub writeTestDescriptions() {
  foreach (@{suiteTests()}) {
    $test = $_;
    writeTestDescription();
  }
}

sub suiteDescription() {
  return "suiteDescription_" . suiteName();
}

sub writeTestDescription() {
  my $class = "TestDescription_" . suiteName() . "_" . testName();
  printf "static class $class : public CxxTest::RealTestDescription {\n";
  printf "public:\n";
  $noStaticInit or
    printf " $class() : CxxTest::RealTestDescription( %s, %s, %s, \"%s\" ) {}\n",
      testList(), suiteDescription(), testLine(), testName();
  printf " void runTest() { %s }\n", dynamicSuite() ? dynamicRun() : staticRun();
  printf "} testDescription_%s_%s;\n\n", suiteName(), testName();
}

sub dynamicRun() {
  return sprintf( "if ( %s ) %s->%s();", suiteObject(), suiteObject(), testName() );
}

sub staticRun() {
  return sprintf( "%s.%s();", suiteObject(), testName() );
}

sub writeSuiteDescription() {
  dynamicSuite() ? writeDynamicDescription() : writeStaticDescription();
}

sub writeDynamicDescription() {
  printf "CxxTest::DynamicSuiteDescription<%s> %s", suiteName(), suiteDescription();
  if ( !$noStaticInit ) {
    printf "( %s, %s, \"%s\", %s, %s, %s, %s )",
      fileString(), $suite->{'line'}, suiteName(), testList(),
	suiteObject(), suiteCreateLine(), suiteDestroyLine();
  }
  print ";\n\n";
}

sub writeStaticDescription() {
  printf "CxxTest::StaticSuiteDescription %s", suiteDescription();
  if ( !$noStaticInit ) {
    printf "( %s, %s, \"%s\", %s, %s )", fileString(), $suite->{'line'}, suiteName(), suiteObject(), testList();
  }
  print ";\n\n";
}

sub writeRoot() {
  print "#include <cxxtest/Root.cpp>\n";
}

sub writeInitialize() {
  print "namespace CxxTest {\n";
  print " void initialize()\n";
  print " {\n";
  foreach (@suites) {
    $suite = $_;
    printf "  %s.initialize();\n", testList();
    if ( dynamicSuite() ) {
      printf "  %s = 0;\n", suiteObject();
      printf "  %s.initialize( %s, %s, \"%s\", %s, %s, %s, %s );\n",
	suiteDescription(), fileString(), $suite->{'line'}, suiteName(), testList(),
	  suiteObject(), suiteCreateLine(), suiteDestroyLine();
    } else {
      printf "  %s.initialize( %s, %s, \"%s\", %s, %s );\n",
	suiteDescription(), fileString(), $suite->{'line'}, suiteName(), suiteObject(), testList();
    }

    foreach (@{suiteTests()}) {
      $test = $_;
      printf "  testDescription_%s_%s.initialize( %s, %s, %s, \"%s\" );\n",
	suiteName(), testName(), testList(), suiteDescription(), testLine(), testName();
    }
  }
  print " }\n";
  print "}\n";
}

sub writeMain() {
  if ( $gui ) {
    print "int main( int argc, char *argv[] ) {\n";
    $noStaticInit &&
      print " CxxTest::initialize();\n";
    print " return CxxTest::GuiTuiRunner<CxxTest::$gui, CxxTest::$runner>( argc, argv ).run();\n";
    print "}\n";
  }
  elsif ( $runner ) {
    print "int main() {\n";
    $noStaticInit &&
      print " CxxTest::initialize();\n";
    print " return CxxTest::$runner().run();\n";
    print "}\n";
  }
}

--- NEW FILE: COPYING ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!



--- NEW FILE: README ---
Introduction
------------

CxxTest is a JUnit/CppUnit/xUnit-like framework for C++.

Its advantages over existing alternatives are that it:
 - Doesn't require RTTI
 - Doesn't require member template functions
 - Doesn't require exception handling
 - Doesn't require any external libraries (including memory management, 
   file/console I/O, graphics libraries)

This makes it extremely portable and usable.

CxxTest is available under the GNU Lesser General Public Licence (LGPL).
See http://www.gnu.org/copyleft/lesser.html for the license.

Simple user's guide
-------------------

1. Create a test suite header file:

MyTest.h:
  #include <cxxtest/TestSuite.h>

  class MyTestSuite : public CxxTest::TestSuite 
  {
  public:
      void testAddition( void )
      {
          TS_ASSERT( 1 + 1 > 1 );
          TS_ASSERT_EQUALS( 1 + 1, 2 );
      }
  };


2. Generate the tests file:

 # cxxtestgen.pl -o tests.cpp MyTestSuite.h


3. Create a main function that runs the tests

main.cpp:
  #include <cxxtest/ErrorPrinter.h>

  int main( void )
  {
      CxxText::ErrorPrinter::runAllTests();
      return 0;
  }


4. Compile and run!

  # g++ -o main main.cpp tests.cpp
  # ./main
  Running 1 test(s).OK!


Advanced User's Guide
---------------------
See docs/guide.html.

--- NEW FILE: cxxtestgen.py ---
#!/usr/bin/python
'''Usage: %s [OPTIONS] <input file(s)>
Generate test source file for CxxTest.

  -v, --version          Write CxxTest version
  -o, --output=NAME      Write output to file NAME
  --runner=CLASS         Create a main() function that runs CxxTest::CLASS
  --gui=CLASS            Like --runner, with GUI component
  --error-printer        Same as --runner=ErrorPrinter
  --abort-on-fail        Abort tests on failed asserts (like xUnit)
  --have-std             Use standard library (even if not found in tests)
  --no-std               Don\'t use standard library (even if found in tests)
  --have-eh              Use exception handling (even if not found in tests)
  --no-eh                Don\'t use exception handling (even if found in tests)
  --longlong=[TYPE]      Use TYPE (default: long long) as long long
  --template=TEMPLATE    Use TEMPLATE file to generate the test runner
  --include=HEADER       Include HEADER in test runner before other headers
  --root                 Write CxxTest globals
  --part                 Don\'t write CxxTest globals
  --no-static-init       Don\'t rely on static initialization
'''

import re
import sys
import getopt
import glob
import string

# Global variables
suites = []
suite = None
inBlock = 0

outputFileName = None
runner = None
gui = None
root = None
part = None
noStaticInit = None
templateFileName = None
headers = []

haveExceptionHandling = 0
noExceptionHandling = 0
haveStandardLibrary = 0
noStandardLibrary = 0
abortOnFail = 0
factor = 0
longlong = 0

def main():
    '''The main program'''
    files = parseCommandline()
    scanInputFiles( files )
    writeOutput()

def usage( problem = None ):
    '''Print usage info and exit'''
    if problem is None:
        print usageString()
        sys.exit(0)
    else:
        sys.stderr.write( usageString() )
        abort( problem )

def usageString():
    '''Construct program usage string'''
    return __doc__ % sys.argv[0]

def abort( problem ):
    '''Print error message and exit'''
    sys.stderr.write( '\n' )
    sys.stderr.write( problem )
    sys.stderr.write( '\n\n' )
    sys.exit(2)

def parseCommandline():
    '''Analyze command line arguments'''
    try:
        options, patterns = getopt.getopt( sys.argv[1:], 'o:r:',
                                           ['version', 'output=', 'runner=', 'gui=',
                                            'error-printer', 'abort-on-fail', 'have-std', 'no-std',
                                            'have-eh', 'no-eh', 'template=', 'include=',
                                            'root', 'part', 'no-static-init', 'factor', 'longlong='] )
    except getopt.error, problem:
        usage( problem )
    setOptions( options )
    return setFiles( patterns )

def setOptions( options ):
    '''Set options specified on command line'''
    global outputFileName, templateFileName, runner, gui, haveStandardLibrary, factor, longlong
    global haveExceptionHandling, noExceptionHandling, abortOnFail, headers, root, part, noStaticInit
    for o, a in options:
        if o in ('-v', '--version'):
            printVersion()
        elif o in ('-o', '--output'):
            outputFileName = a
        elif o == '--template':
            templateFileName = a
        elif o == '--runner':
            runner = a
        elif o == '--gui':
            gui = a
        elif o == '--include':
            if not re.match( r'^["<].*[>"]$', a ):
                a = ('"%s"' % a)
            headers.append( a )
        elif o == '--error-printer':
            runner = 'ErrorPrinter'
            haveStandardLibrary = 1
        elif o == '--abort-on-fail':
            abortOnFail = 1
        elif o == '--have-std':
            haveStandardLibrary = 1
        elif o == '--no-std':
            noStandardLibrary = 1
        elif o == '--have-eh':
            haveExceptionHandling = 1
        elif o == '--no-eh':
            noExceptionHandling = 1
        elif o == '--root':
            root = 1
        elif o == '--part':
            part = 1
        elif o == '--no-static-init':
            noStaticInit = 1
        elif o == '--factor':
            factor = 1
        elif o == '--longlong':
            if a:
                longlong = a
            else:
                longlong = 'long long'

    if noStaticInit and (root or part):
        abort( '--no-static-init cannot be used with --root/--part' )

    if gui and not runner:
        runner = 'StdioPrinter'

def printVersion():
    '''Print CxxTest version and exit'''
    sys.stdout.write( "This is CxxTest version 3.10.1.\n" )
    sys.exit(0)

def setFiles( patterns ):
    '''Set input files specified on command line'''
    files = expandWildcards( patterns )
    if len(files) is 0 and not root:
        usage( "No input files found" )
    return files

def expandWildcards( patterns ):
    '''Expand all wildcards in an array (glob)'''
    fileNames = []
    for pathName in patterns:
        patternFiles = glob.glob( pathName )
        for fileName in patternFiles:
            fileNames.append( fixBackslashes( fileName ) )
    return fileNames

def fixBackslashes( fileName ):
    '''Convert backslashes to slashes in file name'''
    return re.sub( r'\\', '/', fileName, 0 )

def scanInputFiles(files):
    '''Scan all input files for test suites'''
    for file in files:
        scanInputFile(file)
    global suites
    if len(suites) is 0 and not root:
        abort( 'No tests defined' )

def scanInputFile(fileName):
    '''Scan single input file for test suites'''
    file = open(fileName)
    lineNo = 0
    while 1:
        line = file.readline()
        if not line:
            break
        lineNo = lineNo + 1

        scanInputLine( fileName, lineNo, line )
    closeSuite()
    file.close()

def scanInputLine( fileName, lineNo, line ):
    '''Scan single input line for interesting stuff'''
    scanLineForExceptionHandling( line )
    scanLineForStandardLibrary( line )

    scanLineForSuiteStart( fileName, lineNo, line )

    global suite
    if suite:
        scanLineInsideSuite( suite, lineNo, line )

def scanLineInsideSuite( suite, lineNo, line ):
    '''Analyze line which is part of a suite'''
    global inBlock
    if lineBelongsToSuite( suite, lineNo, line ):
        scanLineForTest( suite, lineNo, line )
        scanLineForCreate( suite, lineNo, line )
        scanLineForDestroy( suite, lineNo, line )

def lineBelongsToSuite( suite, lineNo, line ):
    '''Returns whether current line is part of the current suite.
    This can be false when we are in a generated suite outside of CXXTEST_CODE() blocks
    If the suite is generated, adds the line to the list of lines'''
    if not suite['generated']:
        return 1

    global inBlock
    if not inBlock:
        inBlock = lineStartsBlock( line )
    if inBlock:
        inBlock = addLineToBlock( suite, lineNo, line )
    return inBlock


std_re = re.compile( r"\b(std\s*::|CXXTEST_STD|using\s+namespace\s+std\b|^\s*\#\s*include\s+<[a-z0-9]+>)" )
def scanLineForStandardLibrary( line ):
    '''Check if current line uses standard library'''
    global haveStandardLibrary, noStandardLibrary
    if not haveStandardLibrary and std_re.search(line):
        if not noStandardLibrary:
            haveStandardLibrary = 1

exception_re = re.compile( r"\b(throw|try|catch|TSM?_ASSERT_THROWS[A-Z_]*)\b" )
def scanLineForExceptionHandling( line ):
    '''Check if current line uses exception handling'''
    global haveExceptionHandling, noExceptionHandling
    if not haveExceptionHandling and exception_re.search(line):
        if not noExceptionHandling:
            haveExceptionHandling = 1

suite_re = re.compile( r'\bclass\s+(\w+)\s*:\s*public\s+((::)?\s*CxxTest\s*::\s*)?TestSuite\b' )
generatedSuite_re = re.compile( r'\bCXXTEST_SUITE\s*\(\s*(\w*)\s*\)' )
def scanLineForSuiteStart( fileName, lineNo, line ):
    '''Check if current line starts a new test suite'''
    m = suite_re.search( line )
    if m:
        startSuite( m.group(1), fileName, lineNo, 0 )
    m = generatedSuite_re.search( line )
    if m:
        sys.stdout.write( "%s:%s: Warning: Inline test suites are deprecated.\n" % (fileName, lineNo) )
        startSuite( m.group(1), fileName, lineNo, 1 )

def startSuite( name, file, line, generated ):
    '''Start scanning a new suite'''
    global suite
    closeSuite()
    suite = { 'name'         : name,
              'file'         : file,
              'cfile'        : cstr(file),
              'line'         : line,
              'generated'    : generated,
              'object'       : 'suite_%s' % name,
              'dobject'      : 'suiteDescription_%s' % name,
              'tlist'        : 'Tests_%s' % name,
              'tests'        : [],
              'lines'        : [] }

def lineStartsBlock( line ):
    '''Check if current line starts a new CXXTEST_CODE() block'''
    return re.search( r'\bCXXTEST_CODE\s*\(', line ) is not None

test_re = re.compile( r'^([^/]|/[^/])*\bvoid\s+([Tt]est\w+)\s*\(\s*(void)?\s*\)' )
def scanLineForTest( suite, lineNo, line ):
    '''Check if current line starts a test'''
    m = test_re.search( line )
    if m:
        addTest( suite, m.group(2), lineNo )

def addTest( suite, name, line ):
    '''Add a test function to the current suite'''
    test = { 'name'   : name,
             'suite'  : suite,
             'class'  : 'TestDescription_%s_%s' % (suite['name'], name),
             'object' : 'testDescription_%s_%s' % (suite['name'], name),
             'line'   : line,
             }
    suite['tests'].append( test )

def addLineToBlock( suite, lineNo, line ):
    '''Append the line to the current CXXTEST_CODE() block'''
    line = fixBlockLine( suite, lineNo, line )
    line = re.sub( r'^.*\{\{', '', line )
    
    e = re.search( r'\}\}', line )
    if e:
        line = line[:e.start()]
    suite['lines'].append( line )
    return e is None

def fixBlockLine( suite, lineNo, line):
    '''Change all [E]TS_ macros used in a line to _[E]TS_ macros with the correct file/line'''
    return re.sub( r'\b(E?TSM?_(ASSERT[A-Z_]*|FAIL))\s*\(',
                   r'_\1(%s,%s,' % (suite['cfile'], lineNo),
                   line, 0 )

create_re = re.compile( r'\bstatic\s+\w+\s*\*\s*createSuite\s*\(\s*(void)?\s*\)' )
def scanLineForCreate( suite, lineNo, line ):
    '''Check if current line defines a createSuite() function'''
    if create_re.search( line ):
        addSuiteCreateDestroy( suite, 'create', lineNo )

destroy_re = re.compile( r'\bstatic\s+void\s+destroySuite\s*\(\s*\w+\s*\*\s*\w*\s*\)' )
def scanLineForDestroy( suite, lineNo, line ):
    '''Check if current line defines a destroySuite() function'''
    if destroy_re.search( line ):
        addSuiteCreateDestroy( suite, 'destroy', lineNo )

def cstr( str ):
    '''Convert a string to its C representation'''
    return '"' + string.replace( str, '\\', '\\\\' ) + '"'


def addSuiteCreateDestroy( suite, which, line ):
    '''Add createSuite()/destroySuite() to current suite'''
    if suite.has_key(which):
        abort( '%s:%s: %sSuite() already declared' % ( suite['file'], str(line), which ) )
    suite[which] = line

def closeSuite():
    '''Close current suite and add it to the list if valid'''
    global suite
    if suite is not None:
        if len(suite['tests']) is not 0:
            verifySuite(suite)
            rememberSuite(suite)
        suite = None

def verifySuite(suite):
    '''Verify current suite is legal'''
    if suite.has_key('create') and not suite.has_key('destroy'):
        abort( '%s:%s: Suite %s has createSuite() but no destroySuite()' %
               (suite['file'], suite['create'], suite['name']) )
    if suite.has_key('destroy') and not suite.has_key('create'):
        abort( '%s:%s: Suite %s has destroySuite() but no createSuite()' %
               (suite['file'], suite['destroy'], suite['name']) )

def rememberSuite(suite):
    '''Add current suite to list'''
    global suites
    suites.append( suite )

def writeOutput():
    '''Create output file'''
    if templateFileName:
        writeTemplateOutput()
    else:
        writeSimpleOutput()

def writeSimpleOutput():
    '''Create output not based on template'''
    output = startOutputFile()
    writePreamble( output )
    writeMain( output )
    writeWorld( output )
    output.close()

include_re = re.compile( r"\s*\#\s*include\s+<cxxtest/" )
preamble_re = re.compile( r"^\s*<CxxTest\s+preamble>\s*$" )
world_re...
 
[truncated message content]

[Mockpp-commits] mockpp/3party/cxxtest/docs - New directory

From: Ewald A. <ewa...@us...> - 2005-12-09 15:58:37

Update of /cvsroot/mockpp/mockpp/3party/cxxtest/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31539/3party/cxxtest/docs

Log Message:
Directory /cvsroot/mockpp/mockpp/3party/cxxtest/docs added to the repository

[Mockpp-commits] mockpp/3party/cxxtest/cxxtest Descriptions.cpp,NONE,1.1 Descriptions.h,NONE,1.1 DummyDescriptions.cpp,NONE,1.1 DummyDescriptions.h,NONE,1.1 ErrorFormatter.h,NONE,1.1 ErrorPrinter.h,NONE,1.1 Flags.h,NONE,1.1 GlobalFixture.cpp,NONE,1.1 GlobalFixture.h,NONE,1.1 Gui.h,NONE,1.1 LinkedList.cpp,NONE,1.1 LinkedList.h,NONE,1.1 Mock.h,NONE,1.1 ParenPrinter.h,NONE,1.1 QtGui.h,NONE,1.1 RealDescriptions.cpp,NONE,1.1 RealDescriptions.h,NONE,1.1 Root.cpp,NONE,1.1 SelfTest.h,NONE,1.1 StdHeaders.h,NONE,1.1 StdioFilePrinter.h,NONE,1.1 StdioPrinter.h,NONE,1.1 StdValueTraits.h,NONE,1.1 TeeListener.h,NONE,1.1 TestListener.h,NONE,1.1 TestRunner.h,NONE,1.1 TestSuite.cpp,NONE,1.1 TestSuite.h,NONE,1.1 TestTracker.cpp,NONE,1.1 TestTracker.h,NONE,1.1 ValueTraits.cpp,NONE,1.1 ValueTraits.h,NONE,1.1 Win32Gui.h,NONE,1.1 X11Gui.h,NONE,1.1 YesNoRunner.h,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-09 15:58:00

Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31329/3party/cxxtest/cxxtest

Added Files:
	Descriptions.cpp Descriptions.h DummyDescriptions.cpp 
	DummyDescriptions.h ErrorFormatter.h ErrorPrinter.h Flags.h 
	GlobalFixture.cpp GlobalFixture.h Gui.h LinkedList.cpp 
	LinkedList.h Mock.h ParenPrinter.h QtGui.h 
	RealDescriptions.cpp RealDescriptions.h Root.cpp SelfTest.h 
	StdHeaders.h StdioFilePrinter.h StdioPrinter.h 
	StdValueTraits.h TeeListener.h TestListener.h TestRunner.h 
	TestSuite.cpp TestSuite.h TestTracker.cpp TestTracker.h 
	ValueTraits.cpp ValueTraits.h Win32Gui.h X11Gui.h 
	YesNoRunner.h 
Log Message:
new

--- NEW FILE: TestSuite.cpp ---
#ifndef __cxxtest__TestSuite_cpp__
#define __cxxtest__TestSuite_cpp__

#include <cxxtest/TestSuite.h>

namespace CxxTest
{
    //
    // TestSuite members
    //
    TestSuite::~TestSuite() {}
    void TestSuite::setUp() {}
    void TestSuite::tearDown() {}

    //
    // Test-aborting stuff
    //
    static bool currentAbortTestOnFail = false;

    bool abortTestOnFail()
    {
        return currentAbortTestOnFail;
    }

    void setAbortTestOnFail( bool value )
    {
        currentAbortTestOnFail = value;
    }
    
    void doAbortTest()
    {
#   if defined(_CXXTEST_HAVE_EH)
        if ( currentAbortTestOnFail )
            throw AbortTest();
#   endif // _CXXTEST_HAVE_EH
    }

    //
    // Max dump size
    //
    static unsigned currentMaxDumpSize = CXXTEST_MAX_DUMP_SIZE;

    unsigned maxDumpSize()
    {
        return currentMaxDumpSize;
    }
    
    void setMaxDumpSize( unsigned value )
    {
        currentMaxDumpSize = value;
    }

    //
    // Some non-template functions
    //
    void doTrace( const char *file, unsigned line, const char *message )
    {
        tracker().trace( file, line, message );
    }

    void doWarn( const char *file, unsigned line, const char *message )
    {
        tracker().warning( file, line, message );
    }

    void doFailTest( const char *file, unsigned line, const char *message )
    {
        tracker().failedTest( file, line, message );
        TS_ABORT();
    }

    void doFailAssert( const char *file, unsigned line,
                       const char *expression, const char *message )
    {
        if ( message )
            tracker().failedTest( file, line, message );
        tracker().failedAssert( file, line, expression );
        TS_ABORT();
    }

    bool sameData( const void *x, const void *y, unsigned size )
    {
        if ( size == 0 )
            return true;
        
        if ( x == y )
            return true;

        if ( !x || !y )
            return false;

        const char *cx = (const char *)x;
        const char *cy = (const char *)y;
        while ( size -- )
            if ( *cx++ != *cy++ )
                return false;

        return true;
    }

    void doAssertSameData( const char *file, unsigned line,
                           const char *xExpr, const void *x,
                           const char *yExpr, const void *y,
                           const char *sizeExpr, unsigned size,
                           const char *message )
    {
        if ( !sameData( x, y, size ) ) {
            if ( message )
                tracker().failedTest( file, line, message );
            tracker().failedAssertSameData( file, line, xExpr, yExpr, sizeExpr, x, y, size );
            TS_ABORT();
        }
    }

    void doFailAssertThrows( const char *file, unsigned line,
                             const char *expr, const char *type,
                             bool otherThrown,
                             const char *message )
    {
        if ( message )
            tracker().failedTest( file, line, message );
        
        tracker().failedAssertThrows( file, line, expr, type, otherThrown );
        TS_ABORT();
    }

    void doFailAssertThrowsNot( const char *file, unsigned line,
                                const char *expression, const char *message )
    {
        if ( message )
            tracker().failedTest( file, line, message );
        
        tracker().failedAssertThrowsNot( file, line, expression );
        TS_ABORT();
    }
};

#endif // __cxxtest__TestSuite_cpp__

--- NEW FILE: QtGui.h ---
#ifndef __cxxtest__QtGui_h__
#define __cxxtest__QtGui_h__

//
// The QtGui displays a simple progress bar using the Qt Toolkit.  It
// has been tested with versions 2.x and 3.x.
// 
// Apart from normal Qt command-line arguments, it accepts the following options:
//   -minimized    Start minimized, pop up on error
//   -keep         Don't close the window at the end
//   -title TITLE  Set the window caption
//
// If both are -minimized and -keep specified, GUI will only keep the
// window if it's in focus.
//

#include <cxxtest/Gui.h>

#include <qapplication.h>
#include <qglobal.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qmessagebox.h>
#include <qpixmap.h>
#include <qprogressbar.h>
#include <qstatusbar.h>

namespace CxxTest
{
    class QtGui : public GuiListener
    {
    public:
        void enterGui( int &argc, char **argv )
        {
            parseCommandLine( argc, argv );
            createApplication( argc, argv );
        }

        void enterWorld( const WorldDescription &wd )
        {
            createWindow( wd );
            processEvents();
        }

        void guiEnterSuite( const char *suiteName )
        {
            showSuiteName( suiteName );
        }

        void guiEnterTest( const char *suiteName, const char *testName )
        {
            setCaption( suiteName, testName );
            advanceProgressBar();
            showTestName( testName );
            showTestsDone( _progressBar->progress() );
            processEvents();
        }

        void yellowBar()
        {
            setColor( 255, 255, 0 );
            setIcon( QMessageBox::Warning );
            getTotalTests();
            processEvents();
        }
        
        void redBar()
        {
            if ( _startMinimized && _mainWindow->isMinimized() )
                showNormal();
            setColor( 255, 0, 0 );
            setIcon( QMessageBox::Critical );
            getTotalTests();
            processEvents();
        }

        void leaveGui()
        {
            if ( keep() ) {
                showSummary();
                _application->exec();
            }
            else
                _mainWindow->close( true );
        }

    private:
        QString _title;
        bool _startMinimized, _keep;
        unsigned _numTotalTests;
        QString _strTotalTests;
        QApplication *_application;
        QWidget *_mainWindow;
        QVBoxLayout *_layout;
        QProgressBar *_progressBar;
        QStatusBar *_statusBar;
        QLabel *_suiteName, *_testName, *_testsDone;

        void parseCommandLine( int argc, char **argv )
        {
            _startMinimized = _keep = false;
            _title = argv[0];
            
            for ( int i = 1; i < argc; ++ i ) {
                QString arg( argv[i] );
                if ( arg == "-minimized" )
                    _startMinimized = true;
                else if ( arg == "-keep" )
                    _keep = true;
                else if ( arg == "-title" && (i + 1 < argc) )
                    _title = argv[++i];
            }
        }

        void createApplication( int &argc, char **argv )
        {
            _application = new QApplication( argc, argv );
        }       
        
        void createWindow( const WorldDescription &wd )
        {
            getTotalTests( wd );            
            createMainWindow();
            createProgressBar();
            createStatusBar();
            setMainWidget();
            if ( _startMinimized )
                showMinimized();
            else
                showNormal();
        }

        void getTotalTests()
        {
            getTotalTests( tracker().world() );
        }

        void getTotalTests( const WorldDescription &wd )
        {
            _numTotalTests = wd.numTotalTests();
            char s[WorldDescription::MAX_STRLEN_TOTAL_TESTS];
            _strTotalTests = wd.strTotalTests( s );
        }

        void createMainWindow()
        {
            _mainWindow = new QWidget();
            _layout = new QVBoxLayout( _mainWindow );
        }

        void createProgressBar()
        {
            _layout->addWidget( _progressBar = new QProgressBar( _numTotalTests, _mainWindow ) );
            _progressBar->setProgress( 0 );
            setColor( 0, 255, 0 );
            setIcon( QMessageBox::Information );
        }

        void createStatusBar()
        {
            _layout->addWidget( _statusBar = new QStatusBar( _mainWindow ) );
            _statusBar->addWidget( _suiteName = new QLabel( _statusBar ), 2 );
            _statusBar->addWidget( _testName = new QLabel( _statusBar ), 4 );
            _statusBar->addWidget( _testsDone = new QLabel( _statusBar ), 1 );
        }

        void setMainWidget()
        {
            _application->setMainWidget( _mainWindow );
        }

        void showMinimized()
        {
            _mainWindow->showMinimized();
        }

        void showNormal()
        {
            _mainWindow->showNormal();
            centerWindow();
        }

        void setCaption( const QString &suiteName, const QString &testName )
        {
            _mainWindow->setCaption( _title + " - " + suiteName + "::" + testName + "()" );
        }

        void showSuiteName( const QString &suiteName )
        {
            _suiteName->setText( "class " + suiteName );
        }

        void advanceProgressBar()
        {
            _progressBar->setProgress( _progressBar->progress() + 1 );
        }

        void showTestName( const QString &testName )
        {
            _testName->setText( testName + "()" );
        }

        void showTestsDone( unsigned testsDone )
        {
            _testsDone->setText( asString( testsDone ) + " of " + _strTotalTests );
        }

        static QString asString( unsigned n )
        {
            return QString::number( n );
        }

        void setColor( int r, int g, int b )
        {
            QPalette palette = _progressBar->palette();
            palette.setColor( QColorGroup::Highlight, QColor( r, g, b ) );
            _progressBar->setPalette( palette );
        }

        void setIcon( QMessageBox::Icon icon )
        {
#if QT_VERSION >= 0x030000
            _mainWindow->setIcon( QMessageBox::standardIcon( icon ) );
#else // Qt version < 3.0.0
            _mainWindow->setIcon( QMessageBox::standardIcon( icon, QApplication::style().guiStyle() ) );
#endif // QT_VERSION
        }

        void processEvents()
        {
            _application->processEvents();
        }

        void centerWindow()
        {
            QWidget *desktop = QApplication::desktop();
            int xCenter = desktop->x() + (desktop->width() / 2);
            int yCenter = desktop->y() + (desktop->height() / 2);
            
            int windowWidth = (desktop->width() * 4) / 5;
            int windowHeight = _mainWindow->height();
            _mainWindow->setGeometry( xCenter - (windowWidth / 2), yCenter - (windowHeight / 2), windowWidth, windowHeight );
        }

        bool keep()
        {
            if ( !_keep )
                return false;
            if ( !_startMinimized )
                return true;
            return (_mainWindow == _application->activeWindow());
        }

        void showSummary()
        {
            QString summary = _strTotalTests + (_numTotalTests == 1 ? " test" : " tests");
            if ( tracker().failedTests() )
                summary = "Failed " + asString( tracker().failedTests() ) + " of " + summary;
            else
                summary = summary + " passed";

            _mainWindow->setCaption( _title + " - " + summary );

            _statusBar->removeWidget( _suiteName );
            _statusBar->removeWidget( _testName );
            _testsDone->setText( summary );
        }
    };
};

#endif // __cxxtest__QtGui_h__

--- NEW FILE: TestTracker.h ---
#ifndef __cxxtest__TestTracker_h__
#define __cxxtest__TestTracker_h__

//
// The TestTracker tracks running tests
// The actual work is done in CountingListenerProxy,
// but this way avoids cyclic references TestListener<->CountingListenerProxy
//

#include <cxxtest/TestListener.h>
#include <cxxtest/DummyDescriptions.h>

namespace CxxTest
{
    class TestListener;
    
    class TestTracker : public TestListener
    {
    public:
        virtual ~TestTracker();
        
        static TestTracker &tracker();

        const TestDescription *fixTest( const TestDescription *d ) const;
        const SuiteDescription *fixSuite( const SuiteDescription *d ) const;
        const WorldDescription *fixWorld( const WorldDescription *d ) const;

        const TestDescription &test() const { return *_test; }
        const SuiteDescription &suite() const { return *_suite; }
        const WorldDescription &world() const { return *_world; }
        
        bool testFailed() const { return (testFailedAsserts() > 0); }
        bool suiteFailed() const { return (suiteFailedTests() > 0); }
        bool worldFailed() const { return (failedSuites() > 0); }
        
        unsigned warnings() const { return _warnings; }
        unsigned failedTests() const { return _failedTests; }
        unsigned testFailedAsserts() const { return _testFailedAsserts; }
        unsigned suiteFailedTests() const { return _suiteFailedTests; }
        unsigned failedSuites() const { return _failedSuites; }

        void enterWorld( const WorldDescription &wd );
        void enterSuite( const SuiteDescription &sd );
        void enterTest( const TestDescription &td );
        void leaveTest( const TestDescription &td );
        void leaveSuite( const SuiteDescription &sd );
        void leaveWorld( const WorldDescription &wd );
        void trace( const char *file, unsigned line, const char *expression );
        void warning( const char *file, unsigned line, const char *expression );
        void failedTest( const char *file, unsigned line, const char *expression );
        void failedAssert( const char *file, unsigned line, const char *expression );
        void failedAssertEquals( const char *file, unsigned line,
                                 const char *xStr, const char *yStr,
                                 const char *x, const char *y );
        void failedAssertSameData( const char *file, unsigned line,
                                   const char *xStr, const char *yStr,
                                   const char *sizeStr, const void *x,
                                   const void *y, unsigned size );
        void failedAssertDelta( const char *file, unsigned line,
                                const char *xStr, const char *yStr, const char *dStr,
                                const char *x, const char *y, const char *d );
        void failedAssertDiffers( const char *file, unsigned line,
                                  const char *xStr, const char *yStr,
                                  const char *value );
        void failedAssertLessThan( const char *file, unsigned line,
                                   const char *xStr, const char *yStr,
                                   const char *x, const char *y );
        void failedAssertLessThanEquals( const char *file, unsigned line,
                                         const char *xStr, const char *yStr,
                                         const char *x, const char *y );
        void failedAssertPredicate( const char *file, unsigned line,
                                    const char *predicate, const char *xStr, const char *x );
        void failedAssertRelation( const char *file, unsigned line,
                                   const char *relation, const char *xStr, const char *yStr,
                                   const char *x, const char *y );
        void failedAssertThrows( const char *file, unsigned line,
                                 const char *expression, const char *type,
                                 bool otherThrown );
        void failedAssertThrowsNot( const char *file, unsigned line, const char *expression );
        
    private:
        TestTracker( const TestTracker & );
        TestTracker &operator=( const TestTracker & );

        static bool _created;
        TestListener _dummyListener;
        DummyWorldDescription _dummyWorld;
        unsigned _warnings, _failedTests, _testFailedAsserts, _suiteFailedTests, _failedSuites;
        TestListener *_l;
        const WorldDescription *_world;
        const SuiteDescription *_suite;
        const TestDescription *_test;

        const TestDescription &dummyTest() const;
        const SuiteDescription &dummySuite() const;
        const WorldDescription &dummyWorld() const;
        
        void setWorld( const WorldDescription *w );
        void setSuite( const SuiteDescription *s );
        void setTest( const TestDescription *t );
        void countWarning();
        void countFailure();

        friend class TestRunner;
        
        TestTracker();
        void initialize();
        void setListener( TestListener *l );
    };

    inline TestTracker &tracker() { return TestTracker::tracker(); }
};

#endif // __cxxtest__TestTracker_h__

--- NEW FILE: LinkedList.h ---
#ifndef __cxxtest__LinkedList_h__
#define __cxxtest__LinkedList_h__

#include <cxxtest/Flags.h>

namespace CxxTest 
{
    struct List;
    class Link;

    struct List
    {
        Link *_head;
        Link *_tail;

        void initialize();

        Link *head();
        const Link *head() const;
        Link *tail();
        const Link *tail() const;

        bool empty() const;
        unsigned size() const;
        Link *nth( unsigned n );

        void activateAll();
        void leaveOnly( const Link &link );
    };

    class Link
    {       
    public:
        Link();
        virtual ~Link();

        bool active() const;
        void setActive( bool value = true );

        Link *justNext();
        Link *justPrev();
        
        Link *next();
        Link *prev();
        const Link *next() const;
        const Link *prev() const;

        virtual bool setUp() = 0;
        virtual bool tearDown() = 0;

        void attach( List &l );
        void detach( List &l );

    private:
        Link *_next;
        Link *_prev;
        bool _active;

        Link( const Link & );
        Link &operator=( const Link & );
    };
}

#endif // __cxxtest__LinkedList_h__


--- NEW FILE: LinkedList.cpp ---
#ifndef __cxxtest__LinkedList_cpp__
#define __cxxtest__LinkedList_cpp__

#include <cxxtest/LinkedList.h>

namespace CxxTest
{
    List GlobalFixture::_list = { 0, 0 };
    List RealSuiteDescription::_suites = { 0, 0 };

    void List::initialize()
    {
        _head = _tail = 0;
    }
    
    Link *List::head()
    {
        Link *l = _head;
        while ( l && !l->active() )
            l = l->next();
        return l;
    }

    const Link *List::head() const
    {
        Link *l = _head;
        while ( l && !l->active() )
            l = l->next();
        return l;
    }

    Link *List::tail()
    {
        Link *l = _tail;
        while ( l && !l->active() )
            l = l->prev();
        return l;
    }

    const Link *List::tail() const
    {
        Link *l = _tail;
        while ( l && !l->active() )
            l = l->prev();
        return l;
    }

    bool List::empty() const
    {
        return (_head == 0);
    }

    unsigned List::size() const
    {
        unsigned count = 0;
        for ( const Link *l = head(); l != 0; l = l->next() )
            ++ count;
        return count;
    }

    Link *List::nth( unsigned n )
    {
        Link *l = head();
        while ( n -- )
            l = l->next();
        return l;
    }

    void List::activateAll()
    {
        for ( Link *l = _head; l != 0; l = l->justNext() )
            l->setActive( true );
    }

    void List::leaveOnly( const Link &link )
    {
        for ( Link *l = head(); l != 0; l = l->next() )
            if ( l != &link )
                l->setActive( false );
    }

    Link::Link() :
        _next( 0 ),
        _prev( 0 ),
        _active( true )
    {
    }

    Link::~Link()
    {
    }
    
    bool Link::active() const
    {
        return _active;
    }
    
    void Link::setActive( bool value )
    {
        _active = value;
    }

    Link * Link::justNext()
    {
        return _next;
    }
    
    Link * Link::justPrev()
    {
        return _prev;
    }
        
    Link * Link::next()
    {
        Link *l = _next;
        while ( l && !l->_active )
            l = l->_next;
        return l;
    }
    
    Link * Link::prev()
    {
        Link *l = _prev;
        while ( l && !l->_active )
            l = l->_prev;
        return l;
    }
    
    const Link * Link::next() const
    {
        Link *l = _next;
        while ( l && !l->_active )
            l = l->_next;
        return l;
    }
    
    const Link * Link::prev() const
    {
        Link *l = _prev;
        while ( l && !l->_active )
            l = l->_prev;
        return l;
    }
    
    void Link::attach( List &l )
    {
        if ( l._tail )
            l._tail->_next = this;

        _prev = l._tail;
        _next = 0;
            
        if ( l._head == 0 )
            l._head = this;
        l._tail = this;
    }

    void Link::detach( List &l )
    {
        if ( _prev )
            _prev->_next = _next;
        else
            l._head = _next;
            
        if ( _next )
            _next->_prev = _prev;
        else
            l._tail = _prev;
    }
};

#endif // __cxxtest__LinkedList_cpp__

--- NEW FILE: ErrorPrinter.h ---
#ifndef __cxxtest__ErrorPrinter_h__
#define __cxxtest__ErrorPrinter_h__

//
// The ErrorPrinter is a simple TestListener that
// just prints "OK" if everything goes well, otherwise
// reports the error in the format of compiler messages.
// The ErrorPrinter uses std::cout
//

#include <cxxtest/Flags.h>

#ifndef _CXXTEST_HAVE_STD
#   define _CXXTEST_HAVE_STD
#endif // _CXXTEST_HAVE_STD

#include <cxxtest/ErrorFormatter.h>
#include <cxxtest/StdValueTraits.h>

#ifdef _CXXTEST_OLD_STD
#   include <iostream.h>
#else // !_CXXTEST_OLD_STD
#   include <iostream>
#endif // _CXXTEST_OLD_STD

namespace CxxTest 
{
    class ErrorPrinter : public ErrorFormatter
    {
    public:
        ErrorPrinter( CXXTEST_STD(ostream) &o = CXXTEST_STD(cout), const char *preLine = ":", const char *postLine = "" ) :
            ErrorFormatter( new Adapter(o), preLine, postLine ) {}
        virtual ~ErrorPrinter() { delete outputStream(); }

    private:
        class Adapter : public OutputStream
        {
            CXXTEST_STD(ostream) &_o;
        public:
            Adapter( CXXTEST_STD(ostream) &o ) : _o(o) {}
            void flush() { _o.flush(); }
            OutputStream &operator<<( const char *s ) { _o << s; return *this; }
            OutputStream &operator<<( Manipulator m ) { return OutputStream::operator<<( m ); }
            OutputStream &operator<<( unsigned i )
            {
                char s[1 + 3 * sizeof(unsigned)];
                numberToString( i, s );
                _o << s;
                return *this;
            }
        };
    };
}

#endif // __cxxtest__ErrorPrinter_h__

--- NEW FILE: Win32Gui.h ---
#ifndef __cxxtest__Win32Gui_h__
#define __cxxtest__Win32Gui_h__

//
// The Win32Gui displays a simple progress bar using the Win32 API.
//
// It accepts the following command line options:
//   -minimized    Start minimized, pop up on error
//   -keep         Don't close the window at the end
//   -title TITLE  Set the window caption
//
// If both -minimized and -keep are specified, GUI will only keep the
// window if it's in focus.
//
// N.B. If you're wondering why this class doesn't use any standard
// library or STL (<string> would have been nice) it's because it only
// uses "straight" Win32 API.
//

#include <cxxtest/Gui.h>

#include <windows.h>
#include <commctrl.h>

namespace CxxTest
{
    class Win32Gui : public GuiListener
    {
    public:
        void enterGui( int &argc, char **argv )
	{
	    parseCommandLine( argc, argv );
	}
	
        void enterWorld( const WorldDescription &wd )
        {
            getTotalTests( wd );
            _testsDone = 0;
            startGuiThread();
        }

	void guiEnterSuite( const char *suiteName )
	{
	    showSuiteName( suiteName );
            reset( _suiteStart );
	}

        void guiEnterTest( const char *suiteName, const char *testName )
        {
            ++ _testsDone;
            setTestCaption( suiteName, testName );
            showTestName( testName );
	    showTestsDone();
            progressBarMessage( PBM_STEPIT );
            reset( _testStart );
        }

        void yellowBar()
        {
	    setColor( 255, 255, 0 );
            setIcon( IDI_WARNING );
            getTotalTests();
        }
        
        void redBar()
        {
            if ( _startMinimized )
                showMainWindow( SW_SHOWNORMAL );
	    setColor( 255, 0, 0 );
	    setIcon( IDI_ERROR );
            getTotalTests();
        }

        void leaveGui()
        {
            if ( keep() )
            {
                showSummary();
                WaitForSingleObject( _gui, INFINITE );
            }
            DestroyWindow( _mainWindow );
        }

    private:
        const char *_title;
        bool _startMinimized, _keep;
        HANDLE _gui;
        WNDCLASSEX _windowClass;
        HWND _mainWindow, _progressBar, _statusBar;
        HANDLE _canStartTests;
        unsigned _numTotalTests, _testsDone;
        char _strTotalTests[WorldDescription::MAX_STRLEN_TOTAL_TESTS];
        enum { 
            STATUS_SUITE_NAME, STATUS_SUITE_TIME,
            STATUS_TEST_NAME, STATUS_TEST_TIME,
            STATUS_TESTS_DONE, STATUS_WORLD_TIME,
            STATUS_TOTAL_PARTS 
        };
        int _statusWidths[STATUS_TOTAL_PARTS];
        unsigned _statusOffsets[STATUS_TOTAL_PARTS];
        unsigned _statusTotal;
        char _statusTestsDone[sizeof("1000000000 of  (100%)") + WorldDescription::MAX_STRLEN_TOTAL_TESTS];
        DWORD _worldStart, _suiteStart, _testStart;
        char _timeString[sizeof("00:00:00")];

        void parseCommandLine( int argc, char **argv )
        {
            _startMinimized = _keep = false;
	    _title = argv[0];
            
            for ( int i = 1; i < argc; ++ i )
            {
                if ( !lstrcmpA( argv[i], "-minimized" ) )
                    _startMinimized = true;
                else if ( !lstrcmpA( argv[i], "-keep" ) )
                    _keep = true;
                else if ( !lstrcmpA( argv[i], "-title" ) && (i + 1 < argc) )
                    _title = argv[++i];
            }
        }
        
        void getTotalTests()
        {
            getTotalTests( tracker().world() );
        }

        void getTotalTests( const WorldDescription &wd )
        {
            _numTotalTests = wd.numTotalTests();
            wd.strTotalTests( _strTotalTests );
        }

        void startGuiThread()
        {
            _canStartTests = CreateEvent( NULL, TRUE, FALSE, NULL );
			DWORD threadId;
            _gui = CreateThread( NULL, 0, &(Win32Gui::guiThread), (LPVOID)this, 0, &threadId );
            WaitForSingleObject( _canStartTests, INFINITE );
        }

        static DWORD WINAPI guiThread( LPVOID parameter )
        {
            ((Win32Gui *)parameter)->gui();
            return 0;
        }

        void gui()
        {
            registerWindowClass();
            createMainWindow();
            initCommonControls();
            createProgressBar();
            createStatusBar();
            centerMainWindow();
            showMainWindow();
            startTimer();
            startTests();

            messageLoop();
        }

        void registerWindowClass()
        {
            _windowClass.cbSize = sizeof(_windowClass);
            _windowClass.style = CS_HREDRAW | CS_VREDRAW;
            _windowClass.lpfnWndProc = &(Win32Gui::windowProcedure);
            _windowClass.cbClsExtra = 0;
            _windowClass.cbWndExtra = sizeof(LONG);
            _windowClass.hInstance = (HINSTANCE)NULL;
            _windowClass.hIcon = (HICON)NULL;
            _windowClass.hCursor = (HCURSOR)NULL;
            _windowClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
            _windowClass.lpszMenuName = NULL;
            _windowClass.lpszClassName = TEXT("CxxTest Window Class");
            _windowClass.hIconSm = (HICON)NULL;

            RegisterClassEx( &_windowClass );
        }

        void createMainWindow()
        {
            _mainWindow = createWindow( _windowClass.lpszClassName, WS_OVERLAPPEDWINDOW );
        }

        void initCommonControls()
        {
            HMODULE dll = LoadLibraryA( "comctl32.dll" );
            if ( !dll )
		return;
		
	    typedef void (WINAPI *FUNC)( void );
	    FUNC func = (FUNC)GetProcAddress( dll, "InitCommonControls" );
	    if ( !func )
                return;

	    func();
        }

        void createProgressBar()
        {
            _progressBar = createWindow( PROGRESS_CLASS, WS_CHILD | WS_VISIBLE | PBS_SMOOTH, _mainWindow );

#ifdef PBM_SETRANGE32
            progressBarMessage( PBM_SETRANGE32, 0, _numTotalTests );
#else // No PBM_SETRANGE32, use PBM_SETRANGE
	    progressBarMessage( PBM_SETRANGE, 0, MAKELPARAM( 0, (WORD)_numTotalTests ) );
#endif // PBM_SETRANGE32
            progressBarMessage( PBM_SETPOS, 0 );
            progressBarMessage( PBM_SETSTEP, 1 );
            greenBar();
            UpdateWindow( _progressBar );
        }

        void createStatusBar()
        {
            _statusBar = createWindow( STATUSCLASSNAME, WS_CHILD | WS_VISIBLE, _mainWindow );
            setRatios( 4, 1, 3, 1, 3, 1 );
        }

        void setRatios( unsigned suiteNameRatio, unsigned suiteTimeRatio,
                        unsigned testNameRatio, unsigned testTimeRatio,
                        unsigned testsDoneRatio, unsigned worldTimeRatio )
        {
            _statusTotal = 0;
            _statusOffsets[STATUS_SUITE_NAME] = (_statusTotal += suiteNameRatio);
            _statusOffsets[STATUS_SUITE_TIME] = (_statusTotal += suiteTimeRatio);
            _statusOffsets[STATUS_TEST_NAME] = (_statusTotal += testNameRatio);
            _statusOffsets[STATUS_TEST_TIME] = (_statusTotal += testTimeRatio);
            _statusOffsets[STATUS_TESTS_DONE] = (_statusTotal += testsDoneRatio);
            _statusOffsets[STATUS_WORLD_TIME] = (_statusTotal += worldTimeRatio);
        }

        HWND createWindow( LPCTSTR className, DWORD style, HWND parent = (HWND)NULL )
        {
            return CreateWindow( className, NULL, style, 0, 0, 0, 0, parent,
                                 (HMENU)NULL, (HINSTANCE)NULL, (LPVOID)this );
        }

        void progressBarMessage( UINT message, WPARAM wParam = 0, LPARAM lParam = 0 )
        {
            SendMessage( _progressBar, message, wParam, lParam );
        }

        void centerMainWindow()
        {
            RECT screen;
            getScreenArea( screen );

            LONG screenWidth = screen.right - screen.left;
            LONG screenHeight = screen.bottom - screen.top;

            LONG xCenter = (screen.right + screen.left) / 2;
            LONG yCenter = (screen.bottom + screen.top) / 2;

            LONG windowWidth = (screenWidth * 4) / 5;
            LONG windowHeight = screenHeight / 10;
            LONG minimumHeight = 2 * (GetSystemMetrics( SM_CYCAPTION ) + GetSystemMetrics( SM_CYFRAME ));
            if ( windowHeight < minimumHeight )
                windowHeight = minimumHeight;

            SetWindowPos( _mainWindow, HWND_TOP,
                          xCenter - (windowWidth / 2), yCenter - (windowHeight / 2),
                          windowWidth, windowHeight, 0 );
        }

        void getScreenArea( RECT &area )
        {
            if ( !getScreenAreaWithoutTaskbar( area ) )
                getWholeScreenArea( area );
        }

        bool getScreenAreaWithoutTaskbar( RECT &area )
        {
            return (SystemParametersInfo( SPI_GETWORKAREA, sizeof(RECT), &area, 0 ) != 0);
        }

        void getWholeScreenArea( RECT &area )
        {
            area.left = area.top = 0;
            area.right = GetSystemMetrics( SM_CXSCREEN );
            area.bottom = GetSystemMetrics( SM_CYSCREEN );
        }

        void showMainWindow()
        {
            showMainWindow( _startMinimized ? SW_MINIMIZE : SW_SHOWNORMAL );
            UpdateWindow( _mainWindow );
        }

        void showMainWindow( int mode )
        {
            ShowWindow( _mainWindow, mode );
        }

        enum { TIMER_ID = 1, TIMER_DELAY = 1000 };

        void startTimer()
        {
            reset( _worldStart );
            reset( _suiteStart );
            reset( _testStart );
            SetTimer( _mainWindow, TIMER_ID, TIMER_DELAY, 0 );
        }

        void reset( DWORD &tick )
        {
            tick = GetTickCount();
        }

        void startTests()
        {
            SetEvent( _canStartTests );
        }

        void messageLoop()
        {
            MSG message;
            while ( BOOL haveMessage = GetMessage( &message, NULL, 0, 0 ) )
                if ( haveMessage != -1 )
                    DispatchMessage( &message );
        }

        static LRESULT CALLBACK windowProcedure( HWND window, UINT message, WPARAM wParam, LPARAM lParam )
        {
            if ( message == WM_CREATE )
                setUp( window, (LPCREATESTRUCT)lParam );

            Win32Gui *that = (Win32Gui *)GetWindowLong( window, GWL_USERDATA );
            return that->handle( window, message, wParam, lParam );
        }

        static void setUp( HWND window, LPCREATESTRUCT create )
        {
            SetWindowLong( window, GWL_USERDATA, (LONG)create->lpCreateParams );
        }

        LRESULT handle( HWND window, UINT message, WPARAM wParam, LPARAM lParam )
        {
            switch ( message )
            {
            case WM_SIZE: resizeControls(); break;

            case WM_TIMER: updateTime(); break;

            case WM_CLOSE:
            case WM_DESTROY:
            case WM_QUIT:
                ExitProcess( 0 );

            default: return DefWindowProc( window, message, wParam, lParam );
            }
            return 0;
        }

        void resizeControls()
        {
            RECT r;
            GetClientRect( _mainWindow, &r );
            LONG width = r.right - r.left;
            LONG height = r.bottom - r.top;

            GetClientRect( _statusBar, &r );
            LONG statusHeight = r.bottom - r.top;
            LONG resizeGripWidth = statusHeight;
            LONG progressHeight = height - statusHeight;

            SetWindowPos( _progressBar, HWND_TOP, 0, 0, width, progressHeight, 0 );
            SetWindowPos( _statusBar, HWND_TOP, 0, progressHeight, width, statusHeight, 0 );
            setStatusParts( width - resizeGripWidth );
        }

        void setStatusParts( LONG width )
        {
            for ( unsigned i = 0; i < STATUS_TOTAL_PARTS; ++ i )
                _statusWidths[i] = (width * _statusOffsets[i]) / _statusTotal;

            statusBarMessage( SB_SETPARTS, STATUS_TOTAL_PARTS, _statusWidths );
        }

        void statusBarMessage( UINT message, WPARAM wParam = 0, const void *lParam = 0 )
        {
            SendMessage( _statusBar, message, wParam, (LPARAM)lParam );
        }

        void greenBar()
        {
            setColor( 0, 255, 0 );
            setIcon( IDI_INFORMATION );
        }

#ifdef PBM_SETBARCOLOR
        void setColor( BYTE red, BYTE green, BYTE blue )
        {
            progressBarMessage( PBM_SETBARCOLOR, 0, RGB( red, green, blue ) );
        }
#else // !PBM_SETBARCOLOR
        void setColor( BYTE, BYTE, BYTE ) 
        {
        }
#endif // PBM_SETBARCOLOR

        void setIcon( LPCTSTR icon )
        {
            SendMessage( _mainWindow, WM_SETICON, ICON_BIG, (LPARAM)loadStandardIcon( icon ) );
        }

        HICON loadStandardIcon( LPCTSTR icon )
        {
            return LoadIcon( (HINSTANCE)NULL, icon );
        }

        void setTestCaption( const char *suiteName, const char *testName )
        {
            setCaption( suiteName, "::", testName, "()" );
        }

        void setCaption( const char *a = "", const char *b = "", const char *c = "", const char *d = "" )
        {
            unsigned length = lstrlenA( _title ) + sizeof( " - " ) +
                lstrlenA( a ) + lstrlenA( b ) + lstrlenA( c ) + lstrlenA( d );
            char *name = allocate( length );
            lstrcpyA( name, _title );
            lstrcatA( name, " - " );
            lstrcatA( name, a );
            lstrcatA( name, b );
            lstrcatA( name, c );
            lstrcatA( name, d );
            SetWindowTextA( _mainWindow, name );
            deallocate( name );
        }

        void showSuiteName( const char *suiteName )
        {
            setStatusPart( STATUS_SUITE_NAME, suiteName );
	}

	void showTestName( const char *testName )
	{
            setStatusPart( STATUS_TEST_NAME, testName );
	}

	void showTestsDone()
	{
            wsprintfA( _statusTestsDone, "%u of %s (%u%%)",
                       _testsDone, _strTotalTests,
                       (_testsDone * 100) / _numTotalTests );
            setStatusPart( STATUS_TESTS_DONE, _statusTestsDone );
        }

        void updateTime()
        {
            setStatusTime( STATUS_WORLD_TIME, _worldStart );
            setStatusTime( STATUS_SUITE_TIME, _suiteStart );
            setStatusTime( STATUS_TEST_TIME, _testStart );
        }

        void setStatusTime( unsigned part, DWORD start )
        {
            unsigned total = (GetTickCount() - start) / 1000;
            unsigned hours = total / 3600;
            unsigned minutes = (total / 60) % 60;
            unsigned seconds = total % 60;

            if ( hours )
                wsprintfA( _timeString, "%u:%02u:%02u", hours, minutes, seconds );
            else
                wsprintfA( _timeString, "%02u:%02u", minutes, seconds );

            setStatusPart( part, _timeString );
        }

        bool keep()
        {
            if ( !_keep )
                return false;
            if ( !_startMinimized )
                return true;
            return (_mainWindow == GetForegroundWindow());
        }

        void showSummary()
        {
            stopTimer();
            setSummaryStatusBar();
            setSummaryCaption();
        }

        void setStatusPart( unsigned part, const char *text )
        {
            statusBarMessage( SB_SETTEXTA, part, text );
        }

        void stopTimer()
        {
            KillTimer( _mainWindow, TIMER_ID );
            setStatusTime( STATUS_WORLD_TIME, _worldStart );
        }

        void setSummaryStatusBar()
        {
            setRatios( 0, 0, 0, 0, 1, 1 );
            resizeControls();
        
            const char *tests = (_numTotalTests == 1) ? "test" : "tests";
            if ( tracker().failedTests() )
                wsprintfA( _statusTestsDone, "Failed %u of %s %s",
                          tracker().failedTests(), _strTotalTests, tests );
            else
                wsprintfA( _statusTestsDone, "%s %s passed", _strTotalTests, tests );

            setStatusPart( STATUS_TESTS_DONE, _statusTestsDone );
        }

        void setSummaryCaption()
        {
            setCaption( _statusTestsDone );
        }

        char *allocate( unsigned length )
        {
            return (char *)HeapAlloc( GetProcessHeap(), 0, length );
        }

        void deallocate( char *data )
        {
            HeapFree( GetProcessHeap(), 0, data );
        }
    };
};

#endif // __cxxtest__Win32Gui_h__

--- NEW FILE: TestRunner.h ---
#ifndef __cxxtest_TestRunner_h__
#define __cxxtest_TestRunner_h__

//
// TestRunner is the class that runs all the tests.
// To use it, create an object that implements the TestListener
// interface and call TestRunner::runAllTests( myListener );
// 

#include <cxxtest/TestListener.h>
#include <cxxtest/RealDescriptions.h>
#include <cxxtest/TestSuite.h>
#include <cxxtest/TestTracker.h>

namespace CxxTest 
{
    class TestRunner
    {
    public:
        static void runAllTests( TestListener &listener )
        {
            tracker().setListener( &listener );
            _TS_TRY { TestRunner().runWorld(); }
            _TS_LAST_CATCH( { tracker().failedTest( __FILE__, __LINE__, "Exception thrown from world" ); } );
            tracker().setListener( 0 );
        }

        static void runAllTests( TestListener *listener )
        {
            if ( listener ) {
                listener->warning( __FILE__, __LINE__, "Deprecated; Use runAllTests( TestListener & )" );
                runAllTests( *listener );
            }
        }        
    
    private:
        void runWorld()
        {
            RealWorldDescription wd;
            WorldGuard sg;
            
            tracker().enterWorld( wd );
            if ( wd.setUp() ) {
                for ( SuiteDescription *sd = wd.firstSuite(); sd; sd = sd->next() )
                    if ( sd->active() )
                        runSuite( *sd );
            
                wd.tearDown();
            }
            tracker().leaveWorld( wd );
        }
    
        void runSuite( SuiteDescription &sd )
        {
            StateGuard sg;
            
            tracker().enterSuite( sd );
            if ( sd.setUp() ) {
                for ( TestDescription *td = sd.firstTest(); td; td = td->next() )
                    if ( td->active() )
                        runTest( *td );

                sd.tearDown();
            }
            tracker().leaveSuite( sd );
        }

        void runTest( TestDescription &td )
        {
            StateGuard sg;
            
            tracker().enterTest( td );
            if ( td.setUp() ) {
                td.run();
                td.tearDown();
            }
            tracker().leaveTest( td );
        }
        
        class StateGuard
        {
#ifdef _CXXTEST_HAVE_EH
            bool _abortTestOnFail;
#endif // _CXXTEST_HAVE_EH
            unsigned _maxDumpSize;
            
        public:
            StateGuard()
            {
#ifdef _CXXTEST_HAVE_EH
                _abortTestOnFail = abortTestOnFail();
#endif // _CXXTEST_HAVE_EH
                _maxDumpSize = maxDumpSize();
            }
            
            ~StateGuard()
            {
#ifdef _CXXTEST_HAVE_EH
                setAbortTestOnFail( _abortTestOnFail );
#endif // _CXXTEST_HAVE_EH
                setMaxDumpSize( _maxDumpSize );
            }
        };

        class WorldGuard : public StateGuard
        {
        public:
            WorldGuard() : StateGuard()
            {
#ifdef _CXXTEST_HAVE_EH
                setAbortTestOnFail( CXXTEST_DEFAULT_ABORT );
#endif // _CXXTEST_HAVE_EH
                setMaxDumpSize( CXXTEST_MAX_DUMP_SIZE );
            }
        };
    };

    //
    // For --no-static-init
    //
    void initialize();
};


#endif // __cxxtest_TestRunner_h__

--- NEW FILE: TestListener.h ---
#ifndef __cxxtest__TestListener_h__
#define __cxxtest__TestListener_h__

//
// TestListener is the base class for all "listeners",
// i.e. classes that receive notifications of the
// testing process.
//
// The names of the parameters are in comments to avoid
// "unused parameter" warnings.
//

#include <cxxtest/Descriptions.h>

namespace CxxTest
{
    class TestListener
    {
    public:
        TestListener() {}
        virtual ~TestListener() {}
        
        virtual void enterWorld( const WorldDescription & /*desc*/ ) {}
        virtual void enterSuite( const SuiteDescription & /*desc*/ ) {}
        virtual void enterTest( const TestDescription & /*desc*/ ) {}
        virtual void trace( const char * /*file*/, unsigned /*line*/,
                            const char * /*expression*/ ) {}
        virtual void warning( const char * /*file*/, unsigned /*line*/,
                              const char * /*expression*/ ) {}
        virtual void failedTest( const char * /*file*/, unsigned /*line*/,
                                 const char * /*expression*/ ) {}
        virtual void failedAssert( const char * /*file*/, unsigned /*line*/,
                                   const char * /*expression*/ ) {}
        virtual void failedAssertEquals( const char * /*file*/, unsigned /*line*/,
                                         const char * /*xStr*/, const char * /*yStr*/,
                                         const char * /*x*/, const char * /*y*/ ) {}
        virtual void failedAssertSameData( const char * /*file*/, unsigned /*line*/,
                                           const char * /*xStr*/, const char * /*yStr*/,
                                           const char * /*sizeStr*/, const void * /*x*/,
                                           const void * /*y*/, unsigned /*size*/ ) {}
        virtual void failedAssertDelta( const char * /*file*/, unsigned /*line*/,
                                        const char * /*xStr*/, const char * /*yStr*/,
                                        const char * /*dStr*/, const char * /*x*/,
                                        const char * /*y*/, const char * /*d*/ ) {}
        virtual void failedAssertDiffers( const char * /*file*/, unsigned /*line*/,
                                          const char * /*xStr*/, const char * /*yStr*/,
                                          const char * /*value*/ ) {}
        virtual void failedAssertLessThan( const char * /*file*/, unsigned /*line*/,
                                           const char * /*xStr*/, const char * /*yStr*/,
                                           const char * /*x*/, const char * /*y*/ ) {}
        virtual void failedAssertLessThanEquals( const char * /*file*/, unsigned /*line*/,
                                                 const char * /*xStr*/, const char * /*yStr*/,
                                                 const char * /*x*/, const char * /*y*/ ) {}
        virtual void failedAssertPredicate( const char * /*file*/, unsigned /*line*/,
                                            const char * /*predicate*/, const char * /*xStr*/, const char * /*x*/ ) {}
        virtual void failedAssertRelation( const char * /*file*/, unsigned /*line*/,
                                           const char * /*relation*/, const char * /*xStr*/, const char * /*yStr*/,
                                           const char * /*x*/, const char * /*y*/ ) {}
        virtual void failedAssertThrows( const char * /*file*/, unsigned /*line*/,
                                         const char * /*expression*/, const char * /*type*/,
                                         bool /*otherThrown*/ ) {}
        virtual void failedAssertThrowsNot( const char * /*file*/, unsigned /*line*/,
                                            const char * /*expression*/ ) {}
        virtual void leaveTest( const TestDescription & /*desc*/ ) {}
        virtual void leaveSuite( const SuiteDescription & /*desc*/ ) {}
        virtual void leaveWorld( const WorldDescription & /*desc*/ ) {}
    };
}

#endif // __cxxtest__TestListener_h__

--- NEW FILE: Descriptions.h ---
#ifndef __cxxtest__Descriptions_h__
#define __cxxtest__Descriptions_h__

//
// TestDescription, SuiteDescription and WorldDescription
// hold information about tests so they can be run and reported.
//

#include <cxxtest/LinkedList.h>

namespace CxxTest 
{
    class TestSuite;

    class TestDescription : public Link
    {
    public:
        virtual ~TestDescription();
        
        virtual const char *file() const = 0;
        virtual unsigned line() const = 0;
        virtual const char *testName() const = 0;
        virtual const char *suiteName() const = 0;
        
        virtual void run() = 0;

        virtual const TestDescription *next() const = 0;
        virtual TestDescription *next() = 0;        
    };

    class SuiteDescription : public Link
    {
    public:
        virtual ~SuiteDescription();
        
        virtual const char *file() const = 0;
        virtual unsigned line() const = 0;
        virtual const char *suiteName() const = 0;
        virtual TestSuite *suite() const = 0;
        
        virtual unsigned numTests() const = 0;
        virtual const TestDescription &testDescription( unsigned /*i*/ ) const = 0;

        virtual TestDescription *firstTest() = 0;
        virtual const TestDescription *firstTest() const = 0;
        virtual SuiteDescription *next() = 0;
        virtual const SuiteDescription *next() const = 0;

        virtual void activateAllTests() = 0;
        virtual bool leaveOnly( const char * /*testName*/ ) = 0;
    };

    class WorldDescription : public Link
    {
    public:
        virtual ~WorldDescription();
        
        virtual unsigned numSuites( void ) const = 0;
        virtual unsigned numTotalTests( void ) const = 0;
        virtual const SuiteDescription &suiteDescription( unsigned /*i*/ ) const = 0;

        enum { MAX_STRLEN_TOTAL_TESTS = 32 };
        char *strTotalTests( char * /*buffer*/ ) const;

        virtual SuiteDescription *firstSuite() = 0;
        virtual const SuiteDescription *firstSuite() const = 0;

        virtual void activateAllTests() = 0;
        virtual bool leaveOnly( const char * /*suiteName*/, const char * /*testName*/ = 0 ) = 0;
    };
}

#endif // __cxxtest__Descriptions_h__


--- NEW FILE: GlobalFixture.cpp ---
#ifndef __cxxtest__GlobalFixture_cpp__
#define __cxxtest__GlobalFixture_cpp__

#include <cxxtest/GlobalFixture.h>

namespace CxxTest 
{
    bool GlobalFixture::setUpWorld() { return true; }
    bool GlobalFixture::tearDownWorld() { return true; }
    bool GlobalFixture::setUp() { return true; }
    bool GlobalFixture::tearDown() { return true; }
        
    GlobalFixture::GlobalFixture() { attach( _list ); }
    GlobalFixture::~GlobalFixture() { detach( _list ); }
        
    GlobalFixture *GlobalFixture::firstGlobalFixture() { return (GlobalFixture *)_list.head(); }
    GlobalFixture *GlobalFixture::lastGlobalFixture() { return (GlobalFixture *)_list.tail(); }
    GlobalFixture *GlobalFixture::nextGlobalFixture() { return (GlobalFixture *)next(); }
    GlobalFixture *GlobalFixture::prevGlobalFixture() { return (GlobalFixture *)prev(); }
}

#endif // __cxxtest__GlobalFixture_cpp__


--- NEW FILE: Root.cpp ---
#ifndef __cxxtest__Root_cpp__
#define __cxxtest__Root_cpp__

//
// This file holds the "root" of CxxTest, i.e.
// the parts that must be in a source file file.
//

#include <cxxtest/Descriptions.cpp>
#include <cxxtest/DummyDescriptions.cpp>
#include <cxxtest/GlobalFixture.cpp>
#include <cxxtest/LinkedList.cpp>
#include <cxxtest/RealDescriptions.cpp>
#include <cxxtest/TestSuite.cpp>
#include <cxxtest/TestTracker.cpp>
#include <cxxtest/ValueTraits.cpp>

#endif // __cxxtest__Root_cpp__

--- NEW FILE: Gui.h ---
#ifndef __CXXTEST__GUI_H
#define __CXXTEST__GUI_H

//
// GuiListener is a simple base class for the differes GUIs
// GuiTuiRunner<GuiT, TuiT> combines a GUI with a text-mode error formatter
//

#include <cxxtest/TeeListener.h>

namespace CxxTest
{
    class GuiListener : public TestListener
    {
    public:
        GuiListener() : _state( GREEN_BAR ) {}
        virtual ~GuiListener() {}

        virtual void runGui( int &argc, char **argv, TestListener &listener )
        {
            enterGui( argc, argv );
            TestRunner::runAllTests( listener );
            leaveGui();            
        }

        virtual void enterGui( int & /*argc*/, char ** /*argv*/ ) {}
        virtual void leaveGui() {}
        
        //
        // The easy way is to implement these functions:
        //      
        virtual void guiEnterWorld( unsigned /*numTotalTests*/ ) {}
        virtual void guiEnterSuite( const char * /*suiteName*/ ) {}
        virtual void guiEnterTest( const char * /*suiteName*/, const char * /*testName*/ ) {}
        virtual void yellowBar() {}
        virtual void redBar() {}

        //
        // The hard way is this:
        //
        void enterWorld( const WorldDescription &d ) { guiEnterWorld( d.numTotalTests() ); }
        void enterSuite( const SuiteDescription &d ) { guiEnterSuite( d.suiteName() ); }
        void enterTest( const TestDescription &d ) { guiEnterTest( d.suiteName(), d.testName() ); }
        void leaveTest( const TestDescription & ) {}
        void leaveSuite( const SuiteDescription & ) {}
        void leaveWorld( const WorldDescription & ) {}
        
        void warning( const char * /*file*/, unsigned /*line*/, const char * /*expression*/ )
        {
            yellowBarSafe();
        }
        
        void failedTest( const char * /*file*/, unsigned /*line*/, const char * /*expression*/ )
        {
            redBarSafe();
        }
        
        void failedAssert( const char * /*file*/, unsigned /*line*/, const char * /*expression*/ )
        {
            redBarSafe();
        }
        
        void failedAssertEquals( const char * /*file*/, unsigned /*line*/,
                                 const char * /*xStr*/, const char * /*yStr*/,
                                 const char * /*x*/, const char * /*y*/ )
        {
            redBarSafe();
        }

        void failedAssertSameData( const char * /*file*/, unsigned /*line*/,
                                   const char * /*xStr*/, const char * /*yStr*/,
                                   const char * /*sizeStr*/, const void * /*x*/,
                                   const void * /*y*/, unsigned /*size*/ )
        {
            redBarSafe();
        }
        
        void failedAssertDelta( const char * /*file*/, unsigned /*line*/,
                                const char * /*xStr*/, const char * /*yStr*/, const char * /*dStr*/,
                                const char * /*x*/, const char * /*y*/, const char * /*d*/ )
        {
            redBarSafe();
        }
        
        void failedAssertDiffers( const char * /*file*/, unsigned /*line*/,
                                  const char * /*xStr*/, const char * /*yStr*/,
                                  const char * /*value*/ )
        {
            redBarSafe();
        }
        
        void failedAssertLessThan( const char * /*file*/, unsigned /*line*/,
                                   const char * /*xStr*/, const char * /*yStr*/,
                                   const char * /*x*/, const char * /*y*/ )
        {
            redBarSafe();
        }
        
        void failedAssertLessThanEquals( const char * /*file*/, unsigned /*line*/,
                                         const char * /*xStr*/, const char * /*yStr*/,
                                         const char * /*x*/, const char * /*y*/ )
        {
            redBarSafe();
        }
        
        void failedAssertPredicate( const char * /*file*/, unsigned /*line*/,
                                    const char * /*predicate*/, const char * /*xStr*/, const char * /*x*/ )
        {
            redBarSafe();
        }
        
        void failedAssertRelation( const char * /*file*/, unsigned /*line*/,
                                   const char * /*relation*/, const char * /*xStr*/, const char * /*yStr*/,
                                   const char * /*x*/, const char * /*y*/ )
        {
            redBarSafe();
        }
        
        void failedAssertThrows( const char * /*file*/, unsigned /*line*/,
                                 const char * /*expression*/, const char * /*type*/,
                                 bool /*otherThrown*/ )
        {
            redBarSafe();
        }
        
        void failedAssertThrowsNot( const char * /*file*/, unsigned /*line*/,
                                    const char * /*expression*/ )
        {
            redBarSafe();
        }

    protected:
        void yellowBarSafe()
        {
            if ( _state < YELLOW_BAR ) {
                yellowBar();
                _state = YELLOW_BAR;
            }
        }

        void redBarSafe()
        {
            if ( _state < RED_BAR ) {
                redBar();
                _state = RED_BAR;
            }
        }
        
    private:
        enum { GREEN_BAR, YELLOW_BAR, RED_BAR } _state;
    };

    template<class GuiT, class TuiT>
    class GuiTuiRunner : public TeeListener
    {
        int &_argc;
        char **_argv;
        GuiT _gui;
        TuiT _tui;
        
    public:
        GuiTuiRunner( int &argc, char **argv ) :
            _argc( argc ),
            _argv( argv )
        {  
            setFirst( _gui );
            setSecond( _tui );
        }

        int run()
        {
            _gui.runGui( _argc, _argv, *this );
            return tracker().failedTests();
        }
    };
};

#endif //__CXXTEST__GUI_H

--- NEW FILE: X11Gui.h ---
#ifndef __cxxtest__X11Gui_h__
#define __cxxtest__X11Gui_h__

//
// X11Gui displays a simple progress bar using X11
// 
// It accepts the following command-line arguments:
//  -title <title>              - Sets the application title
//  -fn or -font <font>         - Sets the font
//  -bg or -background <color>  - Sets the background color (default=Grey)
//  -fg or -foreground <color>  - Sets the text color (default=Black)
//  -green/-yellow/-red <color> - Sets the colors of the bar
//

#include <cxxtest/Gui.h>

#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

namespace CxxTest
{
    class X11Gui : public GuiListener
    {
    public:
        void enterGui( int &argc, char **argv )
        {
            parseCommandLine( argc, argv );
        }
        
        void enterWorld( const WorldDescription &wd )
        {
            openDisplay();
            if ( _display ) {
                createColors();
                createWindow();
                createGc();
                createFont();
                centerWindow();
                initializeEvents();
                initializeBar( wd );
                processEvents();
            }
        }
        
        void guiEnterTest( const char *suiteName, const char *testName )
        {
            if ( _display ) {
                ++ _testsDone;
                setWindowName( suiteName, testName );
                redraw();
            }
        }
        
        void yellowBar()
        {
            if ( _display ) {
                _barColor = getColor( _yellowName );
                getTotalTests();
                processEvents();
            }
        }

        void redBar()
        {
            if ( _display ) {
                _barColor = getColor( _redName );
                getTotalTests();
                processEvents();
            }
        }

        void leaveGui()
        {
            if ( _display ) {
                freeFontInfo();
                destroyGc();
                destroyWindow();
                closeDisplay();
            }
        }

    private:
        const char *_programName;
        Display *_display;
        Window _window;
        unsigned _numTotalTests, _testsDone;
        char _strTotalTests[WorldDescription::MAX_STRLEN_TOTAL_TESTS];
        const char *_foregroundName, *_backgroundName;
        const char *_greenName, *_yellowName, *_redName;
        unsigned long _foreground, _background, _barColor;
        int _width, _height;
        GC _gc;
        const char *_fontName;
        XID _fontId;
        XFontStruct *_fontInfo;
        int _textHeight, _textDescent;
        long _eventMask;
        Colormap _colormap;

        void parseCommandLine( int &argc, char **argv )
        {
            _programName = argv[0];

            _fontName = 0;
            _foregroundName = "Black";
            _backgroundName = "Grey";
            _greenName = "Green";
            _yellowName = "Yellow";
            _redName = "Red";

            for ( int i = 1; i + 1 < argc; ++ i ) {
                if ( !strcmp( argv[i], "-title" ) )
                    _programName = argv[++ i];
                else if ( !strcmp( argv[i], "-fn" ) || !strcmp( argv[i], "-font" ) )
                    _fontName = argv[++ i];
                else if ( !strcmp( argv[i], "-fg" ) || !strcmp( argv[i], "-foreground" ) )
                    _foregroundName = argv[++ i];
                else if ( !strcmp( argv[i], "-bg" ) || !strcmp( argv[i], "-background" ) )
                    _b...
 
[truncated message content]

[Mockpp-commits] mockpp/3party/cxxtest/cxxtest - New directory

From: Ewald A. <ewa...@us...> - 2005-12-09 15:57:26

Update of /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31173/3party/cxxtest/cxxtest

Log Message:
Directory /cvsroot/mockpp/mockpp/3party/cxxtest/cxxtest added to the repository

[Mockpp-commits] mockpp/3party/cxxtest - New directory

From: Ewald A. <ewa...@us...> - 2005-12-09 15:57:00

Update of /cvsroot/mockpp/mockpp/3party/cxxtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31084/3party/cxxtest

Log Message:
Directory /cvsroot/mockpp/mockpp/3party/cxxtest added to the repository

[Mockpp-commits] mockpp/mockpp/tests SelectFramework.h,NONE,1.1 Makefile.am,1.90,1.91 UnlimitedMatcher_test.cpp,1.3,1.4

From: Ewald A. <ewa...@us...> - 2005-12-09 15:55:44

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30732/mockpp/tests

Modified Files:
	Makefile.am UnlimitedMatcher_test.cpp 
Added Files:
	SelectFramework.h 
Log Message:
framework optional

--- NEW FILE: SelectFramework.h ---
/***************************************************************************
    SelectFramework.h  -  setup for unittest framework in use
                             -------------------
    begin                : Fri Dec 9 2005
    copyright            : (C) 2002-2005 by Ewald Arnold
    email                : mockpp at ewald-arnold dot de

  $Id: SelectFramework.h,v 1.1 2005/12/09 15:55:36 ewald-arnold Exp $

 ***************************************************************************/

/**************************************************************************
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as
 * published by the Free Software Foundation; either version 2 of the License,
 * or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 ***************************************************************************/

#if defined(HAVE_CXXTEST)

# define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK  /**/

#elif defined(HAVE_CPPUNIT)

# include <cppunit/extensions/HelperMacros.h>
# define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK : public CppUnit::TestFixture

#else

# pragma message ("No unittest framework available at compile time")
# define MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK   /**/

#endif // HAVE_CPPUNIT

Index: UnlimitedMatcher_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/UnlimitedMatcher_test.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- UnlimitedMatcher_test.cpp	15 Oct 2005 15:40:59 -0000	1.3
+++ UnlimitedMatcher_test.cpp	9 Dec 2005 15:55:36 -0000	1.4
@@ -29,33 +29,35 @@
 
 #include <mockpp/mockpp.h> // always first
 
-#ifndef HAVE_CPPUNIT
-
-# warning CppUnit not available at compile time
-
-#else
+#include "SelectFramework.h"
 
 #include <mockpp/matcher/UnlimitedMatcher.h>
 
-#include <cppunit/extensions/HelperMacros.h>
-
-class UnlimitedMatcher_test : public CppUnit::TestFixture
+class UnlimitedMatcher_test	MOCKPP_DERIVE_PUBLIC_UNITFRAMEWORK
 {
  public:
 
-CPPUNIT_TEST_SUITE( UnlimitedMatcher_test );
+#if defined (HAVE_CXXTEST)
 
-  CPPUNIT_TEST(test_invoke);
+#elif defined(HAVE_CPPUNIT)
 
+CPPUNIT_TEST_SUITE( UnlimitedMatcher_test );
+  CPPUNIT_TEST(test_invoke);
 CPPUNIT_TEST_SUITE_END();
 
+#endif // HAVE_CPPUNIT
+
  public:
 
    void test_invoke();
 };
 
 
+#if defined (HAVE_CXXTEST)
+
+#elif defined(HAVE_CPPUNIT)
 CPPUNIT_TEST_SUITE_REGISTRATION(UnlimitedMatcher_test);
+#endif
 
 
 void UnlimitedMatcher_test::test_invoke()
@@ -84,4 +86,3 @@
 }
 
 
-#endif // HAVE_CPPUNIT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- Makefile.am	8 Dec 2005 17:33:40 -0000	1.90
+++ Makefile.am	9 Dec 2005 15:55:36 -0000	1.91
@@ -84,7 +84,7 @@
 
 check_inst_SOURCES = check_inst.cpp
 
-noinst_HEADERS = classes_ABCDE.h MyBuilderNamespace.h MyMatchBuilder.h IncCounter.h
+noinst_HEADERS = SelectFramework.h classes_ABCDE.h MyBuilderNamespace.h MyMatchBuilder.h IncCounter.h
 
 ###########################################################################

[Mockpp-commits] mockpp/mockpp/docs/en dev_embedded.docbook,1.5,1.6

From: Ewald A. <ewa...@us...> - 2005-12-08 18:16:35

Update of /cvsroot/mockpp/mockpp/mockpp/docs/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19802/mockpp/docs/en

Modified Files:
	dev_embedded.docbook 
Log Message:
update

Index: dev_embedded.docbook
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/dev_embedded.docbook,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dev_embedded.docbook	7 Dec 2005 19:49:00 -0000	1.5
+++ dev_embedded.docbook	8 Dec 2005 18:16:19 -0000	1.6
@@ -70,7 +70,8 @@
 </tgroup>
 </table>
 
-</para>
+When changing the options for the test executables the size was reduced down to
+45%, but using the regular STL resulted only in 13% more code.</para>
 
 </sect2>

[Mockpp-commits] mockpp/msvc2005/mockpp/examples/tutorial basicmock.vcproj,1.1,1.2 chainmock.vcproj,1.1,1.2 cppunit.vcproj,1.1,1.2 poormock.vcproj,1.1,1.2 poormock_se.vcproj,1.1,1.2 visitmock.vcproj,1.1,1.2

From: Ewald A. <ewa...@us...> - 2005-12-08 18:16:27

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19515/msvc2005/mockpp/examples/tutorial

Modified Files:
	basicmock.vcproj chainmock.vcproj cppunit.vcproj 
	poormock.vcproj poormock_se.vcproj visitmock.vcproj 
Log Message:
use env variable

Index: basicmock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/basicmock.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basicmock.vcproj	8 Dec 2005 17:26:05 -0000	1.1
+++ basicmock.vcproj	8 Dec 2005 18:15:33 -0000	1.2
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/basicmock.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -48,10 +48,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/basicmock.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -140,9 +140,9 @@
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
 				PrecompiledHeaderFile="./basicmock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
 				WarningLevel="4"
 			/>
 			<Tool
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release./basicmock.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release./basicmock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"

Index: poormock_se.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/poormock_se.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- poormock_se.vcproj	8 Dec 2005 17:26:05 -0000	1.1
+++ poormock_se.vcproj	8 Dec 2005 18:15:33 -0000	1.2
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock_se.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -48,10 +48,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock_se.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -71,12 +71,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockppd.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock_se.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock_se.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock_se.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -142,10 +142,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock_se.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -164,11 +164,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock_se.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock_se.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>

Index: poormock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/poormock.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- poormock.vcproj	8 Dec 2005 17:26:05 -0000	1.1
+++ poormock.vcproj	8 Dec 2005 18:15:33 -0000	1.2
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -48,10 +48,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -71,12 +71,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockppd.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/poormock.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -142,10 +142,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -164,11 +164,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/poormock.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>

Index: visitmock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/visitmock.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- visitmock.vcproj	8 Dec 2005 17:26:05 -0000	1.1
+++ visitmock.vcproj	8 Dec 2005 18:15:33 -0000	1.2
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -48,10 +48,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -71,12 +71,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockppd.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/visitmock.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -140,9 +140,9 @@
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
 				PrecompiledHeaderFile="./visitmock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
 				WarningLevel="4"
 			/>
 			<Tool
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/visitmock.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/visitmock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"

Index: chainmock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/chainmock.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- chainmock.vcproj	8 Dec 2005 17:26:05 -0000	1.1
+++ chainmock.vcproj	8 Dec 2005 18:15:33 -0000	1.2
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -48,10 +48,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -71,12 +71,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockppd.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/chainmock.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -140,9 +140,9 @@
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
 				PrecompiledHeaderFile="./chainmock.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
 				WarningLevel="4"
 			/>
 			<Tool
@@ -158,7 +158,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/chainmock.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/chainmock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib"

Index: cppunit.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial/cppunit.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cppunit.vcproj	8 Dec 2005 17:26:05 -0000	1.1
+++ cppunit.vcproj	8 Dec 2005 18:15:33 -0000	1.2
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/cppunit.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -48,10 +48,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/cppunit.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -71,12 +71,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockppd.lib cppunitd_dll.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/cppunit.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib,$(CPPUNIT_ROOT)/lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/cppunit.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\tutorial\Release/cppunit.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -142,10 +142,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/cppunit.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\tutorial\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -164,11 +164,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib cppunit_dll.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/cppunit.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../../lib,$(CPPUNIT_ROOT)/lib"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Release/cppunit.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>

[Mockpp-commits] mockpp/msvc2005/mockpp/examples examples.vcproj,1.1,1.2

From: Ewald A. <ewa...@us...> - 2005-12-08 18:16:19

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19515/msvc2005/mockpp/examples

Modified Files:
	examples.vcproj 
Log Message:
use env variable

Index: examples.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/examples.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- examples.vcproj	8 Dec 2005 17:24:13 -0000	1.1
+++ examples.vcproj	8 Dec 2005 18:15:31 -0000	1.2
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\Debug"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\Debug"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\Debug/examples.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\Debug/examples.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -48,10 +48,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\Debug/examples.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\Debug/examples.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -71,12 +71,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockppd.lib cppunitd_dll.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\Debug/examples.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\Debug/examples.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Debug/examples.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\Debug/examples.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\examples\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\examples\Release/examples.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\examples\Release/examples.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -142,10 +142,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\Release/examples.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\examples\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\Release/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\examples\Release/examples.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\examples\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\examples\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\examples\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -164,11 +164,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib cppunit_dll.lib"
-				OutputFile="C:\tmp\compile\mockpp\examples\Release/examples.exe"
+				OutputFile="$(TEMP)\compile\mockpp\examples\Release/examples.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Release/examples.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\Release/examples.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>

[Mockpp-commits] mockpp/msvc2005/mockpp mockpp.vcproj,1.1,1.2 mockpp_production.vcproj,1.1,1.2

From: Ewald A. <ewa...@us...> - 2005-12-08 18:16:10

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19515/msvc2005/mockpp

Modified Files:
	mockpp.vcproj mockpp_production.vcproj 
Log Message:
use env variable

Index: mockpp.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mockpp.vcproj	8 Dec 2005 17:24:13 -0000	1.1
+++ mockpp.vcproj	8 Dec 2005 18:15:28 -0000	1.2
@@ -47,7 +47,7 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\Debug/mockpp.pch"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\Debug/mockpp.pch"
 				AssemblerListingLocation="$(TEMP)\compile\mockpp\Debug/"
 				ObjectFile="$(TEMP)\compile\mockpp\Debug/"
 				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\Debug/"
@@ -90,8 +90,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\Release"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -123,10 +123,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\Release/mockpp.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\Release/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\Release/mockpp.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				CompileAs="0"

Index: mockpp_production.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/mockpp_production.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mockpp_production.vcproj	8 Dec 2005 17:24:13 -0000	1.1
+++ mockpp_production.vcproj	8 Dec 2005 18:15:28 -0000	1.2
@@ -87,8 +87,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\production\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\production\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\production\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\production\Release"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"

[Mockpp-commits] mockpp/msvc2005/mockpp/tests mock_test.vcproj,1.1,1.2

From: Ewald A. <ewa...@us...> - 2005-12-08 18:15:47

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19515/msvc2005/mockpp/tests

Modified Files:
	mock_test.vcproj 
Log Message:
use env variable

Index: mock_test.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests/mock_test.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mock_test.vcproj	8 Dec 2005 17:24:13 -0000	1.1
+++ mock_test.vcproj	8 Dec 2005 18:15:33 -0000	1.2
@@ -15,8 +15,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\tests\Release"
-			IntermediateDirectory="C:\tmp\compile\mockpp\tests\Release"
+			OutputDirectory="$(TEMP)\compile\mockpp\tests\Release"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\tests\Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="C:\tmp\compile\mockpp\tests\Release/mock_test.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\tests\Release/mock_test.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -50,10 +50,10 @@
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\tests\Release/mock_test.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\tests\Release/"
-				ObjectFile="C:\tmp\compile\mockpp\tests\Release/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\tests\Release/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\tests\Release/mock_test.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\tests\Release/"
+				ObjectFile="$(TEMP)\compile\mockpp\tests\Release/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\tests\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				CompileAs="0"
@@ -72,11 +72,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockpp.lib cppunit_dll.lib"
-				OutputFile="C:\tmp\compile\mockpp\tests\Release/mock_test.exe"
+				OutputFile="$(TEMP)\compile\mockpp\tests\Release/mock_test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\tests\Release/mock_test.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\tests\Release/mock_test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -107,8 +107,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\tests\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\tests\Debug"
+			OutputDirectory="$(TEMP)\compile\mockpp\tests\Debug"
+			IntermediateDirectory="$(TEMP)\compile\mockpp\tests\Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName="c:\tmp\compile\mockpp\tests\Debug/mock_test.tlb"
+				TypeLibraryName="$(TEMP)\compile\mockpp\tests\Debug/mock_test.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -140,10 +140,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="true"
-				PrecompiledHeaderFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.pch"
-				AssemblerListingLocation="C:\tmp\compile\mockpp\tests\Debug/"
-				ObjectFile="C:\tmp\compile\mockpp\tests\Debug/"
-				ProgramDataBaseFileName="C:\tmp\compile\mockpp\tests\Debug/"
+				PrecompiledHeaderFile="$(TEMP)\compile\mockpp\tests\Debug/mock_test.pch"
+				AssemblerListingLocation="$(TEMP)\compile\mockpp\tests\Debug/"
+				ObjectFile="$(TEMP)\compile\mockpp\tests\Debug/"
+				ProgramDataBaseFileName="$(TEMP)\compile\mockpp\tests\Debug/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
@@ -163,12 +163,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="mockppd.lib cppunitd_dll.lib"
-				OutputFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.exe"
+				OutputFile="$(TEMP)\compile\mockpp\tests\Debug/mock_test.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.pdb"
+				ProgramDatabaseFile="$(TEMP)\compile\mockpp\tests\Debug/mock_test.pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>

[Mockpp-commits] mockpp/msvc2005/mockpp UpgradeLog.XML,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-08 18:00:43

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12391/msvc2005/mockpp

Added Files:
	UpgradeLog.XML 
Log Message:
new project files (converted from msvc71)

--- NEW FILE: UpgradeLog.XML ---
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?>
<UpgradeLog>
<Properties><Property Name="Solution" Value="mockpp">
</Property><Property Name="Solution File" Value="H:\Dokumente und Einstellungen\ewald\mockpp\msvc2005\mockpp\mockpp.sln">
</Property><Property Name="Date" Value="Donnerstag, 8. Dezember 2005">
</Property><Property Name="Time" Value="15:03">
</Property></Properties><Event ErrorLevel="0" Project="basicmock" Source="examples\tutorial\basicmock.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="basicmock" Source="examples\tutorial\basicmock.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="basicmock" Source="examples\tutorial\basicmock.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="basicmock" Source="examples\tutorial\basicmock.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="basicmock" Source="examples\tutorial\basicmock.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="basicmock" Source="examples\tutorial\basicmock.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="chainmock" Source="examples\tutorial\chainmock.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="chainmock" Source="examples\tutorial\chainmock.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="chainmock" Source="examples\tutorial\chainmock.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="chainmock" Source="examples\tutorial\chainmock.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="chainmock" Source="examples\tutorial\chainmock.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="chainmock" Source="examples\tutorial\chainmock.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="cppunit" Source="examples\tutorial\cppunit.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="cppunit" Source="examples\tutorial\cppunit.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="cppunit" Source="examples\tutorial\cppunit.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="cppunit" Source="examples\tutorial\cppunit.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="cppunit" Source="examples\tutorial\cppunit.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="cppunit" Source="examples\tutorial\cppunit.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="examples" Source="examples\examples.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="examples" Source="examples\examples.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="examples" Source="examples\examples.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="examples" Source="examples\examples.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="examples" Source="examples\examples.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="examples" Source="examples\examples.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="mock_test" Source="tests\mock_test.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="mock_test" Source="tests\mock_test.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="mock_test" Source="tests\mock_test.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="mock_test" Source="tests\mock_test.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="mock_test" Source="tests\mock_test.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="mock_test" Source="tests\mock_test.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="mockpp" Source="mockpp.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="mockpp" Source="mockpp.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="mockpp" Source="mockpp.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="mockpp" Source="mockpp.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="mockpp" Source="mockpp.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="mockpp" Source="mockpp.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="poormock" Source="examples\tutorial\poormock.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="poormock" Source="examples\tutorial\poormock.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="poormock" Source="examples\tutorial\poormock.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="poormock" Source="examples\tutorial\poormock.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="poormock" Source="examples\tutorial\poormock.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="poormock" Source="examples\tutorial\poormock.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="visitmock" Source="examples\tutorial\visitmock.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="visitmock" Source="examples\tutorial\visitmock.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="visitmock" Source="examples\tutorial\visitmock.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="visitmock" Source="examples\tutorial\visitmock.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="visitmock" Source="examples\tutorial\visitmock.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="visitmock" Source="examples\tutorial\visitmock.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="poormock_se" Source="examples\tutorial\poormock_se.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="poormock_se" Source="examples\tutorial\poormock_se.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="poormock_se" Source="examples\tutorial\poormock_se.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="poormock_se" Source="examples\tutorial\poormock_se.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="poormock_se" Source="examples\tutorial\poormock_se.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="poormock_se" Source="examples\tutorial\poormock_se.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="mockpp_production" Source="mockpp_production.vcproj" Description="Visual C++ now supports a secure version of the C Runtime Library. Use of this library is turned on by default. You may see some warnings about deprecated functions when you build your project. It is advised that you correct these warnings, in order to make your code more secure.">
</Event><Event ErrorLevel="0" Project="mockpp_production" Source="mockpp_production.vcproj" Description="The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.">
</Event><Event ErrorLevel="1" Project="mockpp_production" Source="mockpp_production.vcproj" Description="Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are automatically excluded from building with the Manifest Tool.  It is recommended that the dependency information contained in any manifest files be converted to &quot;#pragma comment(linker,&quot;&lt;insert dependency here&gt;&quot;)&quot; in a header file that is included from your source code.  If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line will need to be commented out before the project will build correctly.">
</Event><Event ErrorLevel="1" Project="mockpp_production" Source="mockpp_production.vcproj" Description="Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors.  Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName).  The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &amp;ClassName::MemberFunctionName).  If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).">
</Event><Event ErrorLevel="0" Project="mockpp_production" Source="mockpp_production.vcproj" Description="Project upgraded successfully.">
</Event><Event ErrorLevel="3" Project="mockpp_production" Source="mockpp_production.vcproj" Description="Converted">
</Event><Event ErrorLevel="0" Project="" Source="mockpp.sln" Description="Solution converted successfully">
</Event><Event ErrorLevel="3" Project="" Source="mockpp.sln" Description="Converted">
</Event></UpgradeLog>

[Mockpp-commits] mockpp ChangeLog,1.83,1.84 configure.in,1.100,1.101 Makefile.am,1.36,1.37

From: Ewald A. <ewa...@us...> - 2005-12-08 17:34:08

Update of /cvsroot/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5590

Modified Files:
	ChangeLog configure.in Makefile.am 
Log Message:
new project files

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ChangeLog	1 Dec 2005 19:43:03 -0000	1.83
+++ ChangeLog	8 Dec 2005 17:33:59 -0000	1.84
@@ -9,6 +9,8 @@
  - provide ways for alternative STL
  - optionally disable runtime type information (rtti)
  - optionally disable exceptions
+ - project files MSVC2005 Express (free as in beer)
+ - fixed compilation problem with msvc
 
 2005-11-19  1.10.0:
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Makefile.am	29 Nov 2005 23:31:15 -0000	1.36
+++ Makefile.am	8 Dec 2005 17:33:59 -0000	1.37
@@ -1,4 +1,4 @@
-SUBDIRS = tool config 3party mockpp bcb5 bcb6 bcbX msvc6 msvc7 msvc71
+SUBDIRS = tool config 3party mockpp bcb5 bcb6 bcbX msvc6 msvc7 msvc71 msvc2005
 
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- configure.in	1 Dec 2005 18:15:07 -0000	1.100
+++ configure.in	8 Dec 2005 17:33:59 -0000	1.101
@@ -480,6 +480,13 @@
   msvc71/mockpp/examples/tutorial/Makefile \
   msvc71/mockpp/tests/Makefile \
   \
+  msvc2005/Makefile \
+  msvc2005/lib/Makefile \
+  msvc2005/mockpp/Makefile \
+  msvc2005/mockpp/examples/Makefile \
+  msvc2005/mockpp/examples/tutorial/Makefile \
+  msvc2005/mockpp/tests/Makefile \
+  \
   mockpp/docs/Makefile \
   mockpp/docs/api/Makefile \
   mockpp/docs/en/Makefile \

[Mockpp-commits] mockpp/mockpp/tests Makefile.am,1.89,1.90

From: Ewald A. <ewa...@us...> - 2005-12-08 17:33:58

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5506/mockpp/tests

Modified Files:
	Makefile.am 
Log Message:
new test file

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- Makefile.am	1 Dec 2005 18:15:08 -0000	1.89
+++ Makefile.am	8 Dec 2005 17:33:40 -0000	1.90
@@ -42,19 +42,20 @@
 ###########################################################################
 
 mock_test_SOURCES = mock_test.cpp VisitableMockObject_test.cpp \
-			Formatter_test.cpp Throwable_test.cpp ThrowableList_test.cpp ExpectationCounter_test.cpp \
-			ExpectationCounterRange_test.cpp ExpectationMap_test.cpp ExpectationList_test.cpp \
-			ConstraintList_test.cpp 		ExpectationSet_test.cpp ExpectationConglomeration_test.cpp \
-			ExpectationSegment_test.cpp 		ExpectationValue_test.cpp ExpectationBoundary_test.cpp \
-			Verifiable_test.cpp Exception_test.cpp 		mockpp_test.cpp ReturnObjectList_test.cpp \
-			VisitableMockObject_template_test.cpp 		Assert_test.cpp AssertMo_test.cpp MockObject_test.cpp \
-			VisitableMockObject_1_test.cpp 		VisitableMockObject_2_test.cpp VisitableMockObject_3_test.cpp \
-			VisitableMockObject_4_test.cpp 		VisitableMockObject_5_test.cpp VisitableMockObject_void_test.cpp \
-			VisitableMockObject_1_void_test.cpp 		VisitableMockObject_2_void_test.cpp \
-			VisitableMockObject_3_void_test.cpp VisitableMockObject_4_void_test.cpp \
-			VisitableMockObject_5_void_test.cpp VerifyingTestCase_test.cpp classes_ABCDE.cpp \
-			VerifyingTestCaller_test.cpp TrackingCounter_test.cpp MixedMockObject_5_test.cpp TimeServer_test.cpp \
-		VisitableMockMethod_2_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_test.cpp ResponseVector_test.cpp
+				Formatter_test.cpp Throwable_test.cpp ThrowableList_test.cpp ExpectationCounter_test.cpp \
+				ExpectationCounterRange_test.cpp ExpectationMap_test.cpp ExpectationList_test.cpp \
+				ConstraintList_test.cpp 		ExpectationSet_test.cpp ExpectationConglomeration_test.cpp \
+				ExpectationSegment_test.cpp 		ExpectationValue_test.cpp ExpectationBoundary_test.cpp \
+				Verifiable_test.cpp Exception_test.cpp 		mockpp_test.cpp ReturnObjectList_test.cpp \
+				VisitableMockObject_template_test.cpp 		Assert_test.cpp AssertMo_test.cpp MockObject_test.cpp \
+				VisitableMockObject_1_test.cpp 		VisitableMockObject_2_test.cpp VisitableMockObject_3_test.cpp \
+				VisitableMockObject_4_test.cpp 		VisitableMockObject_5_test.cpp VisitableMockObject_void_test.cpp \
+				VisitableMockObject_1_void_test.cpp 		VisitableMockObject_2_void_test.cpp \
+				VisitableMockObject_3_void_test.cpp VisitableMockObject_4_void_test.cpp \
+				VisitableMockObject_5_void_test.cpp VerifyingTestCase_test.cpp classes_ABCDE.cpp \
+				VerifyingTestCaller_test.cpp TrackingCounter_test.cpp MixedMockObject_5_test.cpp TimeServer_test.cpp \
+			VisitableMockMethod_2_test.cpp VisitableMockMethod_1_test.cpp VisitableMockMethod_test.cpp \
+	ResponseVector_test.cpp NoException_test.cpp
 
 jmock_test_SOURCES = And_test.cpp IsAnything_test.cpp IsCloseTo_test.cpp \
 					IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \

[Mockpp-commits] mockpp/mockpp VisitableMockObject.h,1.43,1.44

From: Ewald A. <ewa...@us...> - 2005-12-08 17:31:44

Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5056/mockpp

Modified Files:
	VisitableMockObject.h 
Log Message:
correct container class

Index: VisitableMockObject.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- VisitableMockObject.h	26 Nov 2005 18:00:17 -0000	1.43
+++ VisitableMockObject.h	8 Dec 2005 17:31:35 -0000	1.44
@@ -176,7 +176,7 @@
   * here the documentation of the api generated by the macros.
   * @ingroup grp_controller
   */
-class VisitableMockObject::Controller
+class VisitableMockObjectBase::Controller
 {
   public:

[Mockpp-commits] mockpp/mockpp/util NotImplementedException.cpp,1.19,1.20

From: Ewald A. <ewa...@us...> - 2005-12-08 17:30:57

Update of /cvsroot/mockpp/mockpp/mockpp/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4879/mockpp/util

Modified Files:
	NotImplementedException.cpp 
Log Message:
update

Index: NotImplementedException.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/util/NotImplementedException.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- NotImplementedException.cpp	6 May 2005 17:36:47 -0000	1.19
+++ NotImplementedException.cpp	8 Dec 2005 17:30:45 -0000	1.20
@@ -55,3 +55,4 @@
 
 
 
+

[Mockpp-commits] mockpp/mockpp/production TimeServer.cpp,1.6,1.7

From: Ewald A. <ewa...@us...> - 2005-12-08 17:30:26

Update of /cvsroot/mockpp/mockpp/mockpp/production
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4792/mockpp/production

Modified Files:
	TimeServer.cpp 
Log Message:
update

Index: TimeServer.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TimeServer.cpp	19 Nov 2005 14:16:38 -0000	1.6
+++ TimeServer.cpp	8 Dec 2005 17:30:18 -0000	1.7
@@ -56,3 +56,4 @@
 
 
 
+

[Mockpp-commits] mockpp/bcb5 mockpp.bpf,1.27,1.28 mockpp.bpr,1.49,1.50

From: Ewald A. <ewa...@us...> - 2005-12-08 17:29:56

Update of /cvsroot/mockpp/mockpp/bcb5
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4578/bcb5

Modified Files:
	mockpp.bpf mockpp.bpr 
Log Message:
update

Index: mockpp.bpr
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpr,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- mockpp.bpr	31 Oct 2005 19:19:52 -0000	1.49
+++ mockpp.bpr	8 Dec 2005 17:29:48 -0000	1.50
@@ -46,7 +46,7 @@
     <RESFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
-    <LIBFILES value="c:\tmp\compile\cppunit_1_10_bcb5.lib c:\tmp\compile\mockpp_production_34.lib"/>
+    <LIBFILES value="c:\tmp\compile\cppunit_1_10.lib c:\tmp\compile\mockpp_production_34.lib"/>
     <LIBRARIES value=""/>
     <SPARELIBS value="VCL50.lib"/>
     <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
@@ -63,8 +63,8 @@
     <USERDEFINES value="__DLL___;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
     <MAINSOURCE value="mockpp.bpf"/>
-    <INCLUDEPATH value="..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..\..\mockpp;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include"/>
-    <LIBPATH value="mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include"/>
+    <LIBPATH value="mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w8092 -w8091 -w8090 -w8089 -w8087 -wprc -wuse -wucp -wstv -wstu -wpin 
       -wnod -wnak -wdef -wcln -wbbf -wasm -wamp -wamb"/>
   </MACROS>
@@ -112,41 +112,41 @@
 
 [HistoryLists\hlIncludePath]
 Count=30
-Item0=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include
-Item1=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include
-Item2=..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;c:\home\arnold\cppunit-1.10.2\include\
-Item3=..\mockpp\matcher;..;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
-Item4=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
-Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
-Item6=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
-Item7=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include\
-Item8=$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include
-Item9=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include
-Item10=..;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include
-Item11=..\mockpp;..\..\mockpp-1.8.0;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include
-Item12=..;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include
-Item13=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include
-Item14=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item15=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item16=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item17=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item18=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item19=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
-Item20=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
-Item21=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
-Item22=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include
-Item23=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include
-Item24=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
-Item25=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
-Item26=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
-Item27=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include
-Item28=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
-Item29=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.8.0\include
+Item0=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..\..\mockpp;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include
+Item1=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;g:\data\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include
+Item2=..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;..\..\cppunit-1.10.2\include
+Item3=..\mockpp\matcher;..;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\;c:\home\arnold\cppunit-1.10.2\include\
+Item4=..\mockpp\matcher;..;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
+Item5=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
+Item6=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
+Item7=..;$(BCB)\include;X:\Documents\src\cppunit-1.10.2\include\
+Item8=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include\
+Item9=$(BCB)\include;..\..\cppunit-1.10\include;X:\Documents\src\cppunit-1.10.2\include
+Item10=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\stub;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp-1.8.0;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include
+Item11=..;X:\cppunit-1.10.2\include\;..\..\mockpp;$(BCB)\include;..\..\cppunit-1.10\include
+Item12=..\mockpp;..\..\mockpp-1.8.0;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include
+Item13=..;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include
+Item14=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;X:\cppunit-1.10.2\include\;..\..\cppunit-1.10\include
+Item15=..\mockpp;..\mockpp\production;..mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item16=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item17=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item18=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item19=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\..\mockpp;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item20=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\cppunit-1.10\include
+Item21=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
+Item22=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
+Item23=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include
+Item24=..;$(BCB)\include;..\..\..\cppunit-1.10.2\include;..\..\..\cppunit-1.10\include
+Item25=..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\include;..\..\..\cppunit-1.10.2\include
+Item26=..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
+Item27=..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..\..\mockpp;$(BCB)\include;..\..\..\cppunit.ups\include
+Item28=..\mockpp;..;$(BCB)\include;..\..\..\cppunit.ups\include
+Item29=..\mockpp_34\builder;..\mockpp_34\matcher;..\mockpp_34\constraint;..\builder;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\matcher;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\constraint;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\builder;..\mockpp_34\chaining;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp;\\SONNE\HOMES\Documents\src\mockpp_34\mockpp\mockpp_34\chaining;mockpp;\\SONNE\HOMES\src\mockpp_34\mockpp\mockpp;..\mockpp_34\compat;..\mockpp_34\util;..\mockpp;..;$(BCB)\include;..\..\..\cppunit-1.8.0\include
 
 [HistoryLists\hlLibraryPath]
 Count=19
-Item0=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
-Item1=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item0=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib
+Item1=mockpp;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp;..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
 Item2=..\mockpp\production;..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
 Item3=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..;$(BCB)\lib\obj;$(BCB)\lib
 Item4=..mockpp\builder;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\constraint;\\SONNE\HOMES\Documents\src\mockpp\mockpp\mockpp\builder;..\mockpp\stub;..\mockpp\matcher;..\mockpp\constraint;..\mockpp\builder;..\mockpp\chaining;..\mockpp\compat;..\mockpp\util;..\mockpp_34\matcher;..\mockpp_34\constraint;..\mockpp_34\builder;..\mockpp;..\mockpp_34\chaining;..\mockpp_34\compat;..\mockpp_34\util;..\..\mockpp;$(BCB)\lib\obj;$(BCB)\lib

Index: mockpp.bpf
===================================================================
RCS file: /cvsroot/mockpp/mockpp/bcb5/mockpp.bpf,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mockpp.bpf	31 Oct 2005 19:19:52 -0000	1.27
+++ mockpp.bpf	8 Dec 2005 17:29:48 -0000	1.28
@@ -1,4 +1,4 @@
-USELIB("c:\tmp\compile\cppunit_1_10_bcb5.lib");
+USELIB("c:\tmp\compile\cppunit_1_10.lib");
 USELIB("c:\tmp\compile\mockpp_production_34.lib");
 //---------------------------------------------------------------------------
 USEUNIT("..\mockpp\util\NotImplementedException.cpp");

[Mockpp-commits] mockpp/msvc2005/mockpp/examples/tutorial .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 basicmock.vcproj,NONE,1.1 chainmock.vcproj,NONE,1.1 cppunit.vcproj,NONE,1.1 poormock.vcproj,NONE,1.1 poormock_se.vcproj,NONE,1.1 visitmock.vcproj,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-08 17:26:14

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3460/msvc2005/mockpp/examples/tutorial

Added Files:
	.cvsignore Makefile.am basicmock.vcproj chainmock.vcproj 
	cppunit.vcproj poormock.vcproj poormock_se.vcproj 
	visitmock.vcproj 
Log Message:
new project files (converted from msvc71)

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
*.~*
*.user

--- NEW FILE: basicmock.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="basicmock"
	ProjectGUID="{67066CA0-B2AD-456C-8663-A1D93B0E7949}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
			IntermediateDirectory="$(TEMP)\compile\mockpp\examples\tutorial\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="WIN32,_CONSOLE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG,_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib"
				OutputFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/basicmock.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="$(TEMP)\compile\mockpp\examples\tutorial\Debug/basicmock.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			ATLMinimizesCRunTimeLibraryUsage="false"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="./basicmock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="4"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="./basicmock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				WarningLevel="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				Culture="1036"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release./basicmock.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				ProgramDatabaseFile="./basicmock.pdb"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\basicmock.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: poormock_se.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="poormock_se"
	ProjectGUID="{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="WIN32,_CONSOLE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="2"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock_se.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\poormock-se.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="2"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
					/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: poormock.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="poormock"
	ProjectGUID="{6CD5CF99-3185-4FD1-B172-DE5947721854}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="WIN32,_CONSOLE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="2"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/poormock.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\poormock.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="2"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
					/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: visitmock.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="visitmock"
	ProjectGUID="{ADC8008C-7D8F-44BC-9498-E1097B4DCCA1}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="WIN32,_CONSOLE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG,_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			ATLMinimizesCRunTimeLibraryUsage="false"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="./visitmock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="4"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="./visitmock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				WarningLevel="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				Culture="1036"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/visitmock.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				ProgramDatabaseFile="./visitmock.pdb"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\visitmock.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
					/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: chainmock.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="chainmock"
	ProjectGUID="{9C4E72A0-6393-429A-AFDB-64AE0FBB17C8}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="WIN32,_CONSOLE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG,_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			ATLMinimizesCRunTimeLibraryUsage="false"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="./chainmock.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="4"
				AdditionalIncludeDirectories="../../../.."
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="./chainmock.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				WarningLevel="4"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				Culture="1036"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/chainmock.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib"
				ProgramDatabaseFile="./chainmock.pdb"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\chainmock.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\consumer.h"
				>
			</File>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\interface.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: cppunit.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="cppunit"
	ProjectGUID="{4AEB7B36-6044-4B23-9754-22F7A28F785B}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="&quot;G:\data\src\cppunit-1.10.2\include&quot;;../../../..;&quot;$(CPPUNIT_ROOT)/include&quot;"
				PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib cppunitd_dll.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib,$(CPPUNIT_ROOT)/lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="2"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../../../..,$(CPPUNIT_ROOT)/include"
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE,CPPUNIT_DLL"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ObjectFile="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\tutorial\Release/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib cppunit_dll.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../../lib,$(CPPUNIT_ROOT)/lib"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Release/cppunit.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\cppunit.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="2"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
					/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl"
			>
			<File
				RelativePath="..\..\..\..\mockpp\examples\tutorial\Calculator.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: Makefile.am ---
all:

EXTRA_DIST = basicmock.vcproj visitmock.vcproj chainmock.vcproj poormock.vcproj poormock_se.vcproj cppunit.vcproj

CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~  *SD*.EA

[Mockpp-commits] mockpp/msvc2005/mockpp/examples/tutorial - New directory

From: Ewald A. <ewa...@us...> - 2005-12-08 17:25:28

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3325/msvc2005/mockpp/examples/tutorial

Log Message:
Directory /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples/tutorial added to the repository

[Mockpp-commits] mockpp/msvc2005/mockpp/tests .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 mock_test.vcproj,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-08 17:24:22

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3030/msvc2005/mockpp/tests

Added Files:
	.cvsignore Makefile.am mock_test.vcproj 
Log Message:
new project files (converted from msvc71)

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
*.~*
*.user

--- NEW FILE: Makefile.am ---
EXTRA_DIST = mock_test.vcproj

CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~



--- NEW FILE: mock_test.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="mock_test"
	ProjectGUID="{F22BA7AF-9CFC-4F2A-947D-69AF7C466635}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\tests\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\tests\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\tests\Release/mock_test.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="2"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include"
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE,CPPUNIT_DLL"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\tests\Release/mock_test.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\tests\Release/"
				ObjectFile="C:\tmp\compile\mockpp\tests\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\tests\Release/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib cppunit_dll.lib"
				OutputFile="C:\tmp\compile\mockpp\tests\Release/mock_test.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\tests\Release/mock_test.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\tests\Debug"
			IntermediateDirectory="C:\tmp\compile\mockpp\tests\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="c:\tmp\compile\mockpp\tests\Debug/mock_test.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="&quot;G:\data\src\cppunit-1.10.2\include&quot;;..\..\..;&quot;$(CPPUNIT_ROOT)/include&quot;"
				PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\tests\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\tests\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\tests\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib cppunitd_dll.lib"
				OutputFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\tests\Debug/mock_test.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\mockpp\tests\AbstractDynamicChainingMock_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\AbstractInvocationDispatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\And_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\AnyArgumentsMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ArgumentsMatchBuilder_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ArgumentsMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\Assert_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\AssertMo_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockMethod_1_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockMethod_2_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockMethod_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_1_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_1_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_2_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_2_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_3_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_3_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_4_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_4_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_5_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_5_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObject_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainableMockObjectPolymorphism_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainingMockBuilder_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ChainingMockObjectSupport_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\classes_ABCDE.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ConstraintList_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ConstraintSet_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\CoreMock_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\CustomStub_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\DefaultResultStub_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\DynamicChainingMockError_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\Exception_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationBoundary_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationConglomeration_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationCounter_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationCounterRange_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationList_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationMap_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationSegment_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationSet_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ExpectationValue_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\FIFOInvocationDispatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\Formatter_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\Invocation_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvocationMocker_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvocationMockerBuilder_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokeAtLeastMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokeAtLeastOnceMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokeAtMostMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokeCountMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokedAfterMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokedBeforeMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokedRecorder_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\InvokeOnceMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsAnything_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsCloseTo_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsEqual_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsGreaterOrEqual_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsGreaterThan_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsInstanceOf_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsLessOrEqual_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsLessThan_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsNot_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsNothing_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\IsSame_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\LIFOInvocationDispatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\MatchBuilder_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\MixedMockObject_5_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\mock_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\MockObject_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\mockpp_pti_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\mockpp_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\NoArgumentsMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\Or_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\OutBound_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ResponseVector_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ReturnObjectList_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ReturnStub_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\StringContains_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\StringEndsWith_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\StringStartsWith_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\StubBuilder_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\StubSequence_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\TestFailureMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\TestFailureStub_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\Throwable_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ThrowableList_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\ThrowStub_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\TimeServer_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\TrackingCounter_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\TypelessStubSequence_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\UnlimitedMatcher_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\Verifiable_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VerifyingTestCaller_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VerifyingTestCase_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockMethod_1_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockMethod_2_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockMethod_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_1_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_1_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_2_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_2_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_3_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_3_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_4_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_4_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_5_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_5_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_template_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VisitableMockObject_void_test.cpp"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\VoidStub_test.cpp"
				>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl"
			>
			<File
				RelativePath="..\..\..\mockpp\tests\classes_ABCDE.h"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\MyBuilderNamespace.h"
				>
			</File>
			<File
				RelativePath="..\..\..\mockpp\tests\MyMatchBuilder.h"
				>
			</File>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Mockpp-commits] mockpp/msvc2005 .cvsignore,NONE,1.1 Makefile.am,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-08 17:24:22

Update of /cvsroot/mockpp/mockpp/msvc2005
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3030/msvc2005

Added Files:
	.cvsignore Makefile.am 
Log Message:
new project files (converted from msvc71)

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
*.~*

--- NEW FILE: Makefile.am ---
SUBDIRS = mockpp lib

CLEANFILES = *.~* *.~~* *~

[Mockpp-commits] mockpp/msvc2005/mockpp/examples .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 examples.vcproj,NONE,1.1

From: Ewald A. <ewa...@us...> - 2005-12-08 17:24:22

Update of /cvsroot/mockpp/mockpp/msvc2005/mockpp/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3030/msvc2005/mockpp/examples

Added Files:
	.cvsignore Makefile.am examples.vcproj 
Log Message:
new project files (converted from msvc71)

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
*.~*
*.user
--- NEW FILE: examples.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="8,00"
	Name="examples"
	ProjectGUID="{15A26E8F-FE6D-4EA6-9B41-26306D17F76A}"
	>
	<Platforms>
		<Platform
			Name="Win32"
		/>
	</Platforms>
	<ToolFiles>
	</ToolFiles>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\Debug"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\Debug"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\Debug/examples.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include"
				PreprocessorDefinitions="WIN32,_CONSOLE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\Debug/examples.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\Debug/"
				ObjectFile="C:\tmp\compile\mockpp\examples\Debug/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\Debug/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				DebugInformationFormat="4"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockppd.lib cppunitd_dll.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\Debug/examples.exe"
				LinkIncremental="2"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
				GenerateDebugInformation="true"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Debug/examples.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="C:\tmp\compile\mockpp\examples\Release"
			IntermediateDirectory="C:\tmp\compile\mockpp\examples\Release"
			ConfigurationType="1"
			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
			UseOfMFC="0"
			ATLMinimizesCRunTimeLibraryUsage="false"
			CharacterSet="2"
			>
			<Tool
				Name="VCPreBuildEventTool"
			/>
			<Tool
				Name="VCCustomBuildTool"
			/>
			<Tool
				Name="VCXMLDataGeneratorTool"
			/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"
			/>
			<Tool
				Name="VCMIDLTool"
				TypeLibraryName="C:\tmp\compile\mockpp\examples\Release/examples.tlb"
				HeaderFileName=""
			/>
			<Tool
				Name="VCCLCompilerTool"
				Optimization="2"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include"
				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
				StringPooling="true"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="true"
				RuntimeTypeInfo="true"
				PrecompiledHeaderFile="C:\tmp\compile\mockpp\examples\Release/examples.pch"
				AssemblerListingLocation="C:\tmp\compile\mockpp\examples\Release/"
				ObjectFile="C:\tmp\compile\mockpp\examples\Release/"
				ProgramDataBaseFileName="C:\tmp\compile\mockpp\examples\Release/"
				WarningLevel="4"
				SuppressStartupBanner="true"
				CompileAs="0"
			/>
			<Tool
				Name="VCManagedResourceCompilerTool"
			/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1041"
			/>
			<Tool
				Name="VCPreLinkEventTool"
			/>
			<Tool
				Name="VCLinkerTool"
				AdditionalDependencies="mockpp.lib cppunit_dll.lib"
				OutputFile="C:\tmp\compile\mockpp\examples\Release/examples.exe"
				LinkIncremental="1"
				SuppressStartupBanner="true"
				AdditionalLibraryDirectories="../../lib,$(CPPUNIT_ROOT)/lib"
				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Release/examples.pdb"
				SubSystem="1"
				TargetMachine="1"
			/>
			<Tool
				Name="VCALinkTool"
			/>
			<Tool
				Name="VCManifestTool"
			/>
			<Tool
				Name="VCXDCMakeTool"
			/>
			<Tool
				Name="VCBscMakeTool"
			/>
			<Tool
				Name="VCFxCopTool"
			/>
			<Tool
				Name="VCAppVerifierTool"
			/>
			<Tool
				Name="VCWebDeploymentTool"
			/>
			<Tool
				Name="VCPostBuildEventTool"
			/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
			>
			<File
				RelativePath="..\..\..\mockpp\examples\mock_greeter.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					>
					<Tool
						Name="VCCLCompilerTool"
						Optimization="2"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
					/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl"
			>
		</Filter>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

--- NEW FILE: Makefile.am ---
SUBDIRS=tutorial

all:
 
EXTRA_DIST = examples.vcproj

CLEAN_FILES = *.plg *.opt *.ncb *.dep *.~* *.~~* *~

Flat | Threaded

<< < 1 .. 15 16 17 18 19 .. 51 > >> (Page 17 of 51)

2005	Jan	Feb (17)	Mar (178)	Apr (119)	May (60)	Jun (3)	Jul (60)	Aug (16)	Sep (55)	Oct (156)	Nov (136)	Dec (255)
2006	Jan (98)	Feb (8)	Mar (57)	Apr (43)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec