mockpp-commits

[Mockpp-commits] mockpp/mockpp/tests VisitableMockObject_1_void_test.cpp,1.18,1.19

[Ewald A. <ewa...@us...>]

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

Modified Files:
	VisitableMockObject_1_void_test.cpp 
Log Message:
OutBound abbreviation

Index: VisitableMockObject_1_void_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- VisitableMockObject_1_void_test.cpp	23 Jul 2005 13:31:57 -0000	1.18
+++ VisitableMockObject_1_void_test.cpp	23 Jul 2005 13:55:47 -0000	1.19
@@ -395,7 +395,7 @@
   MOCKPP_CONTROLLER_FOR_EXT(MyVisitableMockObject_1_void_ex, outbound, Ext) ctr1 (&mvo);
 
   mvo.outbound(new mockpp::OutBound<unsigned>(123));
-  mvo.outbound(new mockpp::OutBound<unsigned>(456));
+  mvo.outbound(mockpp::outBound<unsigned>(456));
   mvo.activate();
 
   unsigned val = 0;

[Mockpp-commits] mockpp/mockpp/chaining ChainingMockObjectSupport.h,1.20,1.21

[Ewald A. <ewa...@us...>]

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

Modified Files:
	ChainingMockObjectSupport.h 
Log Message:
OutBound abbreviation

Index: ChainingMockObjectSupport.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/ChainingMockObjectSupport.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ChainingMockObjectSupport.h	13 Mar 2005 19:13:24 -0000	1.20
+++ ChainingMockObjectSupport.h	23 Jul 2005 13:55:47 -0000	1.21
@@ -56,6 +56,7 @@
 #include <mockpp/constraint/IsGreaterOrEqual.h>
 #include <mockpp/constraint/IsLessThan.h>
 #include <mockpp/constraint/IsLessOrEqual.h>
+#include <mockpp/constraint/OutBound.h>
 
 #include <mockpp/chaining/CoreMock.h>
 
@@ -109,6 +110,20 @@
 TypelessConstraint::AP nothing();
 
 
+/** Passes a value back via a reference (outbound value).
+  * @ingroup grp_constraint_abbrev
+  * @see mockpp::OutBound
+  * @param  op  object to return at invoationwith
+  * @return the new constraint
+  */
+template <typename T>
+typename Constraint<T>::AP
+outBound( const T& op )
+{
+  return new OutBound<T>( op );
+}
+
+
 /** Creates a constraint that tests for equality
   * @ingroup grp_constraint_abbrev
   * @see mockpp::IsEqual
@@ -658,6 +673,7 @@
 using mockpp::never;
 using mockpp::isVoid;
 using mockpp::unlimited;
+using mockpp::outBound;
 #endif
 
 

[Mockpp-commits] mockpp/mockpp/constraint OutBound.h,NONE,1.1 Makefile.am,1.9,1.10

[Ewald A. <ewa...@us...>]

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

Modified Files:
	Makefile.am 
Added Files:
	OutBound.h 
Log Message:
OutBound new

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am	4 Mar 2005 23:35:56 -0000	1.9
+++ Makefile.am	23 Jul 2005 13:31:57 -0000	1.10
@@ -5,7 +5,7 @@
 libconstraintinclude_HEADERS = IsAnything.h IsCloseTo.h IsEqual.h \
 			IsGreaterThan.h 	IsInstanceOf.h IsLessThan.h IsNot.h IsNothing.h IsSame.h Or.h \
 			StringContains.h StringStartsWith.h StringEndsWith.h And.h IsGreaterOrEqual.h \
-      IsLessOrEqual.h Constraint.h ConstraintSet.h \
+      IsLessOrEqual.h Constraint.h ConstraintSet.h OutBound.h \
 	TypelessConstraint.h ConstraintHolder.h ConstraintList.h
 
 CLEANFILES = *.~* *.~~* *~ *.old

--- NEW FILE: OutBound.h ---
/** @file
    @brief  Passes a value back via a reference (outbound value).

 $Id: OutBound.h,v 1.1 2005/07/23 13:31:57 ewald-arnold Exp $

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

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

   begin                : Sat Jul 22 2005
   copyright            : (C) 2002-2005 by Ewald Arnold
   email                : mockpp at ewald-arnold dot de

   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.

 */

#ifndef MOCKPP_OutBound_H
#define MOCKPP_OutBound_H

#include <mockpp/mockpp.h> // always first

#include <mockpp/constraint/Constraint.h>
#include <mockpp/compat/Formatter.h>
#include <mockpp/ReturnObjectList.h>


namespace mockpp {


/** Passes a value back via a reference (outbound value).
  * @ingroup grp_constraint
  */
template <typename T>
class OutBound : public Constraint<T>
{
  public:

  /** Constructs the object
    * @param retArg   the first value to return
    */
    OutBound( const T &retArg )
      : returnObjects(MOCKPP_PCHAR("OutBound/returnObjects"), 0)
    {
      returnObjects.addObjectToReturn(retArg);
    }

  /** Adds another return value.
    * @param retArg   the next value to return
    */
    void addOutboundObject( const T &retArg )
    {
      returnObjects.addObjectToReturn(retArg);
    }

  /** Destroys the object
    */
    virtual ~OutBound()
    {}

  /** Evaluates the constraint.
    * The value is not actually evaluated but a value is returned.
    * @param arg the object which is passed the value.
    * @return true:  at least one return object is avaliable
    * @return false:  no more return objects are avaliable
    */
    virtual bool eval( const T &arg ) const
    {
      if (returnObjects.hasMoreObjects())
      {
        T &back_ref = const_cast<T&>(arg);
        back_ref = returnObjects.nextReturnObject();
        return true;
      }

      return false;
    }

  /** Appends the description of this object to the buffer.
    * @param buffer The buffer that the description is appended to.
    * @return The current content of the buffer data
    */
    virtual String describeTo( String &buffer ) const
    {
      String fmt = MOCKPP_PCHAR("returns %1");
      fmt << returnObjects.toString();
      buffer += fmt;
      return buffer;
    }

  private:

    mutable ReturnObjectList<T> returnObjects;
};


} // namespace mockpp


#endif // MOCKPP_OutBound_H

[Mockpp-commits] mockpp ChangeLog,1.54,1.55 TODO,1.44,1.45 mockpp.doxygen.in,1.14,1.15 mockpp.kdevelop,1.72,1.73 mockpp.spec.in,1.2,1.3

[Ewald A. <ewa...@us...>]

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

Modified Files:
	ChangeLog TODO mockpp.doxygen.in mockpp.kdevelop 
	mockpp.spec.in 
Log Message:
OutBound new

Index: mockpp.spec.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp.spec.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mockpp.spec.in	7 May 2005 17:00:31 -0000	1.2
+++ mockpp.spec.in	23 Jul 2005 13:31:56 -0000	1.3
@@ -14,6 +14,8 @@
 Requires: cppunit >= 1.10.0
 BuildArch: i586
 
+Source: ftp://download.sourceforge.net/pub/sourceforge/mockpp/%name-%version.tar.gz
+
 Prefix: %_prefix
 BuildRoot: %_tmppath/%name-%version-root
 
@@ -34,7 +36,7 @@
 a tutorial.
 
 %prep
-%__rm -r *
+%__rm -r $RPM_BUILD_ROOT
 
 # %setup
 CFLAGS="$RPM_OPT_FLAGS"  ../SOURCES/%name-%version/configure --prefix=%{prefix} --enable-doxygen
@@ -47,21 +49,21 @@
 %__rm -rf $RPM_BUILD_ROOT
 %__make prefix=$RPM_BUILD_ROOT%{prefix} install
 %__mkdir -p $RPM_BUILD_ROOT%{prefix}/share/doc/packages
-%__mv $RPM_BUILD_ROOT%{prefix}/share/mockpp $RPM_BUILD_ROOT%{prefix}/share/doc/packages
+%__mv $RPM_BUILD_ROOT%{prefix}/share/%lib_name $RPM_BUILD_ROOT%{prefix}/share/doc/packages
 
 %clean
-%__rm -rf $RPM_BUILD_ROOT
+#%__rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,755)
 %attr(755,root,root) %prefix/lib/lib*.so.*
-%prefix/share/doc/packages/mockpp/AUTHORS
-%prefix/share/doc/packages/mockpp/COPYING
-%prefix/share/doc/packages/mockpp/README
-%prefix/share/doc/packages/mockpp/ChangeLog
+%prefix/share/doc/packages/%lib_name/AUTHORS
+%prefix/share/doc/packages/%lib_name/COPYING
+%prefix/share/doc/packages/%lib_name/README
+%prefix/share/doc/packages/%lib_name/ChangeLog
 %prefix/include/*
 %attr(755,root,root) %prefix/lib/lib*.so
 %attr(644,root,root) %prefix/lib/*.*a
 
 %files doc
-%prefix/share/doc/packages/mockpp
+%prefix/share/doc/packages/%lib_name

Index: mockpp.doxygen.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mockpp.doxygen.in	27 May 2005 16:50:10 -0000	1.14
+++ mockpp.doxygen.in	23 Jul 2005 13:31:56 -0000	1.15
@@ -114,7 +114,7 @@
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        =
+STRIP_FROM_PATH        = @top_srcdir@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells

Index: TODO
===================================================================
RCS file: /cvsroot/mockpp/mockpp/TODO,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- TODO	6 May 2005 14:23:00 -0000	1.44
+++ TODO	23 Jul 2005 13:31:56 -0000	1.45
@@ -1,6 +1,8 @@
 DOC:
 ----
 
+  OutBound
+
   Problem Exception-Transformation??
 
 Tests

Index: mockpp.kdevelop
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp.kdevelop,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- mockpp.kdevelop	21 Apr 2005 20:35:56 -0000	1.72
+++ mockpp.kdevelop	23 Jul 2005 13:31:56 -0000	1.73
@@ -9,7 +9,7 @@
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
     <secondaryLanguages>
       <language>Perl</language>
       <language>Bash</language>
@@ -23,8 +23,8 @@
       <useconfiguration>unicode</useconfiguration>
     </general>
     <run>
-      <mainprogram/>
-      <programargs/>
+      <mainprogram>mockpp/tests/mock_test</mainprogram>
+      <programargs></programargs>
       <terminal>false</terminal>
       <envvars/>
       <directoryradio>executable</directoryradio>
@@ -140,14 +140,14 @@
   <kdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
-      <programargs/>
-      <gdbpath/>
+      <programargs></programargs>
+      <gdbpath></gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>true</floatingtoolbar>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
     </general>
     <display>
       <staticmembers>true</staticmembers>
@@ -241,7 +241,7 @@
       <headerCompletionDelay>250</headerCompletionDelay>
     </codecompletion>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ChangeLog	27 May 2005 08:19:10 -0000	1.54
+++ ChangeLog	23 Jul 2005 13:31:56 -0000	1.55
@@ -2,6 +2,10 @@
 
                             mockpp history
                             --------------
+2005-07-23  1.9.0:
+
+ - class OutBound enables outbound parameter references
+
 2005-05-28  1.8.2:
 
  - compatibility fixes for cygwin

[Mockpp-commits] mockpp/mockpp/tests OutBound_test.cpp,NONE,1.1 Makefile.am,1.76,1.77 ReturnObjectList_test.cpp,1.12,1.13 VisitableMockObject_1_void_test.cpp,1.17,1.18

[Ewald A. <ewa...@us...>]

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

Modified Files:
	Makefile.am ReturnObjectList_test.cpp 
	VisitableMockObject_1_void_test.cpp 
Added Files:
	OutBound_test.cpp 
Log Message:
OutBound new

Index: VisitableMockObject_1_void_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/VisitableMockObject_1_void_test.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- VisitableMockObject_1_void_test.cpp	27 Feb 2005 18:04:29 -0000	1.17
+++ VisitableMockObject_1_void_test.cpp	23 Jul 2005 13:31:57 -0000	1.18
@@ -44,6 +44,7 @@
 
 #include <mockpp/constraint/IsEqual.h>
 #include <mockpp/constraint/IsNot.h>
+#include <mockpp/constraint/OutBound.h>
 
 #include <cppunit/extensions/HelperMacros.h>
 
@@ -58,6 +59,7 @@
   CPPUNIT_TEST(test_parameter_ex);
   CPPUNIT_TEST(test_thrower);
   CPPUNIT_TEST(test_clear);
+  CPPUNIT_TEST(test_outbound);
   CPPUNIT_TEST(test_default_throw);
   CPPUNIT_TEST(test_constraint);
   CPPUNIT_TEST(test_controller_constraint);
@@ -76,6 +78,7 @@
    void test_controller();
    void test_thrower();
    void test_clear();
+   void test_outbound();
    void test_default_throw();
    void test_parameter();
    void test_parameter_ex();
@@ -122,12 +125,16 @@
     MyVisitableMockObject_1_void_ex(const mockpp::String &name)
       : mockpp::VisitableMockObject(name, 0),
         MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(visitable1, Ext),
+        MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT1(outbound, Ext),
         MOCKPP_CONSTRUCT_MEMBERS_FOR_VOID_VISITABLE_EXT0(visitable0, Ext)
     {}
 
     MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, visitable1, const std::string &,
                                                                 Ext,        std::string);
 
+    MOCKPP_VOID_VISITABLE_EXT1(MyVisitableMockObject_1_void_ex, outbound, unsigned &,
+                                                                Ext,      unsigned );
+
     MOCKPP_VOID_VISITABLE_EXT0(MyVisitableMockObject_1_void_ex, visitable0,
                                                                 Ext);
 
@@ -382,4 +389,21 @@
 }
 
 
+void VisitableMockObject_1_void_test::test_outbound()
+{
+  MyVisitableMockObject_1_void_ex mvo(MOCKPP_PCHAR("mvo"));
+  MOCKPP_CONTROLLER_FOR_EXT(MyVisitableMockObject_1_void_ex, outbound, Ext) ctr1 (&mvo);
+
+  mvo.outbound(new mockpp::OutBound<unsigned>(123));
+  mvo.outbound(new mockpp::OutBound<unsigned>(456));
+  mvo.activate();
+
+  unsigned val = 0;
+  mvo.outbound(val);
+  CPPUNIT_ASSERT_EQUAL((unsigned)123, val);
+  mvo.outbound(val);
+  CPPUNIT_ASSERT_EQUAL((unsigned)456, val);
+}
+
+
 #endif // HAVE_CPPUNIT

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- Makefile.am	7 May 2005 17:14:02 -0000	1.76
+++ Makefile.am	23 Jul 2005 13:31:57 -0000	1.77
@@ -55,25 +55,26 @@
 	VerifyingTestCaller_test.cpp TrackingCounter_test.cpp MixedMockObject_5_test.cpp TimeServer_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 \
-	IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \
-	Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \
-	TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \
-	CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \
-	AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \
-	InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \
-	TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \
-	ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \
-	AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \
-	CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \
-	InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \
-	InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \
-	InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \
-	ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \
-	ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \
-	ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \
-	ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \
-	StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp
+		IsEqual_test.cpp IsGreaterOrEqual_test.cpp IsGreaterThan_test.cpp IsInstanceOf_test.cpp \
+		IsLessOrEqual_test.cpp IsLessThan_test.cpp IsNot_test.cpp IsNothing_test.cpp IsSame_test.cpp \
+		Or_test.cpp ReturnStub_test.cpp StringContains_test.cpp StubSequence_test.cpp \
+		TestFailureStub_test.cpp ThrowStub_test.cpp VoidStub_test.cpp ChainingMockObjectSupport_test.cpp \
+		CustomStub_test.cpp DefaultResultStub_test.cpp mock_test.cpp Invocation_test.cpp \
+		AnyArgumentsMatcher_test.cpp InvokedRecorder_test.cpp InvokeAtLeastOnceMatcher_test.cpp \
+		InvokeOnceMatcher_test.cpp InvokeCountMatcher_test.cpp InvokedAfterMatcher_test.cpp \
+		TestFailureMatcher_test.cpp NoArgumentsMatcher_test.cpp ArgumentsMatcher_test.cpp \
+		ConstraintSet_test.cpp ArgumentsMatchBuilder_test.cpp InvocationMockerBuilder_test.cpp \
+		AbstractDynamicChainingMock_test.cpp AbstractInvocationDispatcher_test.cpp ChainingMockBuilder_test.cpp \
+		CoreMock_test.cpp DynamicChainingMockError_test.cpp FIFOInvocationDispatcher_test.cpp \
+		InvocationMocker_test.cpp LIFOInvocationDispatcher_test.cpp InvokeAtMostMatcher_test.cpp \
+		InvokedBeforeMatcher_test.cpp StubBuilder_test.cpp MatchBuilder_test.cpp \
+		InvokeAtLeastMatcher_test.cpp classes_ABCDE.cpp ChainableMockObject_1_test.cpp \
+		ChainableMockObject_1_void_test.cpp ChainableMockObject_2_test.cpp ChainableMockObject_2_void_test.cpp \
+		ChainableMockObject_3_test.cpp ChainableMockObject_3_void_test.cpp ChainableMockObject_4_test.cpp \
+		ChainableMockObject_4_void_test.cpp ChainableMockObject_5_test.cpp ChainableMockObject_5_void_test.cpp \
+		ChainableMockObject_test.cpp ChainableMockObject_void_test.cpp TypelessStubSequence_test.cpp \
+		StringEndsWith_test.cpp StringStartsWith_test.cpp UnlimitedMatcher_test.cpp mockpp_pti_test.cpp \
+	OutBound_test.cpp
 
 readability_test_SOURCES = readability_test.cpp classes_ABCDE.cpp
 

Index: ReturnObjectList_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/ReturnObjectList_test.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ReturnObjectList_test.cpp	28 Mar 2005 09:39:05 -0000	1.12
+++ ReturnObjectList_test.cpp	23 Jul 2005 13:31:57 -0000	1.13
@@ -47,6 +47,7 @@
 
     CPPUNIT_TEST(test_get_object);
     CPPUNIT_TEST(test_default);
+    CPPUNIT_TEST(test_tostring);
 
     CPPUNIT_TEST_EXCEPTION(fail_get_object,   mockpp::AssertionFailedError);
     CPPUNIT_TEST_EXCEPTION(fail_not_empty,   mockpp::AssertionFailedError);
@@ -57,6 +58,7 @@
 
    void test_get_object();
    void test_default();
+   void test_tostring();
 
    void fail_get_object();
    void fail_not_empty();
@@ -142,5 +144,17 @@
   CPPUNIT_ASSERT(!rol.hasMoreObjects());
 }
 
+void ReturnObjectList_test::test_tostring()
+{
+  mockpp::ReturnObjectList<unsigned> rol (MOCKPP_PCHAR("data"), 0);
+  CPPUNIT_ASSERT(MOCKPP_PCSTRING("[]") == rol.toString());
+
+  rol.addObjectToReturn(456);
+  CPPUNIT_ASSERT(MOCKPP_PCSTRING("\n[\n - 456\n]\n") == rol.toString());
+
+  rol.setDefaultReturnVaue(123);
+  CPPUNIT_ASSERT(MOCKPP_PCSTRING("\n[\n - 456\n * 123\n]\n") == rol.toString());
+}
+
 
 #endif // HAVE_CPPUNIT

--- NEW FILE: OutBound_test.cpp ---
/***************************************************************************
             OutBound_test.cpp  -  unit tests for OutBound class
                             -------------------
    begin                : Sat Jul 23 2005
    copyright            : (C) 2002-2005 by Ewald Arnold
    email                : mockpp at ewald-arnold dot de

  $Id: OutBound_test.cpp,v 1.1 2005/07/23 13:31:57 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.
 *
 ***************************************************************************/

#include <mockpp/mockpp.h> // always first

#ifndef HAVE_CPPUNIT

# warning CppUnit not available at compile time

#else

#include <mockpp/constraint/OutBound.h>

#include <cppunit/extensions/HelperMacros.h>

class OutBound_test : public CppUnit::TestFixture
{
 public:

CPPUNIT_TEST_SUITE( OutBound_test );

  CPPUNIT_TEST(test_describe);
  CPPUNIT_TEST(test_invoke);

CPPUNIT_TEST_SUITE_END();

 public:

   void test_describe();
   void test_invoke();
};


CPPUNIT_TEST_SUITE_REGISTRATION(OutBound_test);


void OutBound_test::test_describe()
{
   mockpp::OutBound<int> myequal (456);
   mockpp::String s;
   CPPUNIT_ASSERT(myequal.describeTo(s) == MOCKPP_PCHAR("returns \n[\n - 456\n]\n"));
   CPPUNIT_ASSERT(s == MOCKPP_PCHAR("returns \n[\n - 456\n]\n"));
}


void OutBound_test::test_invoke()
{
   mockpp::OutBound<mockpp::String> myequal (MOCKPP_PCHAR("string-1"));
   myequal.addOutboundObject(MOCKPP_PCHAR("string-2"));
   mockpp::String s;
   CPPUNIT_ASSERT(myequal.eval(s) == true);
   CPPUNIT_ASSERT(s == MOCKPP_PCHAR("string-1"));
   CPPUNIT_ASSERT(myequal.eval(s) == true);
   CPPUNIT_ASSERT(s == MOCKPP_PCHAR("string-2"));
   CPPUNIT_ASSERT(myequal.eval(s) == false);
}


#endif // HAVE_CPPUNIT

[Mockpp-commits] mockpp/mockpp ReturnObjectList.h,1.26,1.27

[Ewald A. <ewa...@us...>]

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

Modified Files:
	ReturnObjectList.h 
Log Message:
OutBound new

Index: ReturnObjectList.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ReturnObjectList.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ReturnObjectList.h	7 May 2005 12:45:10 -0000	1.26
+++ ReturnObjectList.h	23 Jul 2005 13:31:57 -0000	1.27
@@ -50,7 +50,7 @@
   * list is check to make sure that all the object in it are used and that none
   * are left over at the end of a test.</p>
   *
-  * For evehasMoreObjectsr sucessive call to nextReturnObject the next object in the list will
+  * For every sucessive call to nextReturnObject the next object in the list will
   * returned.
   *
   * If the nextReturnObject method is called and there are no objects in the list
@@ -159,6 +159,37 @@
     }
 
 
+  /** Transform the object's state to a human readable string.
+    * The string only contains the remaining objects.
+    * @return string representation
+    */
+    virtual String toString() const
+    {
+      if (myObjects.size() == 0 && !haveDefault)
+        return MOCKPP_PCHAR("[]");
+
+      String ret;
+      ret += MOCKPP_PCHAR("\n[\n");
+
+      for(unsigned i = 0; i < myObjects.size(); ++i)
+      {
+        String fmt = MOCKPP_PCHAR(" - %1\n");
+        fmt << myObjects[i];
+        ret += fmt;
+      }
+
+      if (haveDefault)
+      {
+        String fmt = MOCKPP_PCHAR(" * %1\n");
+        fmt << defaultObject;
+        ret += fmt;
+      }
+
+      ret += MOCKPP_PCHAR("]\n");
+      return ret;
+    }
+
+
   /** Returns true if there are more objects to be returned.
     */
     bool hasMoreObjects() const

[Mockpp-commits] mockpp/mockpp VisitableMockObject_macro.h,1.29,1.30

[Ewald A. <ewa...@us...>]

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

Modified Files:
	VisitableMockObject_macro.h 
Log Message:
OutBound new

Index: VisitableMockObject_macro.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/VisitableMockObject_macro.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- VisitableMockObject_macro.h	7 May 2005 12:45:11 -0000	1.29
+++ VisitableMockObject_macro.h	23 Jul 2005 13:30:49 -0000	1.30
@@ -737,7 +737,7 @@
            m_name ## Parameter1.balanceActual(); \
            throw; \
          } \
-         m_name ## Parameter1.addActual((v_type1)param1); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
          return; \
       }  \
     } \
@@ -790,8 +790,8 @@
            m_name ## Parameter2.balanceActual(); \
            throw; \
          } \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
          return; \
       }  \
     }     \
@@ -851,9 +851,9 @@
            m_name ## Parameter3.balanceActual(); \
            throw; \
          } \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
-         m_name ## Parameter3.addActual((v_type3)param3); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
+         m_name ## Parameter3.addActual((v_type3&)param3); \
          return; \
       }  \
     }     \
@@ -920,10 +920,10 @@
            m_name ## Parameter4.balanceActual(); \
            throw; \
          } \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
-         m_name ## Parameter3.addActual((v_type3)param3); \
-         m_name ## Parameter4.addActual((v_type4)param4); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
+         m_name ## Parameter3.addActual((v_type3&)param3); \
+         m_name ## Parameter4.addActual((v_type4&)param4); \
          return; \
       }  \
     }     \
@@ -997,11 +997,11 @@
            m_name ## Parameter5.balanceActual(); \
            throw; \
          } \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
-         m_name ## Parameter3.addActual((v_type3)param3); \
-         m_name ## Parameter4.addActual((v_type4)param4); \
-         m_name ## Parameter5.addActual((v_type5)param5); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
+         m_name ## Parameter3.addActual((v_type3&)param3); \
+         m_name ## Parameter4.addActual((v_type4&)param4); \
+         m_name ## Parameter5.addActual((v_type5&)param5); \
          return; \
       }  \
     }     \
@@ -1102,7 +1102,7 @@
            m_name ## Parameter1.balanceActual(); \
            throw; \
          } \
-         m_name ## Parameter1.addActual((v_type1)param1); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
          \
          v_ret_type ret_val; \
          if (m_name ## ResponseValues.find(ret_val, (v_type1)param1)) \
@@ -1169,8 +1169,8 @@
            throw; \
          } \
          \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
          v_ret_type ret_val; \
          if (m_name ## ResponseValues.find(ret_val, (v_type1)param1, (v_type2)param2)) \
             return ret_val; \
@@ -1243,9 +1243,9 @@
            throw; \
          } \
          \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
-         m_name ## Parameter3.addActual((v_type3)param3); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
+         m_name ## Parameter3.addActual((v_type3&)param3); \
          v_ret_type ret_val; \
          if (m_name ## ResponseValues.find(ret_val, (v_type1)param1, (v_type2)param2, (v_type3)param3)) \
             return ret_val; \
@@ -1324,10 +1324,10 @@
            throw; \
          } \
          \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
-         m_name ## Parameter3.addActual((v_type3)param3); \
-         m_name ## Parameter4.addActual((v_type4)param4); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
+         m_name ## Parameter3.addActual((v_type3&)param3); \
+         m_name ## Parameter4.addActual((v_type4&)param4); \
          v_ret_type ret_val; \
          if (m_name ## ResponseValues.find(ret_val, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4)) \
             return ret_val; \
@@ -1413,11 +1413,11 @@
            throw; \
          } \
          \
-         m_name ## Parameter1.addActual((v_type1)param1); \
-         m_name ## Parameter2.addActual((v_type2)param2); \
-         m_name ## Parameter3.addActual((v_type3)param3); \
-         m_name ## Parameter4.addActual((v_type4)param4); \
-         m_name ## Parameter5.addActual((v_type5)param5); \
+         m_name ## Parameter1.addActual((v_type1&)param1); \
+         m_name ## Parameter2.addActual((v_type2&)param2); \
+         m_name ## Parameter3.addActual((v_type3&)param3); \
+         m_name ## Parameter4.addActual((v_type4&)param4); \
+         m_name ## Parameter5.addActual((v_type5&)param5); \
          v_ret_type ret_val; \
          if (m_name ## ResponseValues.find(ret_val, (v_type1)param1, (v_type2)param2, (v_type3)param3, (v_type4)param4, (v_type5)param5)) \
             return ret_val; \

[Mockpp-commits] mockpp/mockpp Makefile.am,1.83,1.84

[Ewald A. <ewa...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
updte

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- Makefile.am	6 May 2005 18:41:32 -0000	1.83
+++ Makefile.am	2 Jul 2005 13:50:09 -0000	1.84
@@ -245,9 +245,11 @@
 	echo "" >>$@
 	-test $@ -ef $(srcdir) || cp $@ $(srcdir)
 
-i18n_files = $(srcdir)/*.cpp $(srcdir)/*.h $(srcdir)/compat/*.h $(srcdir)/compat/*.cpp $(srcdir)/util/*.h $(srcdir)/util/*.cpp
+i18n_files = $(srcdir)/*.cpp $(srcdir)/*.h \
+             $(srcdir)/compat/*.h $(srcdir)/compat/*.cpp \
+             $(srcdir)/util/*.h $(srcdir)/util/*.cpp
 
 messages:
-	cd $(srcdir) && xgettext `ls $(i18n_files)` -C -kI18N_NOOP -ki18n -o  $(top_srcdir)/po/$(PACKAGE).pot
+	cd $(srcdir) && xgettext `ls $(i18n_files)` -C -kMOCKPP_I18N_NOOP -kmockpp_i18n -o  $(srcdir)/po/$(PACKAGE).pot
 
 

[Mockpp-commits] mockpp/mockpp/docs/en index.docbook,1.28,1.29

[Ewald A. <ewa...@us...>]

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

Modified Files:
	index.docbook 
Log Message:
current date

Index: index.docbook
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- index.docbook	17 Jun 2005 18:58:36 -0000	1.28
+++ index.docbook	2 Jul 2005 13:49:44 -0000	1.29
@@ -10,7 +10,7 @@
   <!ENTITY cppunit      '<application>cppunit</application>' >
   <!ENTITY copyyears    '2002-2005'                          >
   <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de'      >
-  <!ENTITY release_date '<date>2005-06-17</date>'            >
+  <!ENTITY release_date '<pubdate>Published: <?dbtimestamp format="Y-m-d"?></pubdate>' >
   <!ENTITY release_info '<releaseinfo>1.08.02</releaseinfo>' >
 
   <!ENTITY chap_bookinfo               SYSTEM 'bookinfo.docbook'              >

[Mockpp-commits] mockpp/mockpp/docs/en faq.docbook,1.6,1.7 index.docbook,1.27,1.28

[Ewald A. <ewa...@us...>]

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

Modified Files:
	faq.docbook index.docbook 
Log Message:
updated faq

Index: faq.docbook
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/faq.docbook,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- faq.docbook	23 Apr 2005 18:22:28 -0000	1.6
+++ faq.docbook	17 Jun 2005 18:58:36 -0000	1.7
@@ -91,6 +91,104 @@
 
  <!-- -->
 
+
+ <qandaentry>
+  <question>
+   <para>Why does &mockpp; uses that rather complicated <classname>Formatter</classname>
+   class?</para>
+  </question>
+
+  <answer>
+  <para>The two reasons to use this aproach were enhanced readability and
+  better support for internationalisation:</para>
+
+  <para>Simply take the example from the handbook:
+
+  <programlisting>
+
+    Person pers("Bob", 6);
+    String  format = "%4 says: %3 plus %2 gives %1";
+
+    string one = "one";
+    string two = "two";
+    string three = "three";
+
+    format &lt;&lt; three   // %1
+           &lt;&lt; two     // %2
+           &lt;&lt; one     // %3
+           &lt;&lt; pers;   // %4
+
+    std::cout &lt;&lt; format &lt;&lt; std::endl;
+  </programlisting>
+
+  The format string already gives you a good idea about the result, you only
+  have to substitute the <token>%</token> by the actual values.</para>
+
+  <para>Please also understand that I intentionally reverted the order of the
+  <token>%</token>-substitutes to show this possibility. More about the need for
+  this below.</para>
+
+  <para>On the contrary it is far more difficult to understand the outcome with
+  standard streaming operators:
+
+  <programlisting>
+
+    cout &lt;&lt; pers.toString()
+         &lt;&lt; " says: "
+         &lt;&lt; one
+         &lt;&lt; " plus "
+         &lt;&lt; two
+         &lt;&lt; " give "
+         &lt;&lt; three;
+  </programlisting>
+
+  I am pretty sure you will forget the one or the other space which seperates
+  for example the literal "plus" from the variable "two".</para>
+
+
+  <para>The other important point is: you can't translate the second solution reasonably.
+  Translating "says:" and "plus" seperately and concatenating them like above often
+  results in the nonsense you get when you read manuals for devices from
+  the far east. Often also the order of the substituted words change in the
+  translated version. In this case the translator simply would swap <token>%1</token>
+  and <token>%2</token>.</para>
+
+  <para>Maybe you don't find it worth the effort but english is not the only language
+  on earth, so why not prepare a nice way to translate the library?
+  Someone interested in a translated version simply uses <command>xgettext</command>
+  to collect the strings, translates them with a simple editor and replaces macro
+  <function>mockpp_i18n()</function> with the according call from the standard
+  <systemitem class="library">intl</systemitem> package.</para>
+
+  <para>And overloading <function>operator&lt;&lt;</function> is similar to the standard
+  iomanip functions:
+
+  <programlisting>
+
+  class CA
+  {
+    String toString()
+    {
+      ...
+    }
+    ...
+  };
+
+  String &amp; operator &lt;&lt; (String &amp;formatter, const CA &amp;o)
+  {
+    return ::operator&lt;&lt; (formatter, o.toString());
+  }
+  </programlisting>
+
+  Additionally you can use <function>MOCKPP_ENABLE_DEFAULT_FORMATTER</function>
+  to generate a default <function>operator&lt;&lt;</function> which outputs the
+  class name which is often enough.</para>
+
+  </answer>
+ </qandaentry>
+
+ <!-- -->
+
  <qandaentry>
 
   <question>

Index: index.docbook
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/index.docbook,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- index.docbook	30 Apr 2005 21:14:41 -0000	1.27
+++ index.docbook	17 Jun 2005 18:58:36 -0000	1.28
@@ -10,8 +10,8 @@
   <!ENTITY cppunit      '<application>cppunit</application>' >
   <!ENTITY copyyears    '2002-2005'                          >
   <!ENTITY mockpp_email 'mockpp at ewald-arnold dot de'      >
-  <!ENTITY release_date '<date>2005-05-01</date>'            >
-  <!ENTITY release_info '<releaseinfo>1.08.00</releaseinfo>' >
+  <!ENTITY release_date '<date>2005-06-17</date>'            >
+  <!ENTITY release_info '<releaseinfo>1.08.02</releaseinfo>' >
 
   <!ENTITY chap_bookinfo               SYSTEM 'bookinfo.docbook'              >
   <!ENTITY chap_intro                  SYSTEM 'intro.docbook'                 >

[Mockpp-commits] mockpp configure.in,1.81,1.82

[Ewald A. <ewa...@us...>]

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

Modified Files:
	configure.in 
Log Message:
cleanup for release

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- configure.in	27 May 2005 16:50:10 -0000	1.81
+++ configure.in	13 Jun 2005 20:33:25 -0000	1.82
@@ -266,9 +266,10 @@
 fi
 
 AC_SUBST(MAKE_FO_XSL)
-dnl ------------------------------------------------------------------------
 ])
 
+dnl ------------------------------------------------------------------------
+
 AC_DEFUN([EA_ENABLE_UNICODE],
 [
 AC_ARG_ENABLE(unicode, [  --enable-unicode        generate library with wchar_t/std::wstring instead of char/std::string])

[Mockpp-commits] mockpp/mockpp/docs/en Makefile.am,1.26,1.27

[Ewald A. <ewa...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
cleanup for release

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	27 May 2005 08:15:53 -0000	1.26
+++ Makefile.am	13 Jun 2005 20:33:25 -0000	1.27
@@ -65,7 +65,7 @@
 ################################################################
 
 pdf-files:
-	xsltproc --output var/mockpp.fo /usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl $(srcdir)/index.docbook
+	xsltproc --output var/mockpp.fo $MAKE_FO_XSL $(srcdir)/index.docbook
 	fop var/mockpp.fo var/mockpp.pdf
 
 svg-files:

[Mockpp-commits] mockpp/mockpp/docs/en .cvsignore,1.6,1.7

[Ewald A. <ewa...@us...>]

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

Modified Files:
	.cvsignore 
Log Message:
update

Index: .cvsignore
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- .cvsignore	27 May 2005 08:15:53 -0000	1.6
+++ .cvsignore	29 May 2005 20:09:39 -0000	1.7
@@ -5,3 +5,4 @@
 Makefile.in
 index.cache.bz2
 *.kdevses
+customize.xsl

[Mockpp-commits] mockpp configure.in,1.80,1.81 mockpp.doxygen.in,1.13,1.14

[Ewald A. <ewa...@us...>]

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

Modified Files:
	configure.in mockpp.doxygen.in 
Log Message:
cygwin fix

Index: mockpp.doxygen.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mockpp.doxygen.in	27 May 2005 08:00:24 -0000	1.13
+++ mockpp.doxygen.in	27 May 2005 16:50:10 -0000	1.14
@@ -1097,7 +1097,7 @@
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = YES
+HAVE_DOT               = @HAVE_DOT@
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for each documented class showing the direct and

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- configure.in	27 May 2005 08:20:06 -0000	1.80
+++ configure.in	27 May 2005 16:50:10 -0000	1.81
@@ -17,7 +17,7 @@
 #
 MOCKPP_MAJOR_VERSION=1
 MOCKPP_MINOR_VERSION=8
-MOCKPP_PATCH_VERSION=1
+MOCKPP_PATCH_VERSION=2
 
 MOCKPP_MICRO_VERSION=29
 MOCKPP_INTERFACE_AGE=1
@@ -195,12 +195,8 @@
 # ----------------------------------------------------------------------------
 
 AC_DEFUN([EA_ENABLE_DOXYGEN],[
-possible_paths="$PATH"
-EA_FIND_FILE(doxygen, $possible_paths, doxy_path, dummy)
-if test x$doxy_path != xNO; then
-  echo "** $doxy_path/doxygen"
-  DOXYGEN=$doxy_path/doxygen
-else
+AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
+if test x$DOXYGEN = x; then
   DOXYGEN=doxygen
   echo "*******************************************************"
   echo "***  doxygen not found."
@@ -208,14 +204,10 @@
 fi
 
 AC_SUBST(DOXYGEN)
-AC_SUBST(DOXYGEN_REPLACEMENTS)
-AC_SUBST(DOXYTAGS_DIR)
 
-possible_paths="$PATH"
-EA_FIND_FILE(dot, $possible_paths, dot_path, dummy)
-if test x$dot_path != xNO; then
-  echo "** $dot_path/dot"
-  DOT_PATH=$dot_path
+AC_PATH_PROG(DOT, dot, , $PATH)
+if ! test x$DOT = x; then
+  DOT_PATH=`dirname $DOT`
   HAVE_DOT=yes
 else
   DOT_PATH=/usr/bin
@@ -226,13 +218,14 @@
 fi
 
 AC_SUBST(DOT_PATH)
+AC_SUBST(DOT)
 AC_SUBST(HAVE_DOT)
 ])
 
 dnl ------------------------------------------------------------------------
 
 AC_DEFUN([EA_ENABLE_DOCBOOK],[
-possible_paths="$PATH"
+possible_paths="/usr/bin /usr/local/bin"
 EA_FIND_FILE("xsltproc xmlto", $possible_paths, xsltproc_path, xsltproc_bin)
 if test x$xsltproc_path != xNO; then
   XSLTPROC=$xsltproc_path/$xsltproc_bin
@@ -465,6 +458,7 @@
   mockpp/docs/Makefile \
   mockpp/docs/api/Makefile \
   mockpp/docs/en/Makefile \
+  mockpp/docs/en/customize.xsl \
   mockpp/docs/en/common/Makefile \
   mockpp/docs/en/images/Makefile \
   mockpp/docs/en/images/callouts/Makefile \

[Mockpp-commits] mockpp/mockpp/docs/api Makefile.am,1.16,1.17

[Ewald A. <ewa...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
cygwin fix

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/api/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	7 May 2005 17:00:56 -0000	1.16
+++ Makefile.am	27 May 2005 16:49:28 -0000	1.17
@@ -19,6 +19,7 @@
 	-test -d html && rm -rf html
 	sed -e "s#TOP_SRCDIR#$(top_srcdir)#g" \
 	-e "s#MOCKPP_VERSION#$(MOCKPP_VERSION)#g"  \
+	-e "s#HAVE_DOT#@HAVE_DOT@#g"  \
 	$(top_srcdir)/mockpp.doxygen.in >tmp.doxygen
 	$(DOXYGEN) tmp.doxygen
 	rm tmp.doxygen

[Mockpp-commits] mockpp/mockpp/docs/en customize-chunked.xsl,1.2,1.3 customize.xsl,1.9,NONE

[Ewald A. <ewa...@us...>]

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

Added Files:
	customize-chunked.xsl 
Removed Files:
	customize.xsl 
Log Message:
removed wrong file

--- NEW FILE: customize-chunked.xsl ---
<?xml version='1.0'?>

<!-- Customisation for chunked html files

     $Id: customize-chunked.xsl,v 1.3 2005/05/27 11:27:22 ewald-arnold Exp $
-->

<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  version="1.0">

  <xsl:import href="customize.xsl"/>

  <xsl:param name="chunk.section.depth"                    select="2"/>

</xsl:stylesheet>


--- customize.xsl DELETED ---

[Mockpp-commits] mockpp/mockpp/production mockpp_production.h,1.2,1.3

[Ewald A. <ewa...@us...>]

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

Modified Files:
	mockpp_production.h 
Log Message:
comment

Index: mockpp_production.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/production/mockpp_production.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mockpp_production.h	30 Apr 2005 21:15:45 -0000	1.2
+++ mockpp_production.h	27 May 2005 08:20:59 -0000	1.3
@@ -1,5 +1,5 @@
 /** @file
-    @brief    Time dependent objects
+    @brief Support in production code
 
   $Id$
 

[Mockpp-commits] mockpp configure.in,1.79,1.80

[Ewald A. <ewa...@us...>]

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

Modified Files:
	configure.in 
Log Message:
cygwin fix

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- configure.in	21 May 2005 14:17:49 -0000	1.79
+++ configure.in	27 May 2005 08:20:06 -0000	1.80
@@ -194,44 +194,87 @@
 
 # ----------------------------------------------------------------------------
 
-AC_DEFUN([EA_ENABLE_DOXYGEN],
-[
-AC_ARG_ENABLE(doxygen, [  --enable-doxygen        enable documentation generation with doxygen (auto)])
-AC_ARG_ENABLE(dot, [  --enable-dot            use 'dot' to generate graphs in doxygen (auto)])
-AC_ARG_ENABLE(html-docs, [  --enable-html-docs      enable HTML generation with doxygen (yes)], [], [ enable_html_docs=yes])
-AC_ARG_ENABLE(latex-docs, [  --enable-latex-docs     enable LaTeX documentation generation with doxygen (no)], [], [ enable_latex_docs=no])
-
-if test "x$enable_doxygen" = xno; then
-        enable_doc=no
+AC_DEFUN([EA_ENABLE_DOXYGEN],[
+possible_paths="$PATH"
+EA_FIND_FILE(doxygen, $possible_paths, doxy_path, dummy)
+if test x$doxy_path != xNO; then
+  echo "** $doxy_path/doxygen"
+  DOXYGEN=$doxy_path/doxygen
 else
-        AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
-        if test x$DOXYGEN = x; then
-                if test "x$enable_doxygen" = xyes; then
-                        AC_MSG_ERROR([could not find doxygen])
-                fi
-                enable_doc=no
-        else
-                enable_doc=yes
-                AC_PATH_PROG(DOT, dot, , $PATH)
-        fi
+  DOXYGEN=doxygen
+  echo "*******************************************************"
+  echo "***  doxygen not found."
+  echo "********************************************************"
 fi
 
-AM_CONDITIONAL(DOC, test x$enable_doc = xyes)
+AC_SUBST(DOXYGEN)
+AC_SUBST(DOXYGEN_REPLACEMENTS)
+AC_SUBST(DOXYTAGS_DIR)
 
-if test x$DOT = x; then
-        if test "x$enable_dot" = xyes; then
-                AC_MSG_ERROR([could not find dot])
-        fi
-        enable_dot=no
+possible_paths="$PATH"
+EA_FIND_FILE(dot, $possible_paths, dot_path, dummy)
+if test x$dot_path != xNO; then
+  echo "** $dot_path/dot"
+  DOT_PATH=$dot_path
+  HAVE_DOT=yes
 else
-        enable_dot=yes
+  DOT_PATH=/usr/bin
+  echo "*******************************************************"
+  echo "***  dot not found."
+  echo "********************************************************"
+  HAVE_DOT=no
 fi
-AC_SUBST(enable_dot)
-AC_SUBST(enable_html_docs)
-AC_SUBST(enable_latex_docs)
+
+AC_SUBST(DOT_PATH)
+AC_SUBST(HAVE_DOT)
 ])
 
-# ----------------------------------------------------------------------------
+dnl ------------------------------------------------------------------------
+
+AC_DEFUN([EA_ENABLE_DOCBOOK],[
+possible_paths="$PATH"
+EA_FIND_FILE("xsltproc xmlto", $possible_paths, xsltproc_path, xsltproc_bin)
+if test x$xsltproc_path != xNO; then
+  XSLTPROC=$xsltproc_path/$xsltproc_bin
+  echo "** $XSLTPROC"
+else
+  XSLTPROC=xsltproc
+  echo "*******************************************************"
+  echo "***  xsl processor not found."
+  echo "********************************************************"
+fi
+
+AC_SUBST(XSLTPROC)
+
+possible_paths="/usr/share/xml/docbook/stylesheet/nwalsh/current/html /usr/share/docbook-xsl/html"
+EA_FIND_FILE("chunk.xsl", $possible_paths, chunk_path, chunk_xsl)
+if test x$chunk_path != xNO; then
+  CHUNK_XSL=$chunk_path/$chunk_xsl
+  echo "** $CHUNK_XSL"
+else
+  CHUNK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/current/html
+  echo "*******************************************************"
+  echo "***  html/chunk.xsl not found."
+  echo "********************************************************"
+fi
+
+AC_SUBST(CHUNK_XSL)
+
+possible_paths="/usr/share/xml/docbook/stylesheet/nwalsh/current/fo /usr/share/docbook-xsl/fo"
+EA_FIND_FILE("docbook.xsl", $possible_paths, make_fo_path, make_fo_xsl)
+if test x$make_fo_path != xNO; then
+  MAKE_FO_XSL=$make_fo_path/$make_fo_xsl
+  echo "** $MAKE_FO_XSL"
+else
+  MAKE_FO_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/current/html
+  echo "*******************************************************"
+  echo "***  fo/docbook.xsl not found."
+  echo "********************************************************"
+fi
+
+AC_SUBST(MAKE_FO_XSL)
+dnl ------------------------------------------------------------------------
+])
 
 AC_DEFUN([EA_ENABLE_UNICODE],
 [
@@ -333,6 +376,7 @@
 
 # ----------------------------------------------------------------------------
 
+EA_ENABLE_DOCBOOK
 EA_CHECK_LIBDL
 EA_ENABLE_DOXYGEN
 EA_CHECK_LIBCPPUNIT

[Mockpp-commits] mockpp ChangeLog,1.53,1.54

[Ewald A. <ewa...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
conflict solved

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- ChangeLog	23 May 2005 21:23:48 -0000	1.53
+++ ChangeLog	27 May 2005 08:19:10 -0000	1.54
@@ -2,9 +2,10 @@
 
                             mockpp history
                             --------------
-2005-05-21  1.8.2:
+2005-05-28  1.8.2:
 
-  - updated msvc7.1 project files
+ - compatibility fixes for cygwin
+ - updated msvc7.1 project files
 
 2005-05-21  1.8.1:
 

[Mockpp-commits] mockpp/mockpp/docs/en customize.xsl.in,NONE,1.1 .cvsignore,1.5,1.6 Makefile.am,1.25,1.26 customize-chunked.xsl,1.1,NONE

[Ewald A. <ewa...@us...>]

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

Modified Files:
	.cvsignore Makefile.am 
Added Files:
	customize.xsl.in 
Removed Files:
	customize-chunked.xsl 
Log Message:
cygwin fix

--- customize-chunked.xsl DELETED ---

--- NEW FILE: customize.xsl.in ---
<?xml version='1.0'?>

<!-- Common custumisation options

     $Id: customize.xsl.in,v 1.1 2005/05/27 08:15:53 ewald-arnold Exp $
-->

<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"  version="1.0">

<xsl:import href="@CHUNK_XSL@"/>

<!--
<xsl:template name="user.footer.content">
  <HR/><center><P class="copyright">&#x00A9; 2002  Megacorp, Inc.</P>
  <br />
  </center>
</xsl:template>

user.header.navigation  Called before standard navigational header.

header.navigation   The standard navigational header.

user.header.content  Called after standard navigational header but before any other content.

user.footer.content  Called after the chunk content but before the standard navigational footer.

footer.navigation  The standard navigational footer.

user.footer.navigation  Called after the standard navigational footer
-->

<xsl:param name="html.stylesheet"                        select="'common/mockpp.css'"/>
<xsl:param name="admon.graphics"                         select="1"/>
<xsl:param name="linenumbering.extension"                select="1"/>
<xsl:param name="chapter.autolabel"                      select="1"/>
<xsl:param name="appendix.autolabel"                     select="1"/>
<xsl:param name="section.autolabel"                      select="1"/>
<xsl:param name="section.label.includes.component.label" select="1"/>
<xsl:param name="callout.graphics.number.limit"          select="'15'"/>
<xsl:param name="use.id.as.filename"                     select="'1'"/>
<xsl:param name="use.extensions"                         select="'1'"/>

</xsl:stylesheet>


Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile.am	7 May 2005 17:00:56 -0000	1.25
+++ Makefile.am	27 May 2005 08:15:53 -0000	1.26
@@ -25,7 +25,10 @@
 
 ################################################################
 
-html-chunk-files:
+$(srcdir)/customize.xsl: customize.xsl
+	cp $< $@
+
+html-chunk-files: $(srcdir)/customize.xsl
 	-test -L tutorial && rm tutorial
 	ln -s ../../examples/tutorial/html tutorial
 	-test -L api-doc && rm api-doc
@@ -41,7 +44,7 @@
 	fi
 	xsltproc -o var/  $(srcdir)/customize-chunked.xsl  $(srcdir)/index.docbook
 
-html-flat-files:
+html-flat-files: $(srcdir)/customize.xsl
 	-test -L tutorial && rm tutorial
 	ln -s ../../examples/tutorial/html tutorial
 	-test -L api-doc && rm api-doc

Index: .cvsignore
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/docs/en/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- .cvsignore	21 Nov 2004 19:33:16 -0000	1.5
+++ .cvsignore	27 May 2005 08:15:53 -0000	1.6
@@ -1,3 +1,5 @@
+*~
+*.~*
 *.html
 Makefile
 Makefile.in

[Mockpp-commits] mockpp mockpp.doxygen.in,1.12,1.13

[Ewald A. <ewa...@us...>]

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

Modified Files:
	mockpp.doxygen.in 
Log Message:
removed trash

Index: mockpp.doxygen.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp.doxygen.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mockpp.doxygen.in	30 Apr 2005 21:15:45 -0000	1.12
+++ mockpp.doxygen.in	27 May 2005 08:00:24 -0000	1.13
@@ -16,7 +16,6 @@
 
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
-DBC_PRE(a,b) =\pre b \code a \endcode"
 PROJECT_NAME           = mockpp
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
@@ -170,26 +169,6 @@
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
-ck Heidfeld von der Strecke bugsierte. Sonst hätte es wohl reichlich Zoff nach dem Rennen gegeben. So aber haben sich alle trotz des Vorfalls immer noch lieb. mehr...
-
- Interview mit Volker Finke: "Bitterste Woche, die Freiburg erlebt hat"
- Biathlon-WM: Zweites Gold für Uschi Disl
- Fußball-Bundesliga: Bayern und Schalke ziehen davon
- NBA: Bryant verdirbt Nowitzki das Jubiläum
- Weitere Artikel aus dem Ressort Sport ...
-
-
-
-
-
- KULTUR
-
-
-
-
-
-Interview mit Martin Walser: "Hochhuth verdient Respekt"
-Der Schriftsteller Martin Walser, 77, über eine ihm gewidmete Ausstellung im Münchner Literaturhaus und den
 TAB_SIZE               = 4
 
 # This tag can be used to specify a number of aliases that acts

[Mockpp-commits] mockpp ChangeLog,1.52,1.53

[Ewald A. <ewa...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
update

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ChangeLog	21 May 2005 14:31:05 -0000	1.52
+++ ChangeLog	23 May 2005 21:23:48 -0000	1.53
@@ -2,6 +2,10 @@
 
                             mockpp history
                             --------------
+2005-05-21  1.8.2:
+
+  - updated msvc7.1 project files
+
 2005-05-21  1.8.1:
 
  - install files below mockpp/production

[Mockpp-commits] mockpp/msvc71/mockpp mockpp_production.vcproj,NONE,1.1 .cvsignore,1.1,1.2 mockpp.sln,1.2,1.3 mockpp.vcproj,1.4,1.5

[Ewald A. <ewa...@us...>]

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

Modified Files:
	.cvsignore mockpp.sln mockpp.vcproj 
Added Files:
	mockpp_production.vcproj 
Log Message:
update

Index: .cvsignore
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	22 Mar 2005 20:44:18 -0000	1.1
+++ .cvsignore	23 May 2005 21:15:50 -0000	1.2
@@ -1,3 +1,6 @@
 Makefile
 Makefile.in
 *.~*
+*.ncb
+*.suo
+

Index: mockpp.sln
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mockpp.sln	9 Apr 2005 20:15:19 -0000	1.2
+++ mockpp.sln	23 May 2005 21:15:51 -0000	1.3
@@ -22,6 +22,7 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mock_test", "tests\mock_test.vcproj", "{F22BA7AF-9CFC-4F2A-947D-69AF7C466635}"
 	ProjectSection(ProjectDependencies) = postProject
 		{4B2B3833-C35A-4F2F-BFAF-B686D3827531} = {4B2B3833-C35A-4F2F-BFAF-B686D3827531}
+		{6AB18DF8-7204-4B80-AE27-0CDB36E321B4} = {6AB18DF8-7204-4B80-AE27-0CDB36E321B4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mockpp", "mockpp.vcproj", "{4B2B3833-C35A-4F2F-BFAF-B686D3827531}"
@@ -42,6 +43,10 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mockpp_production", "mockpp_production.vcproj", "{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -84,6 +89,10 @@
 		{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Debug.Build.0 = Debug|Win32
 		{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.ActiveCfg = Release|Win32
 		{BD779AA5-9F07-466E-AC76-7C27BD3D4E86}.Release.Build.0 = Release|Win32
+		{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Debug.ActiveCfg = Debug|Win32
+		{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Debug.Build.0 = Debug|Win32
+		{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Release.ActiveCfg = Release|Win32
+		{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Index: mockpp.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/mockpp.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mockpp.vcproj	2 Apr 2005 21:55:15 -0000	1.4
+++ mockpp.vcproj	23 May 2005 21:15:51 -0000	1.5
@@ -3,6 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="mockpp"
+	RootNamespace="mockpp"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -12,8 +13,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\Debug"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -21,7 +22,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../.."
+				AdditionalIncludeDirectories="&quot;X:\Documents\src\cppunit-1.10.2\include&quot;;../../..;&quot;$(CPPUNIT_ROOT)/include&quot;;../.."
 				PreprocessorDefinitions="WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -38,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="../lib/mockppd.lib"
+				OutputFile="c:\tmp\msvc_compile\mockppd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>

--- NEW FILE: mockpp_production.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="mockpp_production"
	ProjectGUID="{6AB18DF8-7204-4B80-AE27-0CDB36E321B4}"
	Keyword="MFCDLLProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory="C:\tmp\msvc_compile\mockpp\production\Debug"
			IntermediateDirectory="c:\tmp\msvc_compile\mockpp\production\Debug"
			ConfigurationType="2"
			UseOfMFC="0"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../.."
				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
				MinimalRebuild="TRUE"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				TreatWChar_tAsBuiltInType="TRUE"
				UsePrecompiledHeader="0"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="4"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile="$(OutDir)/mockpp_production.dll"
				LinkIncremental="2"
				ModuleDefinitionFile=""
				GenerateDebugInformation="TRUE"
				SubSystem="2"
				ImportLibrary="$(OutDir)/mockpp_production.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="_DEBUG"
				MkTypLibCompatible="FALSE"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1031"
				AdditionalIncludeDirectories="$(IntDir)"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory="Release"
			IntermediateDirectory="Release"
			ConfigurationType="2"
			UseOfMFC="2"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
				RuntimeLibrary="2"
				TreatWChar_tAsBuiltInType="TRUE"
				UsePrecompiledHeader="3"
				WarningLevel="3"
				Detect64BitPortabilityProblems="TRUE"
				DebugInformationFormat="3"/>
			<Tool
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile="$(OutDir)/mockpp_production.dll"
				LinkIncremental="1"
				ModuleDefinitionFile=".\mockpp_production.def"
				GenerateDebugInformation="TRUE"
				SubSystem="2"
				OptimizeReferences="2"
				EnableCOMDATFolding="2"
				ImportLibrary="$(OutDir)/mockpp_production.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="NDEBUG"
				MkTypLibCompatible="FALSE"/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1031"
				AdditionalIncludeDirectories="$(IntDir)"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
			<File
				RelativePath="..\..\mockpp\production\TimeServer.cpp">
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl;inc;xsd"
			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
			<File
				RelativePath="..\..\mockpp\production\mockpp_production.h">
			</File>
			<File
				RelativePath="..\..\mockpp\production\TimeServer.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
		</Filter>
		<File
			RelativePath=".\ReadMe.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

[Mockpp-commits] mockpp/msvc71/mockpp/examples examples.vcproj,1.3,1.4

[Ewald A. <ewa...@us...>]

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

Modified Files:
	examples.vcproj 
Log Message:
update

Index: examples.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/examples.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- examples.vcproj	25 Mar 2005 10:22:55 -0000	1.3
+++ examples.vcproj	23 May 2005 21:15:52 -0000	1.4
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../..,$(CPPUNIT_ROOT)/include"
+				AdditionalIncludeDirectories="&quot;X:\Documents\src\cppunit-1.10.2\include&quot;;../../..;&quot;$(CPPUNIT_ROOT)/include&quot;"
 				PreprocessorDefinitions="WIN32,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -42,7 +42,7 @@
 				OutputFile="C:\tmp\compile\mockpp\examples\Debug/examples.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../lib"
+				AdditionalLibraryDirectories="c:\tmp\msvc_compile\;C:\tmp\msvc_compile\cppunit;../../lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\Debug/examples.pdb"
 				SubSystem="1"

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

[Ewald A. <ewa...@us...>]

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

Modified Files:
	basicmock.vcproj chainmock.vcproj cppunit.vcproj 
	poormock.vcproj poormock_se.vcproj visitmock.vcproj 
Log Message:
update

Index: basicmock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/basicmock.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- basicmock.vcproj	9 Apr 2005 20:15:19 -0000	1.4
+++ basicmock.vcproj	23 May 2005 21:15:52 -0000	1.5
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -42,7 +42,7 @@
 				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib"
+				AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/basicmock.pdb"
 				SubSystem="1"
@@ -100,7 +100,7 @@
 				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Release./basicmock.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib"
+				AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib"
 				ProgramDatabaseFile="./basicmock.pdb"/>
 			<Tool
 				Name="VCMIDLTool"

Index: visitmock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/visitmock.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- visitmock.vcproj	9 Apr 2005 20:15:19 -0000	1.4
+++ visitmock.vcproj	23 May 2005 21:16:01 -0000	1.5
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -42,7 +42,7 @@
 				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib"
+				AdditionalLibraryDirectories="../../../lib;c:\tmp\msvc_compile\"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/visitmock.pdb"
 				SubSystem="1"

Index: poormock_se.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/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	9 Apr 2005 20:15:19 -0000	1.1
+++ poormock_se.vcproj	23 May 2005 21:16:01 -0000	1.2
@@ -13,8 +13,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -43,7 +43,7 @@
 				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib"
+				AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/poormock_se.pdb"
 				SubSystem="1"

Index: chainmock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/chainmock.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chainmock.vcproj	9 Apr 2005 20:15:19 -0000	1.4
+++ chainmock.vcproj	23 May 2005 21:16:01 -0000	1.5
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -42,7 +42,7 @@
 				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib"
+				AdditionalLibraryDirectories="c:\tmp\msvc_compile\;../../../lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/chainmock.pdb"
 				SubSystem="1"

Index: cppunit.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/cppunit.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cppunit.vcproj	25 Mar 2005 10:22:55 -0000	1.3
+++ cppunit.vcproj	23 May 2005 21:16:01 -0000	1.4
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../..,$(CPPUNIT_ROOT)/include"
+				AdditionalIncludeDirectories="&quot;X:\Documents\src\cppunit-1.10.2\include&quot;;../../../..;&quot;$(CPPUNIT_ROOT)/include&quot;"
 				PreprocessorDefinitions="WIN32,_CONSOLE,CPPUNIT_DLL"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -42,7 +42,7 @@
 				OutputFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="../../../lib"
+				AdditionalLibraryDirectories="c:\tmp\msvc_compile\;C:\tmp\msvc_compile\cppunit;&quot;X:\Documents\src\cppunit-1.10.2\lib&quot;;../../../lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="C:\tmp\compile\mockpp\examples\tutorial\Debug/cppunit.pdb"
 				SubSystem="1"

Index: poormock.vcproj
===================================================================
RCS file: /cvsroot/mockpp/mockpp/msvc71/mockpp/examples/tutorial/poormock.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- poormock.vcproj	9 Apr 2005 20:15:19 -0000	1.4
+++ poormock.vcproj	23 May 2005 21:16:01 -0000	1.5
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
-			IntermediateDirectory="C:\tmp\compile\mockpp\examples\tutorial\Debug"
+			OutputDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
+			IntermediateDirectory="C:\tmp\msvc_compile\mockpp\examples\tutorial\Debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"