zeroc-ice 3.6.0 → 3.6.1

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

@@ -1178,6 +1178,14 @@ Slice::Container::lookupType(const string& scoped, bool printError)
     return lookupTypeNoBuiltin(scoped, printError);
 }
 
+//
+// TODO: Hack to keep binary compatibility with Ice 3.6.0, fix properly in Ice 3.7
+//
+namespace
+{
+bool ignoreUndefined = false;
+}
+
 TypeList
 Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
 {
@@ -1200,6 +1208,8 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
     }
 
     TypeList results;
+    bool typeError = false;
+    vector<string> errors;
     if(sc.rfind('*') == sc.length() - 1)
     {
         //
@@ -1256,10 +1266,9 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
                 string msg = (*p)->kindOf() + " name `" + scoped;
                 msg += "' is capitalized inconsistently with its previous name: `";
                 msg += matches.front()->scoped() + "'";
-                _unit->error(msg);
+                errors.push_back(msg);
             }
 
-
             ExceptionPtr ex = ExceptionPtr::dynamicCast(*p);
             if(ex)
             {
@@ -1276,14 +1285,15 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
             TypePtr type = TypePtr::dynamicCast(*p);
             if(!type)
             {
+                typeError = true;
                 if(printError)
                 {
                     string msg = "`";
                     msg += sc;
                     msg += "' is not a type";
-                    _unit->error(msg);
+                    errors.push_back(msg);
                 }
-                return TypeList();
+                break; // Possible that correct match is higher in scope
             }
             results.push_back(type);
         }
@@ -1292,9 +1302,18 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
     if(results.empty())
     {
         ContainedPtr contained = ContainedPtr::dynamicCast(this);
-        if(!contained)
+        if(contained)
         {
-            if(printError)
+            if(typeError)
+            {
+                ignoreUndefined = true;
+            }
+            results = contained->container()->lookupTypeNoBuiltin(sc, printError);
+            ignoreUndefined = false;
+        }
+        else if(!typeError)
+        {
+            if(printError && !ignoreUndefined)
             {
                 string msg = "`";
                 msg += sc;
@@ -1303,12 +1322,19 @@ Slice::Container::lookupTypeNoBuiltin(const string& scoped, bool printError)
             }
             return TypeList();
         }
-        return contained->container()->lookupTypeNoBuiltin(sc, printError);
     }
-    else
+
+    //
+    // Do not emit errors if there was a type error but a match was found in a higher scope.
+    //
+    if(printError && !(typeError && !results.empty()))
     {
-        return results;
+        for(vector<string>::const_iterator p = errors.begin(); p != errors.end(); ++p)
+        {
+            _unit->error(*p);
+        }
     }
+    return results;
 }
 
 ContainedList

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

@@ -7,7 +7,6 @@
 //
 // **********************************************************************
 
-#include <IceUtil/DisableWarnings.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/Util.h>
 #include <IceUtil/StringUtil.h>
@@ -123,7 +122,7 @@ Slice::Preprocessor::normalizeIncludePath(const string& path)
         result.replace(pos, 2, "/");
     }
 
-    if(result == "/" || (result.size() == 3 && IceUtilInternal::isAlpha(result[0]) && result[1] == ':' && 
+    if(result == "/" || (result.size() == 3 && IceUtilInternal::isAlpha(result[0]) && result[1] == ':' &&
                          result[2] == '/'))
     {
         return result;
@@ -149,7 +148,7 @@ baseArgs(vector<string> args, bool keepComments, const string& extraArgs, const
     }
     args.push_back("-e");
     args.push_back("en_us.utf8");
-    
+
     //
     // Define version macros __ICE_VERSION__ is preferred. We keep
     // ICE_VERSION for backward compatibility with 3.5.0.
@@ -161,7 +160,7 @@ baseArgs(vector<string> args, bool keepComments, const string& extraArgs, const
         os << "-D" << version[i] << "=" << ICE_INT_VERSION;
         args.push_back(os.str());
     }
-    
+
     if(!extraArgs.empty())
     {
         args.push_back(extraArgs);
@@ -234,9 +233,9 @@ Slice::Preprocessor::preprocess(bool keepComments, const string& extraArgs)
         // We use an unique id as the tmp file name prefix to avoid
         // problems with this code being called concurrently from
         // several processes, otherwise there is a change that two
-        // process call _tempnam before any of them call fopen and 
+        // process call _tempnam before any of them call fopen and
         // they will end up using the same tmp file.
-        // 
+        //
         char* name = _tempnam(0, ("slice-" + IceUtil::generateUUID()).c_str());
         if(name)
         {
@@ -295,7 +294,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
     {
         return false;
     }
-    
+
     string cppHeaderExt;
     string pyPrefix;
     if(lang == CPlusPlus)
@@ -313,7 +312,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
     vector<string> args = _args;
     args.push_back("-M");
     args = baseArgs(args, false, extraArgs, _fileName);
-   
+
     const char** argv = new const char*[args.size() + 1];
     for(unsigned int i = 0; i < args.size(); ++i)
     {
@@ -399,10 +398,10 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
     //
     // Process each dependency.
     //
-    
+
     string sourceFile;
     vector<string> dependencies;
-    
+
     string::size_type end;
     while((end = unprocessed.find(".ice", pos)) != string::npos)
     {
@@ -497,7 +496,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
                 result += ",";
             }
         }
-        
+
         string::size_type pos = 0;
         while((pos = result.find("\\", pos + 1)) != string::npos)
         {

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

@@ -434,6 +434,7 @@ Slice::Python::compile(int argc, char* argv[])
     opts.addOpt("", "underscore");
     opts.addOpt("", "all");
     opts.addOpt("", "no-package");
+    opts.addOpt("", "build-package");
     opts.addOpt("", "checksum");
     opts.addOpt("", "prefix", IceUtilInternal::Options::NeedArg);
 
@@ -500,6 +501,8 @@ Slice::Python::compile(int argc, char* argv[])
 
     bool noPackage = opts.isSet("no-package");
 
+    bool buildPackage = opts.isSet("build-package");
+
     bool checksum = opts.isSet("checksum");
 
     string prefix = opts.optArg("prefix");
@@ -518,6 +521,13 @@ Slice::Python::compile(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
+    if(noPackage && buildPackage)
+    {
+        getErrorStream() << argv[0] << ": error: cannot specify both --no-package and --build-package" << endl;
+        usage(argv[0]);
+        return EXIT_FAILURE;
+    }
+
     int status = EXIT_SUCCESS;
 
     IceUtil::CtrlCHandler ctrlCHandler;
@@ -563,8 +573,8 @@ Slice::Python::compile(int argc, char* argv[])
                 return EXIT_FAILURE;
             }
 
-            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Python : Preprocessor::SliceXML, includePaths, 
-                                                  "-D__SLICE2PY__", "", prefix))
+            if(!icecpp->printMakefileDependencies(out.os(), depend ? Preprocessor::Python : Preprocessor::SliceXML,
+                                                  includePaths, "-D__SLICE2PY__", "", prefix))
             {
                 out.cleanup();
                 return EXIT_FAILURE;
@@ -618,45 +628,52 @@ Slice::Python::compile(int argc, char* argv[])
                 }
                 else
                 {
-                    string base = icecpp->getBaseName();
-                    string::size_type pos = base.find_last_of("/\\");
-                    if(pos != string::npos)
-                    {
-                        base.erase(0, pos + 1);
-                    }
-
-                    //
-                    // 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
-                    // 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;
-                    }
-
                     try
                     {
-                        IceUtilInternal::Output out;
-                        out.open(file.c_str());
-                        if(!out)
+                        string base = icecpp->getBaseName();
+                        string::size_type pos = base.find_last_of("/\\");
+                        if(pos != string::npos)
                         {
-                            ostringstream os;
-                            os << "cannot open`" << file << "': " << strerror(errno);
-                            throw FileException(__FILE__, __LINE__, os.str());
+                            base.erase(0, pos + 1);
                         }
-                        FileTracker::instance()->addFile(file);
 
-                        printHeader(out);
-                        printGeneratedHeader(out, base + ".ice", "#");
                         //
-                        // Generate the Python mapping.
+                        // If --build-package is specified, we don't generate any code and simply
+                        // update the __init__.py files.
                         //
-                        generate(u, all, checksum, includePaths, out);
-    
-                        out.close();
+                        if(!buildPackage)
+                        {
+                            //
+                            // 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
+                            // 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;
+                            }
+
+                            IceUtilInternal::Output out;
+                            out.open(file.c_str());
+                            if(!out)
+                            {
+                                ostringstream os;
+                                os << "cannot open`" << file << "': " << strerror(errno);
+                                throw FileException(__FILE__, __LINE__, os.str());
+                            }
+                            FileTracker::instance()->addFile(file);
+
+                            printHeader(out);
+                            printGeneratedHeader(out, base + ".ice", "#");
+                            //
+                            // Generate the Python mapping.
+                            //
+                            generate(u, all, checksum, includePaths, out);
+
+                            out.close();
+                        }
 
                         //
                         // Create or update the Python package hierarchy.
@@ -668,8 +685,9 @@ Slice::Python::compile(int argc, char* argv[])
                     }
                     catch(const Slice::FileException& ex)
                     {
-                        // If a file could not be created, then cleanup any
-                        // created files.
+                        //
+                        // If a file could not be created, then clean up any created files.
+                        //
                         FileTracker::instance()->cleanup();
                         u->destroy();
                         getErrorStream() << argv[0] << ": error: " << ex.reason() << endl;

data/ext/ice/mcpp/Makefile

@@ -4,6 +4,8 @@
 #
 # **********************************************************************
 
+PREFIX		= /opt/mcpp-2.7.2
+
 CFLAGS += -O -w
 
 UNAME = $(shell uname)
@@ -54,6 +56,14 @@ $(LIBDIR)/libmcpp.a: $(OBJS)
 	ar rcs $(LIBDIR)/libmcpp.a $(OBJS)
 	ranlib $(LIBDIR)/libmcpp.a
 
+install: $(LIBDIR)/libmcpp.a
+ifneq ($(findstring MINGW,$(UNAME)),)
+	cp $(LIBDIR)/libmcpp.a $(PREFIX)
+else
+	@mkdir -p $(PREFIX)/lib
+	cp $(LIBDIR)/libmcpp.a $(PREFIX)/lib
+endif
+
 clean:
 	rm -f $(OBJS)
 	rm -rf $(LIBDIR)

data/ext/ice/mcpp/Makefile.mak

@@ -4,21 +4,23 @@
 #
 # **********************************************************************
 
-RELEASE_OBJS = Release\directive.obj \
-	       Release\eval.obj \
-	       Release\expand.obj \
-	       Release\main.obj \
-	       Release\mbchar.obj \
-	       Release\support.obj \
-	       Release\system.obj
-
-DEBUG_OBJS = Debug\directive.obj \
-	     Debug\eval.obj \
-	     Debug\expand.obj \
-	     Debug\main.obj \
-	     Debug\mbchar.obj \
-	     Debug\support.obj \
-	     Debug\system.obj
+PREFIX		= C:\mcpp-2.7.2
+
+RELEASE_OBJS 	= Release\directive.obj \
+		  Release\eval.obj \
+		  Release\expand.obj \
+		  Release\main.obj \
+		  Release\mbchar.obj \
+		  Release\support.obj \
+		  Release\system.obj
+
+DEBUG_OBJS 	= Debug\directive.obj \
+		  Debug\eval.obj \
+		  Debug\expand.obj \
+		  Debug\main.obj \
+		  Debug\mbchar.obj \
+		  Debug\support.obj \
+		  Debug\system.obj
 
 {.\}.c{Debug}.obj::
 	$(CC) /MDd /Od /c /FoDebug\  $<
@@ -38,6 +40,12 @@ mcpp.lib: $(RELEASE_OBJS)
 mcppd.lib: $(DEBUG_OBJS)
 	lib /nologo /out:mcppd.lib $(DEBUG_OBJS)
 
+install: mcpp.lib mcppd.lib
+	@if not exist "$(PREFIX)\Release" mkdir "$(PREFIX)\Release"
+	copy mcpp.lib $(PREFIX)\Release\mcpp.lib
+	@if not exist "$(PREFIX)\Debug" mkdir "$(PREFIX)\Debug"
+	copy mcppd.lib $(PREFIX)\Debug\mcppd.lib
+
 clean:
 	del /q $(RELEASE_OBJS)
 	del /q $(DEBUG_OBJS)

data/ice.gemspec

@@ -9,8 +9,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.6.0'
-  s.date        = '2015-01-16'
+  s.version     = '3.6.1'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven

data/lib/Glacier2/Metrics.rb

@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.0
+# Ice version 3.6.1
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifier.rb

@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.0
+# Ice version 3.6.1
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.0
+# Ice version 3.6.1
 #
 # <auto-generated>
 #

data/lib/Glacier2/Router.rb

@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.0
+# Ice version 3.6.1
 #
 # <auto-generated>
 #

data/lib/Glacier2/RouterF.rb

@@ -7,7 +7,7 @@
 #
 # **********************************************************************
 #
-# Ice version 3.6.0
+# Ice version 3.6.1
 #
 # <auto-generated>
 #