Time for another release candidate.

git-svn-id: http://distcc.googlecode.com/svn/trunk@596 01de4be4-8c4a-0410-9132-4925637da917

3 files changed, 75 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f2eb4ea..960db96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+## distcc 3.0rc4.
+
+2008-08-02 19:49  Fergus Henderson <opensource@google.com>
+
+	* test/testdistcc.py:
+	  
+	  Add C++ version of the SystemIncludeDirectories test.
+	  
+	  Also, reduce code duplication a little by adding a compileOpts()
+	  function to
+	  the CompilationCase class, and overriding that, rather than
+	  compileCmd(),
+	  in various derived classes.
+
+2008-08-02 17:50  Fergus Henderson <opensource@google.com>
+
+	* include_server/compiler_defaults.py:
+	  
+	  Fix a TODO in compiler_defaults.py that was responsible for a bug
+	  that broke pump mode when one of the default system include
+	  directories
+	  was a subdirectory of another, as turns out to be the case for GNU
+	  C++.
+	  
+	  The CPlusPlus_SystemIncludeDirectories_Case, which was failing before
+	  this
+	  change, now passes. (TODO: re-enable it.)
+	  
+	  Reviewers: Craig Silverstein
+
+2008-08-02 01:30  Fergus Henderson <opensource@google.com>
+
+	* bench/benchmark.py:
+	  
+	  Make the benchmarking script's stdout and stderr line buffered.
+	  
+	  Reviewers: Craig Silverstein
+
+2008-08-02 01:27  Fergus Henderson <opensource@google.com>
+
+	* test/testdistcc.py:
+	  
+	  Add a test of C++ compilation, and refactor the tests of Objective-C
+	  and Objective-C++ to share the common code.
+	  
+	  Also, fix some bugs in the tests of Objective-C and Objective-C++.
+	  These tests were never being activated, even when the right compiler
+	  is
+	  installed, because in the test compilation (not using distcc) it was
+	  compiling with "-o /dev/null" and then testing that testtmp.o exists,
+	  which it never did. There was also a missing "std::" in the
+	  Objective-C++
+	  test. I still haven't run the Objective-C++ test, because I still
+	  haven't
+	  figured out how to install Objective-C++, but it's pretty similar to
+	  the C++ and Objective-C tests, and both of those now run and pass.
+	  
+	  Reviewers: Craig Silverstein
+
+2008-08-01 20:59  Fergus Henderson <opensource@google.com>
+
+	* bench/ProjectDefs.py:
+	  
+	  Update a stale URL.
+
 ## distcc 3.0rc3.
 
 2008-08-01 03:42  Fergus Henderson <opensource@google.com>
diff --git a/NEWS b/NEWS
index 08c7323..1bf76b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
-distcc-3.0rc3 "Third time lucky."   2008-07-31
+distcc-3.0rc4 "Pump up the volume"   2008-08-04
+
+  BUG FIXES:
+
+   * Fixed a bug in 3.0rc3 that broke pump mode for C++ compilations
+     that use -I options that refer to a subdirectory of one of the
+     default system include directories, e.g. -I/usr/include/foo.
+
+distcc-3.0rc3 "Third time lucky?"   2008-07-31
 
   FEATURES:
 
diff --git a/configure.ac b/configure.ac
index ee0910a..c072761 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl Process this file with autoconf to produce a configure script
 
 # As of 0.6cvs, distcc no longer uses automake, only autoconf.
 AC_PREREQ(2.53)
-AC_INIT(distcc, 3.0rc3, distcc@lists.samba.org)
+AC_INIT(distcc, 3.0rc4, distcc@lists.samba.org)
 
 AC_CONFIG_HEADERS(src/config.h)
 AC_CANONICAL_HOST