Merge remote-tracking branch 'origin/3.6'

Conflicts:
	README.md
	android/build.gradle
	android/gradle.properties
	android/gradle/wrapper/gradle-wrapper.properties
	config/Make.common.rules
	config/PropertyNames.xml
	cpp/BuildInstructionsLinux.md
	cpp/BuildInstructionsOSX.md
	cpp/BuildInstructionsWinRT.md
	cpp/BuildInstructionsWindows.md
	cpp/config/Make.rules
	cpp/config/Make.rules.mak
	cpp/include/IceUtil/Config.h
	cpp/include/Slice/PythonUtil.h
	cpp/include/Slice/RubyUtil.h
	cpp/include/Slice/Util.h
	cpp/src/Ice/DynamicLibrary.cpp
	cpp/src/Ice/PropertyNames.cpp
	cpp/src/Ice/PropertyNames.h
	cpp/src/Ice/winrt/StreamEndpointI.cpp
	cpp/src/IceGrid/IceGridDB.cpp
	cpp/src/IceGrid/Util.cpp
	cpp/src/IceUtil/FileUtil.cpp
	cpp/src/IceUtil/FileUtil.h
	cpp/src/Makefile
	cpp/src/Slice/Util.cpp
	cpp/src/slice2cs/Gen.cpp
	cpp/src/slice2freeze/Main.cpp
	cpp/src/slice2freezej/Main.cpp
	cpp/src/slice2html/Makefile
	cpp/src/slice2html/Makefile.mak
	cpp/src/slice2java/Main.cpp
	cpp/test/Ice/exceptions/AllTests.cpp
	cpp/test/Ice/facets/AllTests.cpp
	cpp/test/Ice/info/AllTests.cpp
	cpp/test/Ice/location/AllTests.cpp
	cpp/test/Ice/properties/run.py
	cpp/test/Ice/timeout/AllTests.cpp
	cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
	cpp/test/IceStorm/stress/run.py
	cpp/test/TestSuite/10.0/Package.appxmanifest
	cpp/test/TestSuite/10.0/TestSuite.vcxproj
	cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters
	cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx
	cpp/test/TestSuite/8.0/TestSuite.vcxproj
	cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx
	csharp/BuildInstructions.md
	csharp/src/Ice/PropertyNames.cs
	csharp/src/IceLocatorDiscovery/PluginI.cs
	java/BuildInstructions.md
	java/Makefile
	java/Makefile.mak
	java/src/Glacier2/src/main/java/Glacier2/Application.java
	java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
	java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
	java/src/Ice/src/main/java/Ice/Object.java
	java/src/Ice/src/main/java/Ice/ObjectImpl.java
	java/src/Ice/src/main/java/IceInternal/PropertyNames.java
	java/src/Ice/src/main/java/IceSSL/Plugin.java
	java/src/Ice/src/main/java/IceSSL/PluginFactory.java
	java/src/Ice/src/main/java/IceUtil/Cache.java
	java/src/IceGridGUI/build.gradle
	java/src/IceGridGUI/src/main/java/IceGridGUI/SimpleInternalFrame.java
	java/src/IceGridGUI/src/main/java/IceGridGUI/Utils.java
	java/test/build.gradle
	java/test/ejb/README.md
	js/src/Ice/PropertyNames.js
	js/src/Ice/browser/TimerUtil.js
	js/src/Ice/browser/WSTransceiver.js
	js/test/Common/TestCases.json
	js/test/Common/Worker.js
	objective-c/include/objc/Ice/Config.h
	objective-c/src/Ice/CommunicatorI.mm
	php/BuildInstructionsLinuxOSX.md
	php/BuildInstructionsWindows.md
	php/config/Make.rules.mak.php
	php/src/php7/IcePHP.rc
	python/BuildInstructionsLinuxOSX.md
	python/BuildInstructionsWindows.md
	python/Makefile
	python/modules/IcePy/Slice.cpp
	python/test/Slice/import/run.py
	ruby/BuildInstructionsLinuxOSX.md
	ruby/BuildInstructionsWindows.md
	ruby/config/Make.rules
	ruby/src/IceRuby/Slice.cpp
	scripts/TestController.py
	scripts/TestUtil.py
	slice/Ice/Communicator.ice
	slice/Ice/Instrumentation.ice
	slice/IceLocatorDiscovery/IceLocatorDiscovery.ice

2 files changed, 32 insertions, 44 deletions

diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 03e87cefec9..a5e03d6015f 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -10,20 +10,19 @@
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/StringUtil.h>
+#include <IceUtil/FileUtil.h>
 #include <Slice/FileTracker.h>
 #include <Gen.h>
 
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #ifdef _WIN32
-#include <direct.h>
+#  include <direct.h>
 #else
-#include <unistd.h>
+#  include <unistd.h>
 #endif
 
 #include <iterator>
-
 #include <string.h>
 
 using namespace std;
@@ -352,7 +351,7 @@ Slice::GeneratorBase::printComment(const ContainedPtr& p, const SyntaxTreeBasePt
             {
                 item = q->substr(pos);
             }
-            
+
             start("dt", "Symbol");
             _out << term;
             end();
@@ -393,7 +392,7 @@ Slice::GeneratorBase::printComment(const ContainedPtr& p, const SyntaxTreeBasePt
             {
                 item = q->substr(pos);
             }
-            
+
             start("dt", "Symbol");
             _out << getURL(toSliceID(term, source->definitionContext()->filename()), source, false);
             end();
@@ -1316,14 +1315,14 @@ Slice::GeneratorBase::getTagged(const string& tag, string& comment)
         {
             return result;
         }
-        
+
         string::size_type pos1 = comment.find_first_not_of(" \t\r\n", begin + tag.size() + 1);
         if(pos1 == string::npos)
         {
             comment.erase(begin);
             return result;
         }
-        
+
         string::size_type pos2 = comment.find('@', pos1);
         string line = comment.substr(pos1, pos2 - pos1);
         comment.erase(begin, pos2 - 1 - begin);
@@ -1357,7 +1356,7 @@ Slice::GeneratorBase::getScopedMinimized(const SyntaxTreeBasePtr& target, const
     {
         return scoped.substr(2);
     }
-    
+
     do
     {
         string scoped2 = s->scoped();
@@ -1559,9 +1558,8 @@ Slice::GeneratorBase::toStringList(const string& scoped)
 void
 Slice::GeneratorBase::makeDir(const string& dir)
 {
-    struct stat st;
-    int rc = stat(dir.c_str(), &st);
-    if(rc == 0)
+    IceUtilInternal::structstat st;
+    if(!IceUtilInternal::stat(dir, &st))
     {
         if(!(st.st_mode & S_IFDIR))
         {
@@ -1573,12 +1571,7 @@ Slice::GeneratorBase::makeDir(const string& dir)
         return;
     }
 
-#ifdef _WIN32
-    rc = _mkdir(dir.c_str());
-#else
-    rc = mkdir(dir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
-#endif
-    if(rc != 0)
+    if(IceUtilInternal::mkdir(dir, 0777) != 0)
     {
         ostringstream os;
         os << "cannot create directory `" << dir << "': " << strerror(errno);
@@ -1590,7 +1583,7 @@ Slice::GeneratorBase::makeDir(const string& dir)
 string
 Slice::GeneratorBase::readFile(const string& file)
 {
-    ifstream in(file.c_str());
+    ifstream in(streamFilename(file).c_str());
     if(!in)
     {
         ostringstream os;
@@ -1606,7 +1599,7 @@ Slice::GeneratorBase::readFile(const string& file)
         result << line << '\n';
         getline(in, line);
     }
-    
+
     return result.str();
 }
 
@@ -1664,7 +1657,7 @@ Slice::GeneratorBase::getFooter(const string& footer)
 void
 Slice::GeneratorBase::readFile(const string& file, string& part1, string& part2)
 {
-    ifstream in(file.c_str());
+    ifstream in(streamFilename(file).c_str());
     if(!in)
     {
         ostringstream os;
@@ -2568,7 +2561,7 @@ Slice::ExceptionGenerator::generate(const ExceptionPtr& e)
         }
         end();
     }
-        
+
     _out << nl << "<hr>";
     printHeaderFooter(e);
 
@@ -2894,7 +2887,7 @@ Slice::StructGenerator::generate(const StructPtr& s)
         }
         end();
     }
-        
+
     _out << nl << "<hr>";
     printHeaderFooter(s);
 
@@ -2973,7 +2966,7 @@ Slice::EnumGenerator::generate(const EnumPtr& e)
         }
         end();
     }
-        
+
     closeDoc();
 
     _out << nl << "<hr>";
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index 0b9a0b24590..818882ceb61 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -56,7 +56,7 @@ interruptedCallback(int /*signal*/)
 }
 
 void
-usage(const char* n)
+usage(const string& n)
 {
     getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
     getErrorStream() <<
@@ -86,7 +86,7 @@ usage(const char* n)
 }
 
 int
-compile(int argc, char* argv[])
+compile(const vector<string>& argv)
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -110,20 +110,11 @@ compile(int argc, char* argv[])
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
 
-    bool validate = false;
-    for(int i = 0; i < argc; ++i)
-    {
-        if(string(argv[i]) == "--validate")
-        {
-            validate = true;
-            break;
-        }
-    }
-
+    bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end();
     vector<string> args;
     try
     {
-        args = opts.parse(argc, const_cast<const char**>(argv));
+        args = opts.parse(argv);
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
@@ -336,31 +327,35 @@ compile(int argc, char* argv[])
     return status;
 }
 
-int
-main(int argc, char* argv[])
+#ifdef _WIN32
+int wmain(int argc, wchar_t* argv[])
+#else
+int main(int argc, char* argv[])
+#endif
 {
+    vector<string> args = argvToArgs(argc, argv);
     try
     {
-        return compile(argc, argv);
+        return compile(args);
     }
     catch(const std::exception& ex)
     {
-        getErrorStream() << argv[0] << ": error:" << ex.what() << endl;
+        getErrorStream() << args[0] << ": error:" << ex.what() << endl;
         return EXIT_FAILURE;
     }
     catch(const std::string& msg)
     {
-        getErrorStream() << argv[0] << ": error:" << msg << endl;
+        getErrorStream() << args[0] << ": error:" << msg << endl;
         return EXIT_FAILURE;
     }
     catch(const char* msg)
     {
-        getErrorStream() << argv[0] << ": error:" << msg << endl;
+        getErrorStream() << args[0] << ": error:" << msg << endl;
         return EXIT_FAILURE;
     }
     catch(...)
     {
-        getErrorStream() << argv[0] << ": error:" << "unknown exception" << endl;
+        getErrorStream() << args[0] << ": error:" << "unknown exception" << endl;
         return EXIT_FAILURE;
     }
 }