Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

1 files changed, 59 insertions, 27 deletions

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 636c772b94d..29c968f9f93 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -44,11 +44,10 @@ extern "C" int   mcpp_lib_main(int argc, char** argv);
 extern "C" void  mcpp_use_mem_buffers(int tf);
 extern "C" char* mcpp_get_mem_buffer(Outdest od);
 
-Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args, const string& cppSourceExt) :
+Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
     _path(path),
     _fileName(fileName),
     _args(args),
-    _cppSourceExt(cppSourceExt),
     _cppHandle(0)
 {
 }
@@ -145,12 +144,16 @@ Slice::Preprocessor::preprocess(bool keepComments)
     delete[] argv;
 
     //
-    // Print errors to stderr.
+    // Display any errors.
     //
     char* err = mcpp_get_mem_buffer(Err);
     if(err)
     {
-        ::fputs(err, stderr);
+        vector<string> messages = filterMcppWarnings(err);
+        for(vector<string>::const_iterator i = messages.begin(); i != messages.end(); ++i)
+        {
+            emitRaw(i->c_str());
+        }
     }
 
     if(status == 0)
@@ -199,13 +202,14 @@ Slice::Preprocessor::preprocess(bool keepComments)
         }
         else
         {
-            cerr << "Could not open temporary file: ";
+            ostream& os = getErrorStream();
+            os << _path << ": error: could not open temporary file: ";
 #ifdef _WIN32
-            cerr << IceUtil::wstringToString(_cppFile);
+            os << IceUtil::wstringToString(_cppFile);
 #else
-            cerr << _cppFile;
+            os << _cppFile;
 #endif
-            cerr << endl;
+            os << endl;
         }
     }
 
@@ -218,7 +222,8 @@ Slice::Preprocessor::preprocess(bool keepComments)
 }
 
 bool
-Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths)
+Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths,
+                                               const string& cppSourceExt)
 {
     if(!checkInputFile())
     {
@@ -253,7 +258,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
     char* err = mcpp_get_mem_buffer(Err);
     if(err)
     {
-        ::fputs(err, stderr);
+        emitRaw(err);
     }
 
     if(status != 0)
@@ -299,7 +304,11 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
      string suffix = ".o:";
 #endif
     pos = unprocessed.find(suffix) + suffix.size();
-    string result = unprocessed.substr(0, pos);
+    string result;
+    if(lang != JavaXML)
+    {
+        result = unprocessed.substr(0, pos);
+    }
 
     vector<string> fullIncludePaths;
     vector<string>::const_iterator p;
@@ -345,26 +354,47 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             }
         }
 
-        //
-        // Escape spaces in the file name.
-        //
-        string::size_type space = 0;
-        while((space = file.find(" ", space)) != string::npos)
+        if(lang == JavaXML)
         {
-            file.replace(space, 1, "\\ ");
-            space += 2;
+            if(result.size() == 0)
+            {
+                result = "  <source name=\"" + file + "\">";
+            }
+            else
+            {
+                result += "\n    <dependsOn name=\"" + file + "\"/>";
+            }
         }
+        else
+        {
+            //
+            // Escape spaces in the file name.
+            //
+            string::size_type space = 0;
+            while((space = file.find(" ", space)) != string::npos)
+            {
+                file.replace(space, 1, "\\ ");
+                space += 2;
+            }
 
-        //
-        // Add to result
-        //
-        result += " \\\n " + file;
+            //
+            // Add to result
+            //
+            result += " \\\n " + file;
+        }
         pos = end;
     }
-    result += "\n";
+    if(lang == JavaXML)
+    {
+        result += "\n  </source>\n";
+    }
+    else
+    {
+        result += "\n";
+    }
 
     /*
-     * icecpp emits dependencies in any of the following formats, depending on the
+     * Emit dependencies in any of the following formats, depending on the
      * length of the filenames:
      *
      * x.o[bj]: /path/x.ice /path/y.ice
@@ -396,10 +426,12 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             string::size_type pos;
             while((pos = result.find(suffix)) != string::npos)
             {
-                result.replace(pos, suffix.size() - 1, "." + _cppSourceExt);
+                result.replace(pos, suffix.size() - 1, "." + cppSourceExt);
             }
             break;
         }
+        case JavaXML:
+            break;
         case Java:
         {
             //
@@ -511,14 +543,14 @@ Slice::Preprocessor::checkInputFile()
     }
     if(suffix != ".ice")
     {
-        cerr << _path << ": input files must end with `.ice'" << endl;
+        getErrorStream() << _path << ": error: input files must end with `.ice'" << endl;
         return false;
     }
     
     ifstream test(_fileName.c_str());
     if(!test)
     {
-        cerr << _path << ": cannot open `" << _fileName << "' for reading" << endl;
+        getErrorStream() << _path << ": error: cannot open `" << _fileName << "' for reading" << endl;
         return false;
     }
     test.close();