Merge branch 'mirror'

Conflicts:
	doc/Makefile
	doc/guide.epub
	doc/guide.html
	doc/guide.pdf

README

@@ -37,6 +37,6 @@ MyTest.h:
 
 3. Compile and run!
 
-  # g++ -o main main.cpp tests.cpp
+  # g++ -o main tests.cpp
   # ./main
   Running 1 test(s).OK!

Versions

@@ -2,8 +2,10 @@
 CxxTest Releases
 ----------------
 
-* Version 4.0.3 (TODO)
- - Adding support for Python 2.4, 2.5, 2.6, 2.7 and 3.2
+* Version 4.0.3 (2012-01-07)
+ - Adding support for Python 2.4 - 3.2
+ - Various cleanup of CxxTest root directory
+ - Adding patch that allows the cxxtestgen script to be used when symlinked.
 
 * Version 4.0.2 (2012-01-02)
  - Bug fix to enable installation of cxxtestgen without the 'setuptools' package

admin/announcement

@@ -0,0 +1,20 @@
+We are pleased to announce the updated release of CxxTest 4.0.3.
+CxxTest is a unit testing framework for C++ that is similar in
+spirit to JUnit, CppUnit, and xUnit. CxxTest is easy to use because
+it does not require precompiling a CxxTest testing library, it
+employs no advanced features of C++ (e.g. RTTI) and it supports a
+very flexible form of test discovery.
+
+CxxTest 4.0.3 is a bug fix release for CxxTest 4.0.  This release
+resolves the following issues:
+
+ * Adding support for Python versions 2.4 - 3.2
+ * Change to cxxtestgen script that allows it to be used when symlinked.
+
+See the CxxTest Home Page (http://cxxtest.com) for documentation
+and download instructions.
+
+Enjoy!
+
+    CxxTest Developer Team
+    cxxtest-developers@googlegroups.com

admin/jenkins_cxxtest

@@ -32,10 +32,10 @@ cd cxxtest
 echo "DONE"
 
 # Cleanup old gcov files
-##cd $WORKSPACE
-##\rm -f *.gcov cxxtest/*.gcov doc/*.gcov doc/examples/*.gcov
-##\rm -f *.gcno cxxtest/*.gcno doc/*.gcno doc/examples/*.gcno
-##\rm -f *.gcda cxxtest/*.gcda doc/*.gcda doc/examples/*.gcda
-##cd $WORKSPACE/cxxtest/test
-##make clean
+cd $WORKSPACE
+\rm -f *.gcov cxxtest/*.gcov doc/*.gcov doc/examples/*.gcov
+\rm -f *.gcno cxxtest/*.gcno doc/*.gcno doc/examples/*.gcno
+\rm -f *.gcda cxxtest/*.gcda doc/*.gcda doc/examples/*.gcda
+cd $WORKSPACE/cxxtest/test
+make clean
 

doc/Makefile

@@ -1,7 +1,7 @@
 .PHONY: all anchors outputs clean
 
 export XML_CATALOG_FILES = catalog.xml
-PY = python2
+PY = python
 XSLTPROC_OPTS := --stringparam toc.section.depth 2 --stringparam generate.section.toc.level 1
 DBLATEX_OPTS  := -P latex.output.revhistory=0 -P doc.collab.show=1 -P toc.section.depth=2
 A2X_OPTS      := -a toc -a icons -L -d article -v --xsltproc-opts "$(XSLTPROC_OPTS)" --dblatex-opts "$(DBLATEX_OPTS)"
@@ -22,10 +22,8 @@ all: guide.html guide.pdf guide.epub
 anchors: guide.txt
 	$(PY) include_anchors.py $<
 
-outputs: examples/cxxtestgen.out
-
-examples/cxxtestgen.out: ../bin/cxxtestgen
-	- $< -h && $< -h > $@
+outputs:
+	../bin/cxxtestgen -h > examples/cxxtestgen.out
 
 clean:
 	- \rm -f guide.xml