zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Slice/Preprocessor.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Slice/Preprocessor.h>
 #include <Slice/Util.h>
@@ -13,7 +8,9 @@
 #include <IceUtil/StringConverter.h>
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/UUID.h>
+#include <IceUtil/ConsoleUtil.h>
 #include <algorithm>
+#include <iterator>
 #include <vector>
 #include <fstream>
 #include <sys/types.h>
@@ -26,6 +23,7 @@
 
 using namespace std;
 using namespace Slice;
+using namespace IceUtilInternal;
 
 //
 // mcpp defines
@@ -64,6 +62,12 @@ Slice::Preprocessor::~Preprocessor()
     close();
 }
 
+string
+Slice::Preprocessor::getFileName()
+{
+    return _fileName;
+}
+
 string
 Slice::Preprocessor::getBaseName()
 {
@@ -82,11 +86,9 @@ Slice::Preprocessor::addQuotes(const string& arg)
 {
     //
     // Add quotes around the given argument to ensure that arguments
-    // with spaces will be preserved as a single argument. We also
-    // escape the "\" character to ensure that we don't end up with a
-    // \" at the end of the string.
+    // with spaces will be preserved as a single argument
     //
-    return "\"" + IceUtilInternal::escapeString(arg, "\\") + "\"";
+    return "\"" + escapeString(arg, "", IceUtilInternal::Unicode) + "\"";
 }
 
 string
@@ -140,7 +142,7 @@ namespace
 {
 
 vector<string>
-baseArgs(vector<string> args, bool keepComments, const string& extraArgs, const string& fileName)
+baseArgs(vector<string> args, bool keepComments, const vector<string>& extraArgs, const string& fileName)
 {
     if(keepComments)
     {
@@ -161,10 +163,7 @@ baseArgs(vector args, bool keepComments, const string& extraArgs, const
         args.push_back(os.str());
     }
 
-    if(!extraArgs.empty())
-    {
-        args.push_back(extraArgs);
-    }
+    copy(extraArgs.begin(), extraArgs.end(), back_inserter(args));
     args.push_back(fileName);
     return args;
 }
@@ -172,7 +171,18 @@ baseArgs(vector args, bool keepComments, const string& extraArgs, const
 }
 
 FILE*
-Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
+Slice::Preprocessor::preprocess(bool keepComments, const string& extraArg)
+{
+    vector<string> args;
+    if(!extraArg.empty())
+    {
+        args.push_back(extraArg);
+    }
+    return preprocess(keepComments, args);
+}
+
+FILE*
+Slice::Preprocessor::preprocess(bool keepComments, const vector<string>& extraArgs)
 {
     if(!checkInputFile())
     {
@@ -270,10 +280,7 @@ Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
         }
         else
         {
-            ostream& os = getErrorStream();
-            os << _path << ": error: could not open temporary file: ";
-            os << _cppFile;
-            os << endl;
+            consoleErr << _path << ": error: could not open temporary file: " << _cppFile << endl;
         }
     }
 
@@ -287,7 +294,17 @@ Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
 
 bool
 Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, const vector<string>& includePaths,
-                                               const string& extraArgs, const string& cppSourceExt,
+                                               const string& extraArg, const string& cppSourceExt,
+                                               const string& optValue)
+{
+    vector<string> extraArgs;
+    extraArgs.push_back(extraArg);
+    return printMakefileDependencies(out, lang, includePaths, extraArgs, cppSourceExt, optValue);
+}
+
+bool
+Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, const vector<string>& includePaths,
+                                               const vector<string>& extraArgs, const string& /*cppSourceExt*/,
                                                const string& optValue)
 {
     if(!checkInputFile())
@@ -404,7 +421,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
     //
     // Get the main output file name.
     //
-#if defined(_MSC_VER) || defined(__MINGW32__)
+#ifdef _MSC_VER
      string suffix = ".obj:";
 #else
      string suffix = ".o:";
@@ -452,7 +469,8 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
                     {
                         if(file.compare(0, p->length(), *p) == 0)
                         {
-                            string s = includePaths[p - fullIncludePaths.begin()] + file.substr(p->length());
+                            string s = includePaths[static_cast<size_t>(p - fullIncludePaths.begin())] +
+                                file.substr(p->length());
                             if(IceUtilInternal::isAbsolutePath(newFile) || s.size() < newFile.size())
                             {
                                 newFile = s;
@@ -526,7 +544,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             }
         }
 
-        string::size_type pos = 0;
+        pos = 0;
         while((pos = result.find("\\", pos + 1)) != string::npos)
         {
             result.insert(pos, 1, '\\');
@@ -568,7 +586,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to the h header extension suffix.
             //
-            string::size_type pos = result.find(suffix);
+            pos = result.find(suffix);
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);
@@ -580,6 +598,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
         case SliceXML:
             break;
         case Java:
+        case MATLAB:
         {
             //
             // We want to shift the files left one position, so that
@@ -598,7 +617,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Find end of next file.
             //
-            string::size_type pos = 0;
+            pos = 0;
             while((pos = result.find_first_of(" :\t\r\n\\", pos + 1)) != string::npos)
             {
                 if(result[pos] == ':')
@@ -631,7 +650,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .cs suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".cs");
@@ -645,7 +664,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .js suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".js");
@@ -661,7 +680,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             {
                 result = pyPrefix + result;
             }
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, "_ice.py");
@@ -673,7 +692,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .rb suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".rb");
@@ -685,7 +704,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             //
             // Change .o[bj] suffix to .php suffix.
             //
-            string::size_type pos;
+            pos = 0;
             if((pos = result.find(suffix)) != string::npos)
             {
                 result.replace(pos, suffix.size() - 1, ".php");
@@ -694,7 +713,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
         }
         case ObjC:
         {
-            string::size_type pos = result.find(suffix);
+            pos = result.find(suffix);
             if(pos != string::npos)
             {
                 string name = result.substr(0, pos);
@@ -702,9 +721,21 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             }
             break;
         }
+        case Swift:
+        {
+            //
+            // Change .o[bj] suffix to .swift suffix.
+            //
+            pos = 0;
+            if ((pos = result.find(suffix)) != string::npos)
+            {
+                result.replace(pos, suffix.size() - 1, ".swift");
+            }
+            break;
+        }
         default:
         {
-            abort();
+            assert(false);
             break;
         }
     }
@@ -750,14 +781,14 @@ Slice::Preprocessor::checkInputFile()
     }
     if(suffix != ".ice")
     {
-        getErrorStream() << _path << ": error: input files must end with `.ice'" << endl;
+        consoleErr << _path << ": error: input files must end with `.ice'" << endl;
         return false;
     }
 
-    IceUtilInternal::ifstream test(_fileName);
+    ifstream test(IceUtilInternal::streamFilename(_fileName).c_str());
     if(!test)
     {
-        getErrorStream() << _path << ": error: cannot open `" << _fileName << "' for reading" << endl;
+        consoleErr << _path << ": error: cannot open `" << _fileName << "' for reading" << endl;
         return false;
     }
     test.close();

data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef PREPROCESSOR_H
 #define PREPROCESSOR_H
@@ -14,23 +9,13 @@
 #include <IceUtil/Handle.h>
 #include <vector>
 
-#ifndef SLICE_API
-#   ifdef SLICE_API_EXPORTS
-#       define SLICE_API ICE_DECLSPEC_EXPORT
-#   elif defined(ICE_STATIC_LIBS)
-#       define SLICE_API /**/
-#   else
-#       define SLICE_API ICE_DECLSPEC_IMPORT
-#   endif
-#endif
-
 namespace Slice
 {
 
 class Preprocessor;
 typedef IceUtil::Handle<Preprocessor> PreprocessorPtr;
 
-class SLICE_API Preprocessor : public IceUtil::SimpleShared
+class Preprocessor : public IceUtil::SimpleShared
 {
 public:
 
@@ -39,13 +24,18 @@ public:
     ~Preprocessor();
 
     FILE* preprocess(bool, const std::string& = "");
+    FILE* preprocess(bool, const std::vector<std::string>&);
     bool close();
 
-    enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML };
+    enum Language { CPlusPlus, Java, CSharp, Python, Ruby, PHP, JavaScript, JavaScriptJSON, ObjC, SliceXML, MATLAB, Swift };
 
     bool printMakefileDependencies(std::ostream&, Language, const std::vector<std::string>&, const std::string& = "",
                                    const std::string& = "cpp", const std::string& = "");
+    bool printMakefileDependencies(std::ostream&, Language, const std::vector<std::string>&,
+                                   const std::vector<std::string>&, const std::string& = "cpp",
+                                   const std::string& = "");
 
+    std::string getFileName();
     std::string getBaseName();
 
     static std::string addQuotes(const std::string&);

data/ext/ice/cpp/src/Slice/Python.cpp

@@ -1,19 +1,14 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
+#include <IceUtil/ConsoleUtil.h>
 // BUGFIX: With MSVC2013 if this isn't included you get strange linker errors.
 #include <IceUtil/FileUtil.h>
 #include <Slice/Preprocessor.h>
@@ -38,6 +33,7 @@
 using namespace std;
 using namespace Slice;
 using namespace Slice::Python;
+using namespace IceUtilInternal;
 
 namespace
 {
@@ -71,6 +67,100 @@ interruptedCallback(int /*signal*/)
     interrupted = true;
 }
 
+void
+createDirectory(const string& dir)
+{
+    IceUtilInternal::structstat st;
+    if(!IceUtilInternal::stat(dir, &st))
+    {
+        if(!(st.st_mode & S_IFDIR))
+        {
+            ostringstream os;
+            os << "failed to create directory '" << dir
+               << "': file already exists and is not a directory";
+            throw FileException(__FILE__, __LINE__, os.str());
+        }
+        return;
+    }
+
+    if(IceUtilInternal::mkdir(dir, 0777) != 0)
+    {
+        ostringstream os;
+        os << "cannot create directory '" << dir << "': " << IceUtilInternal::errorToString(errno);
+        throw FileException(__FILE__, __LINE__, os.str());
+    }
+}
+
+//
+// Starting in the directory given by output (can be empty for the CWD), create all necessary subdirectories
+// in the path given by pkgdir.
+//
+void
+createPackageDirectory(const string& output, const string& pkgdir)
+{
+    assert(output.empty() || IceUtilInternal::directoryExists(output));
+    assert(!pkgdir.empty());
+
+    vector<string> elements;
+    if(!IceUtilInternal::splitString(pkgdir, "/", elements))
+    {
+        throw FileException(__FILE__, __LINE__, "invalid path in '" + pkgdir + "'");
+    }
+
+    assert(!elements.empty());
+
+    //
+    // Create all necessary subdirectories.
+    //
+    string path = output;
+    for(vector<string>::iterator p = elements.begin(); p != elements.end(); ++p)
+    {
+        if(!path.empty())
+        {
+            path += "/";
+        }
+        path += *p;
+        IceUtilInternal::structstat st;
+        if(IceUtilInternal::stat(path, &st) < 0)
+        {
+            if(IceUtilInternal::mkdir(path, 0777) != 0)
+            {
+                ostringstream os;
+                os << "cannot create directory '" << path << "': " << IceUtilInternal::errorToString(errno);
+                throw FileException(__FILE__, __LINE__, os.str());
+            }
+            FileTracker::instance()->addDirectory(path);
+        }
+        else if(!(st.st_mode & S_IFDIR))
+        {
+            ostringstream os;
+            os << "failed to create directory '" << path << "': file already exists and is not a directory";
+            throw FileException(__FILE__, __LINE__, os.str());
+        }
+
+        //
+        // It's possible that the pkgdir metadata specified a directory that won't be visited by our
+        // PackageVisitor. We need every intermediate subdirectory to have an __init__.py file, which
+        // can be empty.
+        //
+        const string initFile = path + "/__init__.py";
+        if(!IceUtilInternal::fileExists(initFile))
+        {
+            //
+            // Create an empty file.
+            //
+            IceUtilInternal::Output out;
+            out.open(initFile.c_str());
+            if(!out)
+            {
+                ostringstream os;
+                os << "cannot open '" << initFile << "': " << IceUtilInternal::errorToString(errno);
+                throw FileException(__FILE__, __LINE__, os.str());
+            }
+            FileTracker::instance()->addFile(initFile);
+        }
+    }
+}
 
 //
 // For each Slice file Foo.ice we generate Foo_ice.py containing the Python
@@ -112,8 +202,6 @@ private:
     static const char* _moduleTag;
     static const char* _submoduleTag;
 
-    static void createDirectory(const string&);
-
     static void addModule(const string&, const string&, const string&);
     static void addSubmodule(const string&, const string&, const string&);
 
@@ -132,24 +220,24 @@ PackageVisitor::PackageVisitor(StringList& modules) :
 }
 
 void
-PackageVisitor::createModules(const UnitPtr& unit, const string& module, const string& dir)
+PackageVisitor::createModules(const UnitPtr& unt, const string& module, const string& dir)
 {
     StringList modules;
     PackageVisitor v(modules);
-    unit->visit(&v, false);
+    unt->visit(&v, false);
 
     for(StringList::iterator p = modules.begin(); p != modules.end(); ++p)
     {
-        vector<string> v;
-        if(!IceUtilInternal::splitString(*p, ".", v))
+        vector<string> vs;
+        if(!IceUtilInternal::splitString(*p, ".", vs))
         {
             assert(false);
         }
         string currentModule;
         string path = dir.empty() ? "." : dir;
-        for(vector<string>::iterator q = v.begin(); q != v.end(); ++q)
+        for(vector<string>::iterator q = vs.begin(); q != vs.end(); ++q)
         {
-            if(q != v.begin())
+            if(q != vs.begin())
             {
                 addSubmodule(path, currentModule, *q);
                 currentModule += ".";
@@ -184,32 +272,6 @@ PackageVisitor::visitModuleEnd(const ModulePtr& p)
     }
 }
 
-void
-PackageVisitor::createDirectory(const string& dir)
-{
-    IceUtilInternal::structstat st;
-    if(!IceUtilInternal::stat(dir, &st))
-    {
-        if(!(st.st_mode & S_IFDIR))
-        {
-            ostringstream os;
-            os << "failed to create package directory `" << dir
-               << "': file already exists and is not a directory";
-            throw FileException(__FILE__, __LINE__, os.str());
-        }
-        return;
-    }
-
-    if(IceUtilInternal::mkdir(dir, 0777) != 0)
-    {
-        ostringstream os;
-        os << "cannot create directory `" << dir << "': " << strerror(errno);
-        throw FileException(__FILE__, __LINE__, os.str());
-    }
-
-    FileTracker::instance()->addDirectory(dir);
-}
-
 void
 PackageVisitor::addModule(const string& dir, const string& module, const string& name)
 {
@@ -250,11 +312,11 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
     IceUtilInternal::structstat st;
     if(!IceUtilInternal::stat(initPath, &st))
     {
-        IceUtilInternal::ifstream in(initPath);
+        ifstream in(IceUtilInternal::streamFilename(initPath).c_str());
         if(!in)
         {
             ostringstream os;
-            os << "cannot open file `" << initPath << "': " << strerror(errno);
+            os << "cannot open file '" << initPath << "': " << IceUtilInternal::errorToString(errno);
             throw FileException(__FILE__, __LINE__, os.str());
         }
 
@@ -288,9 +350,7 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
 
                 if(s.size() < 8)
                 {
-                    ostringstream os;
-                    os << "invalid line `" << s << "' in `" << initPath << "'";
-                    throw os.str();
+                    throw runtime_error("invalid line '" + s + "' in '" + initPath + "'");
                 }
 
                 string name = s.substr(7);
@@ -320,27 +380,21 @@ PackageVisitor::readInit(const string& dir, StringList& modules, StringList& sub
             {
                 if(state != InSubmodules)
                 {
-                    ostringstream os;
-                    os << "invalid line `" << s << "' in `" << initPath << "'";
-                    throw os.str();
+                    throw runtime_error("invalid line '" + s + "' in '" + initPath + "'");
                 }
 
                 if(s.size() < 15)
                 {
-                    ostringstream os;
-                    os << "invalid line `" << s << "' in `" << initPath << "'";
-                    throw os.str();
+                    throw runtime_error("invalid line '" + s + "' in '" + initPath + "'");
                 }
 
                 submodules.push_back(s.substr(14));
             }
         }
 
-        if(state != InSubmodules)
+        if(state == InModules)
         {
-            ostringstream os;
-            os << "invalid format in `" << initPath << "'" << endl;
-            throw os.str();
+            throw runtime_error("invalid format in '" + initPath + "'\n");
         }
     }
 }
@@ -351,12 +405,12 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
 {
     string initPath = dir + "/__init__.py";
 
-    IceUtilInternal::ofstream os(initPath);
+    ofstream os(IceUtilInternal::streamFilename(initPath).c_str());
     if(!os)
     {
-        ostringstream os;
-        os << "cannot open file `" << initPath << "': " << strerror(errno);
-        throw FileException(__FILE__, __LINE__, os.str());
+        ostringstream oss;
+        oss << "cannot open file '" << initPath << "': " << IceUtilInternal::errorToString(errno);
+        throw FileException(__FILE__, __LINE__, oss.str());
     }
     FileTracker::instance()->addFile(initPath);
 
@@ -383,26 +437,24 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis
 void
 usage(const string& n)
 {
-    getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
-    getErrorStream() <<
+    consoleErr << "Usage: " << n << " [options] slice-files...\n";
+    consoleErr <<
         "Options:\n"
-        "-h, --help           Show this message.\n"
-        "-v, --version        Display the Ice version.\n"
-        "-DNAME               Define NAME as 1.\n"
-        "-DNAME=DEF           Define NAME as DEF.\n"
-        "-UNAME               Remove any definition for NAME.\n"
-        "-IDIR                Put DIR in the include file search path.\n"
-        "-E                   Print preprocessor output on stdout.\n"
-        "--output-dir DIR     Create files in the directory DIR.\n"
-        "--depend             Generate Makefile dependencies.\n"
-        "--depend-xml         Generate dependencies in XML format.\n"
-        "--depend-file FILE   Write dependencies to FILE instead of standard output.\n"
-        "-d, --debug          Print debug messages.\n"
-        "--ice                Permit `Ice' prefix (for building Ice source code only).\n"
-        "--underscore         Permit underscores in Slice identifiers.\n"
-        "--all                Generate code for Slice definitions in included files.\n"
-        "--checksum           Generate checksums for Slice definitions.\n"
-        "--prefix PREFIX      Prepend filenames of Python modules with PREFIX.\n"
+        "-h, --help               Show this message.\n"
+        "-v, --version            Display the Ice version.\n"
+        "-DNAME                   Define NAME as 1.\n"
+        "-DNAME=DEF               Define NAME as DEF.\n"
+        "-UNAME                   Remove any definition for NAME.\n"
+        "-IDIR                    Put DIR in the include file search path.\n"
+        "-E                       Print preprocessor output on stdout.\n"
+        "--output-dir DIR         Create files in the directory DIR.\n"
+        "-d, --debug              Print debug messages.\n"
+        "--depend                 Generate Makefile dependencies.\n"
+        "--depend-xml             Generate dependencies in XML format.\n"
+        "--depend-file FILE       Write dependencies to FILE instead of standard output.\n"
+        "--all                    Generate code for Slice definitions in included files.\n"
+        "--checksum               Generate checksums for Slice definitions.\n"
+        "--prefix PREFIX          Prepend filenames of Python modules with PREFIX.\n"
         ;
 }
 
@@ -438,7 +490,7 @@ Slice::Python::compile(const vector& argv)
     }
     catch(const IceUtilInternal::BadOptException& e)
     {
-        getErrorStream() << argv[0] << ": error: " << e.reason << endl;
+        consoleErr << argv[0] << ": error: " << e.reason << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
@@ -451,7 +503,7 @@ Slice::Python::compile(const vector& argv)
 
     if(opts.isSet("version"))
     {
-        getErrorStream() << ICE_STRING_VERSION << endl;
+        consoleErr << ICE_STRING_VERSION << endl;
         return EXIT_SUCCESS;
     }
 
@@ -502,25 +554,31 @@ Slice::Python::compile(const vector& argv)
 
     if(args.empty())
     {
-        getErrorStream() << argv[0] << ": error: no input file" << endl;
+        consoleErr << argv[0] << ": error: no input file" << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
 
     if(depend && dependxml)
     {
-        getErrorStream() << argv[0] << ": error: cannot specify both --depend and --dependxml" << endl;
+        consoleErr << argv[0] << ": error: cannot specify both --depend and --dependxml" << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
 
     if(noPackage && buildPackage)
     {
-        getErrorStream() << argv[0] << ": error: cannot specify both --no-package and --build-package" << endl;
+        consoleErr << argv[0] << ": error: cannot specify both --no-package and --build-package" << endl;
         usage(argv[0]);
         return EXIT_FAILURE;
     }
 
+    if(!output.empty() && !IceUtilInternal::directoryExists(output))
+    {
+        consoleErr << argv[0] << ": error: argument for --output-dir does not exist or is not a directory" << endl;
+        return EXIT_FAILURE;
+    }
+
     int status = EXIT_SUCCESS;
 
     IceUtil::CtrlCHandler ctrlCHandler;
@@ -528,10 +586,10 @@ Slice::Python::compile(const vector& argv)
 
     bool keepComments = true;
 
-    DependOutputUtil out(dependFile);
+    ostringstream os;
     if(dependxml)
     {
-        out.os() << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
+        os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
     }
 
     for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
@@ -552,7 +610,6 @@ Slice::Python::compile(const vector& argv)
 
             if(cppHandle == 0)
             {
-                out.cleanup();
                 return EXIT_FAILURE;
             }
 
@@ -562,20 +619,17 @@ Slice::Python::compile(const vector& argv)
 
             if(parseStatus == EXIT_FAILURE)
             {
-                out.cleanup();
                 return EXIT_FAILURE;
             }
 
-            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Python : Preprocessor::SliceXML,
+            if(!icecpp->printMakefileDependencies(os, depend ? Preprocessor::Python : Preprocessor::SliceXML,
                                                   includePaths, "-D__SLICE2PY__", "", prefix))
             {
-                out.cleanup();
                 return EXIT_FAILURE;
             }
 
             if(!icecpp->close())
             {
-                out.cleanup();
                 return EXIT_FAILURE;
             }
         }
@@ -592,7 +646,7 @@ Slice::Python::compile(const vector& argv)
             if(preprocess)
             {
                 char buf[4096];
-                while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)
+                while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR)
                 {
                     if(fputs(buf, stdout) == EOF)
                     {
@@ -630,42 +684,82 @@ Slice::Python::compile(const vector& argv)
                             base.erase(0, pos + 1);
                         }
 
+                        //
+                        // Check if the file contains the python:pkgdir global metadata.
+                        //
+                        const string pkgdir = getPackageDirectory(icecpp->getFileName(), u);
+
                         //
                         // If --build-package is specified, we don't generate any code and simply
                         // update the __init__.py files.
                         //
                         if(!buildPackage)
                         {
+                            string path;
+                            if(!output.empty())
+                            {
+                                path = output + '/'; // The output directory must already exist.
+                            }
+
+                            if(!pkgdir.empty())
+                            {
+                                //
+                                // The metadata is present. It should have the form
+                                //
+                                // python:pkgdir:A/B/C
+                                //
+                                // We open the output file in the specified directory, prefixed by the
+                                // output directory (if any).
+                                //
+                                createPackageDirectory(output, pkgdir);
+                                path += pkgdir;
+                                if(path[path.size() - 1] != '/')
+                                {
+                                    path += "/"; // Append a separator if necessary.
+                                }
+                            }
+                            else
+                            {
+                                //
+                                // The file doesn't contain the python:pkgdir metadata, so we use the
+                                // value of the --prefix option (if any).
+                                //
+                                path += prefix;
+                            }
+
+                            //
+                            // Add the file name (without the .ice extension).
+                            //
+                            path += base;
+
                             //
                             // Append the suffix "_ice" to the filename in order to avoid any conflicts
-                            // with Slice module names. For example, if the file Test.ice defines a
+                            // with Slice module or type names. For example, if the file Test.ice defines a
                             // Slice module named "Test", then we couldn't create a Python package named
                             // "Test" and also call the generated file "Test.py".
                             //
-                            string file = prefix + base + "_ice.py";
-                            if(!output.empty())
-                            {
-                                file = output + '/' + file;
-                            }
+                            path += "_ice.py";
 
                             IceUtilInternal::Output out;
-                            out.open(file.c_str());
+                            out.open(path.c_str());
                             if(!out)
                             {
-                                ostringstream os;
-                                os << "cannot open`" << file << "': " << strerror(errno);
-                                throw FileException(__FILE__, __LINE__, os.str());
+                                ostringstream oss;
+                                oss << "cannot open '" << path << "': " << IceUtilInternal::errorToString(errno);
+                                throw FileException(__FILE__, __LINE__, oss.str());
                             }
-                            FileTracker::instance()->addFile(file);
+                            FileTracker::instance()->addFile(path);
 
                             //
-                            // Python magic comment to set the file encoding, it must be first or second line
+                            // Emit a Python magic comment to set the file encoding.
+                            // It must be the first or second line.
                             //
                             out << "# -*- coding: utf-8 -*-\n";
                             printHeader(out);
                             printGeneratedHeader(out, base + ".ice", "#");
+
                             //
-                            // Generate the Python mapping.
+                            // Generate Python code.
                             //
                             generate(u, all, checksum, includePaths, out);
 
@@ -677,7 +771,16 @@ Slice::Python::compile(const vector& argv)
                         //
                         if(!noPackage)
                         {
-                            PackageVisitor::createModules(u, prefix + base + "_ice", output);
+                            string name;
+                            if(!pkgdir.empty())
+                            {
+                                name = getImportFileName(icecpp->getFileName(), u, vector<string>());
+                            }
+                            else
+                            {
+                                name = prefix + base + "_ice";
+                            }
+                            PackageVisitor::createModules(u, name, output);
                         }
                     }
                     catch(const Slice::FileException& ex)
@@ -687,13 +790,13 @@ Slice::Python::compile(const vector& argv)
                         //
                         FileTracker::instance()->cleanup();
                         u->destroy();
-                        getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;
+                        consoleErr << argv[0] << ": error: " << ex.reason() << endl;
                         return EXIT_FAILURE;
                     }
-                    catch(const string& err)
+                    catch(const exception& ex)
                     {
                         FileTracker::instance()->cleanup();
-                        getErrorStream() << argv[0] << ": error: " << err << endl;
+                        consoleErr << argv[0] << ": error: " << ex.what() << endl;
                         status = EXIT_FAILURE;
                     }
                 }
@@ -707,7 +810,6 @@ Slice::Python::compile(const vector& argv)
 
             if(interrupted)
             {
-                out.cleanup();
                 FileTracker::instance()->cleanup();
                 return EXIT_FAILURE;
             }
@@ -716,7 +818,12 @@ Slice::Python::compile(const vector& argv)
 
     if(dependxml)
     {
-        out.os() << "</dependencies>\n";
+        os << "</dependencies>\n";
+    }
+
+    if(depend || dependxml)
+    {
+        writeDependencies(os.str(), dependFile);
     }
 
     return status;