zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Slice/RubyUtil.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.
@@ -64,7 +64,7 @@ private:
     //
     // Get an initializer value for a given type.
     //
-    string getInitializer(const TypePtr&);
+    string getInitializer(const DataMemberPtr&);
 
     //
     // Add a value to a hash code.
@@ -113,8 +113,8 @@ lookupKwd(const string& name)
     // conflict with a Slice identifier, so names such as "inspect" and
     // "send" are included but "to_s" is not.
     //
-    static const string keywordList[] = 
-    {       
+    static const string keywordList[] =
+    {
         "BEGIN", "END", "alias", "and", "begin", "break", "case", "class", "clone", "def", "display", "do", "dup",
         "else", "elsif", "end", "ensure", "extend", "false", "for", "freeze", "hash", "if", "in", "initialize_copy",
         "inspect", "instance_eval", "instance_variable_get", "instance_variable_set", "instance_variables", "method",
@@ -1363,8 +1363,9 @@ Slice::Ruby::CodeVisitor::writeType(const TypePtr& p)
 }
 
 string
-Slice::Ruby::CodeVisitor::getInitializer(const TypePtr& p)
+Slice::Ruby::CodeVisitor::getInitializer(const DataMemberPtr& m)
 {
+    TypePtr p = m->type();
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(p);
     if(builtin)
     {
@@ -1582,7 +1583,7 @@ Slice::Ruby::CodeVisitor::writeConstructorParams(const MemberInfoList& members)
         }
         else
         {
-            _out << getInitializer(member->type());
+            _out << getInitializer(member);
         }
     }
 }
@@ -1759,7 +1760,7 @@ Slice::Ruby::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"

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

@@ -547,7 +547,7 @@ char *slice_text;
 
 // **********************************************************************
 //
-// 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.

data/ext/ice/cpp/src/Slice/Util.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.
@@ -10,12 +10,20 @@
 #include <Slice/Util.h>
 #include <IceUtil/FileUtil.h>
 #include <IceUtil/StringUtil.h>
+#include <climits>
+
+#ifndef _MSC_VER
+#  include <unistd.h> // For readlink()
+#endif
 
 using namespace std;
 using namespace Slice;
 
+namespace
+{
+
 string
-Slice::normalizePath(const string& path)
+normalizePath(const string& path)
 {
     string result = path;
 
@@ -71,9 +79,23 @@ Slice::normalizePath(const string& path)
     return result;
 }
 
+}
+
 string
 Slice::fullPath(const string& path)
 {
+    //
+    // This function returns the canonicalized absolute pathname of
+    // the given path.
+    //
+    // It is used for instance used to normalize the paths provided
+    // with -I options. Like mcpp, we need to follow the symbolic
+    // links to ensure changeIncludes works correctly. For example, it
+    // must be possible to specify -I/opt/Ice-3.6 where Ice-3.6 is
+    // symbolic link to Ice-3.6.0 (if we don't do the same as mcpp,
+    // the generated headers will contain a full path...)
+    //
+
     string result = path;
     if(!IceUtilInternal::isAbsolutePath(result))
     {
@@ -84,50 +106,100 @@ Slice::fullPath(const string& path)
         }
     }
 
-    return normalizePath(result);
-}
+    result = normalizePath(result);
 
-string
-Slice::changeInclude(const string& orig, const vector<string>& includePaths)
-{
-    //
-    // MCPP does not follow symlinks included files so we only
-    // call fullPath on the base directory and not the file itself.
-    //
-    string file = orig;
-    string::size_type pos;
-    if((pos = orig.rfind('/')) != string::npos)
+#ifdef _WIN32
+    return result;
+#else
+
+    string::size_type beg = 0;
+    string::size_type next;
+    do
     {
-        string base = orig.substr(0, pos);
-        file = fullPath(base) + orig.substr(pos);
+        string subpath;
+        next = result.find('/', beg + 1);
+        if(next == string::npos)
+        {
+            subpath = result;
+        }
+        else
+        {
+            subpath = result.substr(0, next);
+        }
+
+        char buf[PATH_MAX + 1];
+        int len = static_cast<int>(readlink(subpath.c_str(), buf, sizeof(buf)));
+        if(len > 0)
+        {
+            buf[len] = '\0';
+            string linkpath = buf;
+            if(!IceUtilInternal::isAbsolutePath(linkpath)) // Path relative to the location of the link
+            {
+                string::size_type pos = subpath.rfind('/');
+                assert(pos != string::npos);
+                linkpath = subpath.substr(0, pos + 1) + linkpath;
+            }
+            result = normalizePath(linkpath) + (next != string::npos ? result.substr(next) : string());
+            beg = 0;
+            next = 0;
+        }
+        else
+        {
+            beg = next;
+        }
     }
+    while(next != string::npos);
+    return result;
+#endif
+}
 
+string
+Slice::changeInclude(const string& path, const vector<string>& includePaths)
+{
     //
     // Compare each include path against the included file and select
     // the path that produces the shortest relative filename.
     //
-    string result = file;
-    for(vector<string>::const_iterator p = includePaths.begin(); p != includePaths.end(); ++p)
+    string result = path;
+    vector<string> paths;
+    paths.push_back(path);
+    //
+    // if path is not a canonical path we also test with its canonical
+    // path
+    //
+    string canonicalPath = fullPath(path);
+    if(canonicalPath != path)
     {
-        if(file.compare(0, p->length(), *p) == 0)
-        {
-            string s = file.substr(p->length() + 1); // + 1 for the '/'
-            if(s.size() < result.size())
+        paths.push_back(canonicalPath);
+    }
+    
+    for(vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i)
+    {
+        for(vector<string>::const_iterator j = includePaths.begin(); j != includePaths.end(); ++j)
+        {            
+            if(i->compare(0, j->length(), *j) == 0)
             {
-                result = s;
+                string s = i->substr(j->length() + 1); // + 1 for the '/'
+                if(s.size() < result.size())
+                {
+                    result = s;
+                }
             }
         }
-    }
-
-    if(result == file)
-    {
+        
         //
-        // Don't return a full path if we couldn't reduce the given path, instead
-        // return the normalized given path.
+        // If the path has been already shortened no need to test
+        // with canonical path.
         //
-        result = normalizePath(orig);
+        if(result != path)
+        {
+            break;
+        }
     }
 
+    result = normalizePath(result); // Normalize the result.
+
+    string::size_type pos;
     if((pos = result.rfind('.')) != string::npos)
     {
         result.erase(pos);
@@ -323,3 +395,38 @@ Slice::printGeneratedHeader(IceUtilInternal::Output& out, const string& path, co
     out << comment << " </auto-generated>\n";
     out << comment << "\n";
 }
+
+Slice::DependOutputUtil::DependOutputUtil(string& file) : _file(file)
+{
+    if(!_file.empty())
+    {
+        _os.open(file.c_str(), ios::out);
+    }
+}
+
+Slice::DependOutputUtil::~DependOutputUtil()
+{
+    if(!_file.empty() && _os.is_open())
+    {
+        _os.close();
+    }
+}
+
+void
+Slice::DependOutputUtil::cleanup()
+{
+    if(!_file.empty())
+    {
+        if(_os.is_open())
+        {
+            _os.close();
+        }
+        IceUtilInternal::unlink(_file);
+    }
+}
+
+ostream&
+Slice::DependOutputUtil::os()
+{
+    return _file.empty() ? cout : _os;
+}

data/ext/ice/mcpp/LICENSE

@@ -0,0 +1,29 @@
+/*-
+ * Copyright (c) 1998, 2002-2008 Kiyoshi Matsui <kmatsui@t3.rim.or.jp>
+ * All rights reserved.
+ *
+ * This software including the files in this directory is provided under
+ * the following license.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

data/ext/ice/mcpp/Makefile

@@ -0,0 +1,60 @@
+# **********************************************************************
+#
+# Copyright (c) 2015 ZeroC, Inc. All rights reserved.
+#
+# **********************************************************************
+
+CFLAGS += -O -w
+
+UNAME = $(shell uname)
+MACHINE = $(shell uname -m)
+
+LIBDIR = lib
+
+ifeq ($(UNAME),Linux)
+    CFLAGS += -fPIC
+
+    ifeq ($(MACHINE),i686)
+	CFLAGS += -m32
+
+	#
+	# Ubuntu.
+	#
+	ifeq ($(shell test -d /usr/lib/i386-linux-gnu && echo 0),0)
+		LIBDIR = lib/i386-linux-gnu
+	endif
+    else
+	#
+	# Ubuntu.
+	#
+	ifeq ($(shell test -d /usr/lib/x86_64-linux-gnu && echo 0),0)
+		LIBDIR = lib/x86_64-linux-gnu
+	endif
+
+	#
+	# Rhel/SLES
+	#
+	ifeq ($(shell test -d /usr/lib64 && echo 0),0)
+		LIBDIR = lib64
+	endif
+    endif
+endif
+
+#
+# The default C compiler (cc) is undefined with MinGW
+#
+ifneq ($(findstring MINGW,$(UNAME)),)
+    CC = gcc
+endif 
+
+OBJS = directive.o eval.o expand.o main.o mbchar.o support.o system.o
+
+$(LIBDIR)/libmcpp.a: $(OBJS)
+	-mkdir -p $(LIBDIR)
+	ar rcs $(LIBDIR)/libmcpp.a $(OBJS)
+	ranlib $(LIBDIR)/libmcpp.a
+
+clean:
+	rm -f $(OBJS)
+	rm -rf $(LIBDIR)
+

data/ext/ice/mcpp/Makefile.mak

@@ -0,0 +1,46 @@
+# **********************************************************************
+#
+# Copyright (c) 2015 ZeroC, Inc. All rights reserved.
+#
+# **********************************************************************
+
+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\  $<
+
+{.\}.c{Release}.obj::
+	$(CC) /MD /O2 /DNDEBUG /c /FoRelease\ $<
+
+all: targets mcpp.lib mcppd.lib
+
+targets:
+	if not exist Debug mkdir Debug
+	if not exist Release mkdir Release
+
+mcpp.lib: $(RELEASE_OBJS)
+	lib /nologo /out:mcpp.lib $(RELEASE_OBJS)
+
+mcppd.lib: $(DEBUG_OBJS)
+	lib /nologo /out:mcppd.lib $(DEBUG_OBJS)
+
+clean:
+	del /q $(RELEASE_OBJS)
+	del /q $(DEBUG_OBJS)
+	del /q mcpp.lib
+	del /q mcppd.lib
+

data/ext/ice/mcpp/README.md

@@ -0,0 +1,30 @@
+# mcpp
+
+This is a fork of [mcpp](http://mcpp.sourceforge.net/). mcpp is a C/C++ preprocessor used by the [Ice](https://github.com/zeroc-ice/ice) Slice compilers.
+
+This fork consists of a simplified version of mcpp 2.7.2 plus various fixes, tailored to the Slice compilers requirements. Its build system creates only a static library and no command-line preprocessor. The configure script was replaced by a custom `config.h` suitable for Windows, OS X and Linux builds. Tests and other optional files were removed.
+
+The resulting static library is later used when creating the [Ice](https://github.com/zeroc-ice/ice) Slice shared library or statically-linked Slice compilers such as `slice2js`.
+
+## Build Instructions
+
+### Linux, OS X and Windows with MinGW
+Simply type:
+```
+  make
+```  
+
+This creates a static library `libmcpp.a`. Depending on your platform, the library is created in the following directory:
+
+* `lib/i386-linux-gnu` - Ubuntu 32-bit
+* `lib/x86_64-linux-gnu` - Ubuntu 64-bit
+* `lib64` - Any Linux system with a `/usr/lib64` directory
+* `lib` - OS X, Windows with MinGW, and other platforms
+
+### Windows with Visual Studio
+
+Open a Visual Studio Command Prompt, and type:
+```
+  nmake -f Makefile.mak
+```
+This creates two static libraries: `mcpp.lib`, built with `/MD` ("release") and `mcppd.lib`, built with `/MDd` ("debug").