zeroc-ice 3.6b1 → 3.6.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -15,6 +15,7 @@
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/UUID.h>
 #include <algorithm>
+#include <vector>
 #include <fstream>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -286,8 +287,8 @@ Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
 }
 
 bool
-Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<string>& includePaths,
-                                               const std::string& extraArgs, const string& cppSourceExt,
+Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, const vector<string>& includePaths,
+                                               const string& extraArgs, const string& cppSourceExt,
                                                const string& optValue)
 {
     if(!checkInputFile())
@@ -383,7 +384,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
 #endif
     pos = unprocessed.find(suffix) + suffix.size();
     string result;
-    if(lang != JavaXML)
+    if(lang != SliceXML)
     {
         result = unprocessed.substr(0, pos);
     }
@@ -398,6 +399,10 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
     //
     // Process each dependency.
     //
+    
+    string sourceFile;
+    vector<string> dependencies;
+    
     string::size_type end;
     while((end = unprocessed.find(".ice", pos)) != string::npos)
     {
@@ -431,7 +436,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             }
         }
 
-        if(lang == JavaXML)
+        if(lang == SliceXML)
         {
             if(result.size() == 0)
             {
@@ -442,6 +447,17 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
                 result += "\n    <dependsOn name=\"" + file + "\"/>";
             }
         }
+        else if(lang == JavaScriptJSON)
+        {
+            if(sourceFile.empty())
+            {
+                sourceFile = file;
+            }
+            else
+            {
+                dependencies.push_back(file);
+            }
+        }
         else
         {
             //
@@ -461,10 +477,34 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
         }
         pos = end;
     }
-    if(lang == JavaXML)
+    if(lang == SliceXML)
     {
         result += "\n  </source>\n";
     }
+    else if(lang == JavaScriptJSON)
+    {
+        result = "\"" + sourceFile + "\":" + (dependencies.empty() ? "[]" : "[");
+        for(vector<string>::const_iterator i = dependencies.begin(); i != dependencies.end();)
+        {
+            string file = *i;
+            result += "\n    \"" + file + "\"";
+            if(++i == dependencies.end())
+            {
+                result += "]";
+            }
+            else
+            {
+                result += ",";
+            }
+        }
+        
+        string::size_type pos = 0;
+        while((pos = result.find("\\", pos + 1)) != string::npos)
+        {
+            result.insert(pos, 1, '\\');
+            ++pos;
+        }
+    }
     else
     {
         result += "\n";
@@ -509,7 +549,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             }
             break;
         }
-        case JavaXML:
+        case SliceXML:
             break;
         case Java:
         {
@@ -570,7 +610,9 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             }
             break;
         }
-        case JS:
+        case JavaScriptJSON:
+            break;
+        case JavaScript:
         {
             //
             // Change .o[bj] suffix to .js suffix.
@@ -622,6 +664,16 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
             }
             break;
         }
+        case ObjC:
+        {
+            string::size_type pos = result.find(suffix);
+            if(pos != string::npos)
+            {
+                string name = result.substr(0, pos);
+                result.replace(0, pos + suffix.size() - 1, name + ".h " + name + ".m");
+            }
+            break;
+        }
         default:
         {
             abort();
@@ -632,7 +684,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
     //
     // Output result
     //
-    fputs(result.c_str(), stdout);
+    out << result;
     return true;
 }
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -14,6 +14,8 @@
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
+// BUGFIX: With MSVC2013 if this isn't included you get strange linker errors.
+#include <IceUtil/FileUtil.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
 #include <Slice/PythonUtil.h>
@@ -400,6 +402,8 @@ usage(const char* 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"
@@ -423,6 +427,8 @@ Slice::Python::compile(int argc, char* argv[])
     opts.addOpt("E");
     opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "depend");
+    opts.addOpt("", "depend-xml");
+    opts.addOpt("", "depend-file", IceUtilInternal::Options::NeedArg, "");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
@@ -480,6 +486,10 @@ Slice::Python::compile(int argc, char* argv[])
 
     bool depend = opts.isSet("depend");
 
+    bool dependxml = opts.isSet("depend-xml");
+
+    string dependFile = opts.optArg("depend-file");
+
     bool debug = opts.isSet("debug");
 
     bool ice = opts.isSet("ice");
@@ -501,6 +511,13 @@ Slice::Python::compile(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
+    if(depend && dependxml)
+    {
+        getErrorStream() << argv[0] << ": error: cannot specify both --depend and --dependxml" << endl;
+        usage(argv[0]);
+        return EXIT_FAILURE;
+    }
+
     int status = EXIT_SUCCESS;
 
     IceUtil::CtrlCHandler ctrlCHandler;
@@ -508,6 +525,12 @@ Slice::Python::compile(int argc, char* argv[])
 
     bool keepComments = true;
 
+    DependOutputUtil out(dependFile);
+    if(dependxml)
+    {
+        out.os() << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
+    }
+
     for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
@@ -519,13 +542,14 @@ Slice::Python::compile(int argc, char* argv[])
             continue;
         }
 
-        if(depend)
+        if(depend || dependxml)
         {
             PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
             FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2PY__");
 
             if(cppHandle == 0)
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
 
@@ -535,17 +559,20 @@ Slice::Python::compile(int argc, char* argv[])
 
             if(parseStatus == EXIT_FAILURE)
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
 
-            if(!icecpp->printMakefileDependencies(Preprocessor::Python, includePaths, 
+            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Python : Preprocessor::SliceXML, includePaths, 
                                                   "-D__SLICE2PY__", "", prefix))
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
 
             if(!icecpp->close())
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
         }
@@ -665,11 +692,17 @@ Slice::Python::compile(int argc, char* argv[])
 
             if(interrupted)
             {
+                out.cleanup();
                 FileTracker::instance()->cleanup();
                 return EXIT_FAILURE;
             }
         }
     }
 
+    if(dependxml)
+    {
+        out.os() << "</dependencies>\n";
+    }
+
     return status;
 }

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -121,7 +121,7 @@ private:
     //
     // Write an initializer value for a given type.
     //
-    void writeInitializer(const TypePtr&);
+    void writeInitializer(const DataMemberPtr&);
 
     //
     // Add a value to a hash code.
@@ -1674,8 +1674,9 @@ Slice::Python::CodeVisitor::writeType(const TypePtr& p)
 }
 
 void
-Slice::Python::CodeVisitor::writeInitializer(const TypePtr& p)
+Slice::Python::CodeVisitor::writeInitializer(const DataMemberPtr& m)
 {
+    TypePtr p = m->type();
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
     if(builtin)
     {
@@ -1988,7 +1989,7 @@ Slice::Python::CodeVisitor::writeConstructorParams(const MemberInfoList& members
         }
         else
         {
-            writeInitializer(member->type());
+            writeInitializer(member);
         }
     }
 }
@@ -2415,7 +2416,7 @@ Slice::Python::printHeader(IceUtilInternal::Output& out)
     static const char* header =
 "# **********************************************************************\n"
 "#\n"
-"# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.\n"
+"# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\n"
 "#\n"
 "# This copy of Ice is licensed to you under the terms described in the\n"
 "# ICE_LICENSE file included in this distribution.\n"
@@ -2450,15 +2451,16 @@ Slice::Python::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
             string s = *r;
             if(_history.count(s) == 0)
             {
+                _history.insert(s);
                 if(s.find(prefix) == 0)
                 {
                     static const string packagePrefix = "python:package:";
-                    if(s.find(packagePrefix) != 0 || s.size() == packagePrefix.size())
+                    if(s.find(packagePrefix) == 0 && s.size() > packagePrefix.size())
                     {
-                        emitWarning(file, "", "ignoring invalid global metadata `" + s + "'");
+                        continue;
                     }
+                    emitWarning(file, "", "ignoring invalid global metadata `" + s + "'");
                 }
-                _history.insert(s);
             }
         }
     }
@@ -2601,9 +2603,7 @@ void
 Slice::Python::MetaDataVisitor::reject(const ContainedPtr& cont)
 {
     StringList localMetaData = cont->getMetaData();
-
     static const string prefix = "python:";
-
     for(StringList::const_iterator p = localMetaData.begin(); p != localMetaData.end(); ++p)
     {
         if(p->find(prefix) == 0)

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -70,6 +70,8 @@ usage(const char* 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"
@@ -92,6 +94,8 @@ Slice::Ruby::compile(int argc, char* argv[])
     opts.addOpt("E");
     opts.addOpt("", "output-dir", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "depend");
+    opts.addOpt("", "depend-xml");
+    opts.addOpt("", "depend-file", IceUtilInternal::Options::NeedArg, "");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
@@ -147,6 +151,10 @@ Slice::Ruby::compile(int argc, char* argv[])
 
     bool depend = opts.isSet("depend");
 
+    bool dependxml = opts.isSet("depend-xml");
+
+    string dependFile = opts.optArg("depend-file");
+
     bool debug = opts.isSet("debug");
 
     bool ice = opts.isSet("ice");
@@ -164,11 +172,24 @@ Slice::Ruby::compile(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
+    if(depend && dependxml)
+    {
+        getErrorStream() << argv[0] << ": error: cannot specify both --depend and --dependxml" << endl;
+        usage(argv[0]);
+        return EXIT_FAILURE;
+    }
+
     int status = EXIT_SUCCESS;
 
     IceUtil::CtrlCHandler ctrlCHandler;
     ctrlCHandler.setCallback(interruptedCallback);
 
+    DependOutputUtil out(dependFile);
+    if(dependxml)
+    {
+        out.os() << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<dependencies>" << endl;
+    }
+
     for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
     {
         //
@@ -180,13 +201,14 @@ Slice::Ruby::compile(int argc, char* argv[])
             continue;
         }
 
-        if(depend)
+        if(depend || dependxml)
         {
             PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);
             FILE* cppHandle = icecpp->preprocess(false, "-D__SLICE2RB__");
 
             if(cppHandle == 0)
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
 
@@ -196,17 +218,20 @@ Slice::Ruby::compile(int argc, char* argv[])
 
             if(parseStatus == EXIT_FAILURE)
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
 
-            if(!icecpp->printMakefileDependencies(Preprocessor::Ruby, includePaths, 
+            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Ruby : Preprocessor::SliceXML, includePaths, 
                                                   "-D__SLICE2RB__"))
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
 
             if(!icecpp->close())
             {
+                out.cleanup();
                 return EXIT_FAILURE;
             }
         }
@@ -307,11 +332,17 @@ Slice::Ruby::compile(int argc, char* argv[])
 
             if(interrupted)
             {
+                out.cleanup();
                 FileTracker::instance()->cleanup();
                 return EXIT_FAILURE;
             }
         }
     }
 
+    if(dependxml)
+    {
+        out.os() << "</dependencies>\n";
+    }
+
     return status;
 }