Borland C++Builder port mass commit

5 files changed, 84 insertions, 5 deletions

diff --git a/cpp/src/FreezeScript/DumpDB.cpp b/cpp/src/FreezeScript/DumpDB.cpp
index 135fb269c90..2076bb05676 100644
--- a/cpp/src/FreezeScript/DumpDB.cpp
+++ b/cpp/src/FreezeScript/DumpDB.cpp
@@ -136,7 +136,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     vector<string> args;
     try
     {
-        args = opts.parse(argc, argv);
+        args = opts.parse(argc, (const char**)argv);
     }
     catch(const IceUtil::Options::BadOpt& e)
     {
@@ -401,7 +401,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
                 for(vector<string>::iterator p = dbNames.begin(); p != dbNames.end(); ++p)
                 {
                     string name = *p;
-                    string facet = (name == "$default" ? "" : name);
+                    string facet = (name == "$default" ? string("") : name);
                     Db db(&dbEnv, 0);
                     db.open(txn, dbName.c_str(), name.c_str(), DB_BTREE, DB_RDONLY, FREEZE_SCRIPT_DB_MODE);
                     descriptor->dump(communicator, &db, txn, facet);
diff --git a/cpp/src/FreezeScript/Makefile.mak b/cpp/src/FreezeScript/Makefile.mak
new file mode 100644
index 00000000000..37f995965e1
--- /dev/null
+++ b/cpp/src/FreezeScript/Makefile.mak
@@ -0,0 +1,75 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2006 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.
+#
+# **********************************************************************
+
+top_srcdir	= ..\..
+
+TRANSFORMDB	= $(top_srcdir)\bin\transformdb.exe
+DUMPDB		= $(top_srcdir)\bin\dumpdb.exe
+
+TARGETS		= $(TRANSFORMDB) $(DUMPDB)
+
+COMMON_OBJS	= Grammar.o \
+		  Scanner.o \
+		  AssignVisitor.o \
+		  Data.o \
+		  Error.o \
+		  Functions.o \
+		  Exception.o \
+		  Parser.o \
+		  Print.o \
+		  Util.o
+
+TRANSFORM_OBJS	= TransformAnalyzer.o \
+		  TransformVisitor.o \
+		  Transformer.o \
+		  transformdb.o
+
+DUMP_OBJS	= DumpDescriptors.o \
+		  DumpDB.o
+
+SRCS		= $(COMMON_OBJS:.o=.cpp) $(TRANSFORM_OBJS:.o=.cpp) $(DUMP_OBJS:.o=.cpp)
+
+HDIR		= $(includedir)\FreezeScript
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+CPPFLAGS	= -I.. $(CPPFLAGS)
+LINKWITH	= slice$(LIBSUFFIX).lib icexml$(LIBSUFFIX).lib freeze$(LIBSUFFIX).lib $(LIBS) $(DB_LIBS)
+
+$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS)
+	del /q $@
+	$(LINK) $(LD_EXEFLAGS) $(TRANSFORM_OBJS) $(COMMON_OBJS), $@,, $(LINKWITH)
+
+$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS)
+	del /q $@
+	$(LINK) $(LD_EXEFLAGS) $(DUMP_OBJS) $(COMMON_OBJS), $@,, $(LINKWITH)
+
+Scanner.cpp : Scanner.l
+	flex $(FLEXFLAGS) Scanner.l
+	del /q $@
+	echo #include "IceUtil/Config.h" > Scanner.cpp
+	type lex.yy.c >> Scanner.cpp
+	del /q lex.yy.c
+
+Grammar.cpp Grammar.h: Grammar.y
+	del /q Grammar.h Grammar.cpp
+	bison -dvt --name-prefix "freeze_script_" Grammar.y
+	move Grammar.tab.c Grammar.cpp
+	move Grammar.tab.h Grammar.h
+	del /q Grammar.output
+
+clean::
+	del /q Grammar.cpp Grammar.h
+	del /q Scanner.cpp
+
+install:: all
+	copy $(TRANSFORMDB) $(install_bindir)
+	copy $(DUMPDB) $(install_bindir)
+
+!include .depend
diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp
index 6d8baccdf4e..7325f982995 100644
--- a/cpp/src/FreezeScript/Parser.cpp
+++ b/cpp/src/FreezeScript/Parser.cpp
@@ -137,7 +137,11 @@ FreezeScript::EvaluateException::ice_name() const
 void
 FreezeScript::EvaluateException::ice_print(ostream& out) const
 {
+#ifdef __BCPLUSPLUS__
+    Ice::Exception::ice_print(out);
+#else
     Exception::ice_print(out);
+#endif
     out << ":\nerror occurred while evaluating expression";
     if(!_reason.empty())
     {
diff --git a/cpp/src/FreezeScript/Print.cpp b/cpp/src/FreezeScript/Print.cpp
index 6c713046c79..c4ea1bd8007 100644
--- a/cpp/src/FreezeScript/Print.cpp
+++ b/cpp/src/FreezeScript/Print.cpp
@@ -97,7 +97,7 @@ void
 FreezeScript::PrintVisitor::visitProxy(const ProxyDataPtr& data)
 {
     string str = data->toString();
-    _out << typeToString(data->getType()) << '(' << (str.empty() ? "nil" : str) << ')';
+    _out << typeToString(data->getType()) << '(' << (str.empty() ? string("nil") : str) << ')';
 }
 
 void
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index cf38e463bf5..a3f6468529f 100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -152,7 +152,7 @@ transformDb(bool evictor,  const Ice::CommunicatorPtr& communicator,
 	    // Execute the transformation descriptors.
 	    //
 	    istringstream istr(descriptors);
-	    string facet = (name == "$default" ? "" : name);
+	    string facet = (name == "$default" ? string("") : name);
 	    FreezeScript::transformDatabase(communicator, objectFactory, oldUnit, newUnit, &db, dbNew, txnNew, 0,
 					    dbName, facet, purgeObjects, cerr, suppress, istr);
 	    
@@ -235,7 +235,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
     vector<string> args;
     try
     {
-        args = opts.parse(argc, argv);
+        args = opts.parse(argc, (const char**)argv);
     }
     catch(const IceUtil::Options::BadOpt& e)
     {