[Mockpp-commits] mockpp configure.in,1.104,1.105 release-check,1.2,1.3 run-configure-unicode.sh,1.12,1.13

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

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

Modified Files:
	configure.in release-check run-configure-unicode.sh 
Log Message:
integration cxxtest + ministl

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- run-configure-unicode.sh	10 Dec 2005 15:19:08 -0000	1.12
+++ run-configure-unicode.sh	18 Dec 2005 16:56:22 -0000	1.13
@@ -1,5 +1,6 @@
 #!/bin/sh
-MYFLAGS="-O0 -g3 -Wall -Werror -pedantic"
+MYFLAGS="-O0 -g3 -Wall -Werror"
+#-pedantic
 
 if  which "gcc-4.0"; then
   MYCC="ccache g++-4.0";
@@ -10,7 +11,7 @@
 
 
 #OPTS="--enable-doxygen --enable-docbook"
-OPTS="$OPTS --enable-builtin-stl"  # --disable-exceptions  --disable-rtti
-#OPTS="$OPTS --enable-debug=full"
-#OPTS="$OPTS --enable-builtin-cxxtest"
+OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
+OPTS="$OPTS --enable-debug=full"
+OPTS="$OPTS --enable-builtin-cxxtest"
 CFLAGS="$MYFLAGS" CXXFLAGS="$MYFLAGS" CXX=$MYCC CC=$MYCC ${0%/*}/configure  --enable-unicode $OPTS --prefix=/tmp/mockpp-install

Index: release-check
===================================================================
RCS file: /cvsroot/mockpp/mockpp/release-check,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- release-check	19 Nov 2005 21:47:26 -0000	1.2
+++ release-check	18 Dec 2005 16:56:22 -0000	1.3
@@ -9,7 +9,7 @@
 rm -rf /tmp/$1
 tar xzf $2/$1.tar.gz
 cd $1
-./configure --prefix=$BUILD/_inst1 --enable-unicode --enable-doxygen --enable-docbook || exit 1
+./configure --prefix=$BUILD/_inst1 --enable-unicode --enable-builtin-stl --enable-builtin-cxxtest || exit 1
 make install  || exit 1
 make check    || exit 1
 make dist     || exit 1

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- configure.in	10 Dec 2005 20:07:20 -0000	1.104
+++ configure.in	18 Dec 2005 16:56:22 -0000	1.105
@@ -253,14 +253,15 @@
   echo "*******************************************************"
   echo "**  using builtin mini stl"
   echo "*******************************************************"
-  AC_DEFINE(MOCKPP_USE_MINI_STL, 1, [Define to use built-in mini stl.])
+  AC_DEFINE(MOCKPP_USE_MINI_STL, 1,  [Define to use built-in mini stl.])
+  AC_DEFINE(CXXTEST_USE_MINI_STL, 1, [Define to use built-in mini stl.])
   EA_EXTRA_INC="$EA_EXTRA_INC -I\$(top_srcdir)/3party"
 else
   echo "*******************************************************"
   echo "**  using regular stl"
   echo "*******************************************************"
-  AH_TEMPLATE([MOCKPP_USE_MINI_STL],
-   [Define to use built-in mini stl.])
+  AH_TEMPLATE([MOCKPP_USE_MINI_STL],    [Define to use built-in mini stl.])
+  AH_TEMPLATE([CXXTEST_USE_MINI_STL],   [Define to use built-in mini stl.])
 fi
 ])
 AM_CONDITIONAL(BUILTIN_MINISTL, test x$enable_builtin_stl = xyes)