summaryrefslogtreecommitdiff
path: root/cpp/demo/IceGrid
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/IceGrid')
-rw-r--r--cpp/demo/IceGrid/allocate/Client.cpp6
-rw-r--r--cpp/demo/IceGrid/allocate/IceGrid.allocate.client.dsp24
-rw-r--r--cpp/demo/IceGrid/allocate/IceGrid.allocate.server.dsp24
-rw-r--r--cpp/demo/IceGrid/icebox/IceGrid.icebox.client.dsp24
-rw-r--r--cpp/demo/IceGrid/icebox/IceGrid.icebox.server.dsp24
-rw-r--r--cpp/demo/IceGrid/replication/IceGrid.replication.client.dsp24
-rw-r--r--cpp/demo/IceGrid/replication/IceGrid.replication.server.dsp24
-rw-r--r--cpp/demo/IceGrid/secure/Client.cpp3
-rw-r--r--cpp/demo/IceGrid/secure/IceGrid.secure.client.dsp24
-rw-r--r--cpp/demo/IceGrid/secure/IceGrid.secure.server.dsp24
-rwxr-xr-xcpp/demo/IceGrid/secure/expect.py2
-rwxr-xr-xcpp/demo/IceGrid/secure/makecerts.py18
-rw-r--r--cpp/demo/IceGrid/sessionActivation/Client.cpp5
-rw-r--r--cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.dsp24
-rw-r--r--cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.dsp24
-rw-r--r--cpp/demo/IceGrid/simple/Client.cpp3
-rw-r--r--cpp/demo/IceGrid/simple/IceGrid.simple.client.dsp24
-rw-r--r--cpp/demo/IceGrid/simple/IceGrid.simple.server.dsp24
18 files changed, 173 insertions, 152 deletions
diff --git a/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp
index 0de09584229..7bd1f562fbc 100644
--- a/cpp/demo/IceGrid/allocate/Client.cpp
+++ b/cpp/demo/IceGrid/allocate/Client.cpp
@@ -132,6 +132,9 @@ HelloClient::run(int argc, char* argv[])
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
session = registry->createSession(id, password);
break;
}
@@ -155,6 +158,9 @@ HelloClient::run(int argc, char* argv[])
HelloPrx hello;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
hello = HelloPrx::checkedCast(session->allocateObjectById(communicator()->stringToIdentity("hello")));
}
catch(const IceGrid::ObjectNotRegisteredException&)
diff --git a/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.dsp b/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.dsp
index d0d8884a05a..50e9e1d9b44 100644
--- a/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.dsp
+++ b/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.allocate.client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.allocate.client.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.allocate.client - Win32 Debug
+CFG=IceGrid.allocate.client.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.allocate.client - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.allocate.client.mak" CFG="IceGrid.allocate.client - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.allocate.client.mak" CFG="IceGrid.allocate.client.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.allocate.client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.allocate.client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.allocate.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.allocate.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.allocate.client - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.allocate.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.allocate.client.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.allocate.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.allocate.client.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.allocate.client - Win32 Release"
-# Name "IceGrid.allocate.client - Win32 Debug"
+# Name "IceGrid.allocate.client.exe - Win32 Release"
+# Name "IceGrid.allocate.client.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -113,7 +113,7 @@ SOURCE=.\Hello.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.allocate.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.allocate.client.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -129,7 +129,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.allocate.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.allocate.client.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.dsp b/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.dsp
index c37fa6f7f7c..1d297db5346 100644
--- a/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.dsp
+++ b/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.allocate.server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.allocate.server.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.allocate.server - Win32 Debug
+CFG=IceGrid.allocate.server.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.allocate.server - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.allocate.server.mak" CFG="IceGrid.allocate.server - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.allocate.server.mak" CFG="IceGrid.allocate.server.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.allocate.server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.allocate.server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.allocate.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.allocate.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.allocate.server - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.allocate.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.allocate.server.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.allocate.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.allocate.server.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.allocate.server - Win32 Release"
-# Name "IceGrid.allocate.server - Win32 Debug"
+# Name "IceGrid.allocate.server.exe - Win32 Release"
+# Name "IceGrid.allocate.server.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\HelloI.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.allocate.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.allocate.server.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.allocate.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.allocate.server.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.dsp b/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.dsp
index 5490c120423..f2dae391abb 100644
--- a/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.dsp
+++ b/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.icebox.client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.icebox.client.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.icebox.client - Win32 Debug
+CFG=IceGrid.icebox.client.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.icebox.client - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.icebox.client.mak" CFG="IceGrid.icebox.client - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.icebox.client.mak" CFG="IceGrid.icebox.client.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.icebox.client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.icebox.client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.icebox.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.icebox.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.icebox.client - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.icebox.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.icebox.client.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.icebox.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.icebox.client.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.icebox.client - Win32 Release"
-# Name "IceGrid.icebox.client - Win32 Debug"
+# Name "IceGrid.icebox.client.exe - Win32 Release"
+# Name "IceGrid.icebox.client.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -113,7 +113,7 @@ SOURCE=.\Hello.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.icebox.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.icebox.client.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -129,7 +129,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.icebox.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.icebox.client.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.dsp b/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.dsp
index 5a8703f1d68..26ee1855764 100644
--- a/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.dsp
+++ b/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.icebox.server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.icebox.server.dll" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=IceGrid.icebox.server - Win32 Debug
+CFG=IceGrid.icebox.server.dll - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.icebox.server - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.icebox.server.mak" CFG="IceGrid.icebox.server - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.icebox.server.mak" CFG="IceGrid.icebox.server.dll - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.icebox.server - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "IceGrid.icebox.server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "IceGrid.icebox.server.dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "IceGrid.icebox.server.dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.icebox.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.icebox.server.dll - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 IceBox.lib Ice.lib IceUtil.lib setargv.obj /nologo /dll /pdb:none /machine:I386 /out:"helloservice.dll" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 IceBox.lib Ice.lib IceUtil.lib setargv.obj /nologo /dll /pdb:none /machine:I386 /out:"helloservice.dll" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
-!ELSEIF "$(CFG)" == "IceGrid.icebox.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.icebox.server.dll - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -93,8 +93,8 @@ PostBuild_Cmds=copy $(OutDir)\helloserviced.* .
# Begin Target
-# Name "IceGrid.icebox.server - Win32 Release"
-# Name "IceGrid.icebox.server - Win32 Debug"
+# Name "IceGrid.icebox.server.dll - Win32 Release"
+# Name "IceGrid.icebox.server.dll - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -126,7 +126,7 @@ SOURCE=.\Hello.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.icebox.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.icebox.server.dll - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -142,7 +142,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.icebox.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.icebox.server.dll - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/replication/IceGrid.replication.client.dsp b/cpp/demo/IceGrid/replication/IceGrid.replication.client.dsp
index de1869db605..d70e69ac397 100644
--- a/cpp/demo/IceGrid/replication/IceGrid.replication.client.dsp
+++ b/cpp/demo/IceGrid/replication/IceGrid.replication.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.replication.client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.replication.client.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.replication.client - Win32 Debug
+CFG=IceGrid.replication.client.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.replication.client - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.replication.client.mak" CFG="IceGrid.replication.client - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.replication.client.mak" CFG="IceGrid.replication.client.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.replication.client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.replication.client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.replication.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.replication.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.replication.client - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.replication.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.replication.client.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.replication.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.replication.client.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.replication.client - Win32 Release"
-# Name "IceGrid.replication.client - Win32 Debug"
+# Name "IceGrid.replication.client.exe - Win32 Release"
+# Name "IceGrid.replication.client.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -113,7 +113,7 @@ SOURCE=.\Hello.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.replication.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.replication.client.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -129,7 +129,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.replication.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.replication.client.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/replication/IceGrid.replication.server.dsp b/cpp/demo/IceGrid/replication/IceGrid.replication.server.dsp
index 9d577db6570..239af160c99 100644
--- a/cpp/demo/IceGrid/replication/IceGrid.replication.server.dsp
+++ b/cpp/demo/IceGrid/replication/IceGrid.replication.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.replication.server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.replication.server.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.replication.server - Win32 Debug
+CFG=IceGrid.replication.server.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.replication.server - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.replication.server.mak" CFG="IceGrid.replication.server - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.replication.server.mak" CFG="IceGrid.replication.server.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.replication.server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.replication.server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.replication.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.replication.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.replication.server - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.replication.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.replication.server.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.replication.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.replication.server.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.replication.server - Win32 Release"
-# Name "IceGrid.replication.server - Win32 Debug"
+# Name "IceGrid.replication.server.exe - Win32 Release"
+# Name "IceGrid.replication.server.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\HelloI.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.replication.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.replication.server.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.replication.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.replication.server.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/secure/Client.cpp b/cpp/demo/IceGrid/secure/Client.cpp
index 450b7bf773a..871f0f08a65 100644
--- a/cpp/demo/IceGrid/secure/Client.cpp
+++ b/cpp/demo/IceGrid/secure/Client.cpp
@@ -59,6 +59,9 @@ HelloClient::run(int argc, char* argv[])
HelloPrx hello;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
hello = HelloPrx::checkedCast(communicator()->stringToProxy("hello"));
}
catch(const Ice::NotRegisteredException&)
diff --git a/cpp/demo/IceGrid/secure/IceGrid.secure.client.dsp b/cpp/demo/IceGrid/secure/IceGrid.secure.client.dsp
index b423b6cde07..24a82627c50 100644
--- a/cpp/demo/IceGrid/secure/IceGrid.secure.client.dsp
+++ b/cpp/demo/IceGrid/secure/IceGrid.secure.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.secure.client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.secure.client.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.secure.client - Win32 Debug
+CFG=IceGrid.secure.client.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.secure.client - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.secure.client.mak" CFG="IceGrid.secure.client - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.secure.client.mak" CFG="IceGrid.secure.client.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.secure.client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.secure.client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.secure.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.secure.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.secure.client - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.secure.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.secure.client.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.secure.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.secure.client.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.secure.client - Win32 Release"
-# Name "IceGrid.secure.client - Win32 Debug"
+# Name "IceGrid.secure.client.exe - Win32 Release"
+# Name "IceGrid.secure.client.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -113,7 +113,7 @@ SOURCE=.\Hello.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.secure.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.secure.client.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -129,7 +129,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.secure.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.secure.client.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/secure/IceGrid.secure.server.dsp b/cpp/demo/IceGrid/secure/IceGrid.secure.server.dsp
index a685044122d..b9f9f47b69a 100644
--- a/cpp/demo/IceGrid/secure/IceGrid.secure.server.dsp
+++ b/cpp/demo/IceGrid/secure/IceGrid.secure.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.secure.server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.secure.server.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.secure.server - Win32 Debug
+CFG=IceGrid.secure.server.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.secure.server - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.secure.server.mak" CFG="IceGrid.secure.server - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.secure.server.mak" CFG="IceGrid.secure.server.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.secure.server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.secure.server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.secure.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.secure.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.secure.server - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.secure.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.secure.server.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.secure.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.secure.server.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.secure.server - Win32 Release"
-# Name "IceGrid.secure.server - Win32 Debug"
+# Name "IceGrid.secure.server.exe - Win32 Release"
+# Name "IceGrid.secure.server.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\HelloI.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.secure.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.secure.server.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.secure.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.secure.server.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py
index da66cbcb03c..c81348de4b0 100755
--- a/cpp/demo/IceGrid/secure/expect.py
+++ b/cpp/demo/IceGrid/secure/expect.py
@@ -36,7 +36,7 @@ else:
print "creating certificates...",
sys.stdout.flush()
-makecerts = Util.spawn('python -u makecerts.py')
+makecerts = Util.spawn('python -u makecerts.py --iceca=' + os.path.join(Util.getIceDir("cpp"), "bin", "iceca"))
makecerts.expect("Do you want to keep this as the CA subject name?")
makecerts.sendline("y")
makecerts.expect("Enter the email address of the CA:")
diff --git a/cpp/demo/IceGrid/secure/makecerts.py b/cpp/demo/IceGrid/secure/makecerts.py
index 5af14affc19..428934e38f1 100755
--- a/cpp/demo/IceGrid/secure/makecerts.py
+++ b/cpp/demo/IceGrid/secure/makecerts.py
@@ -10,22 +10,28 @@
import os, sys, shutil, glob
-def iceca(args):
+iceca = "iceca"
+
+def runIceca(args):
os.environ['PYTHONUNBUFFERED'] = '1'
- if os.system("iceca " + args):
+ if os.system(iceca + " " + args):
sys.exit(1)
def createCertificate(filename, cn):
print "======= Creating " + filename + " certificate ======="
- iceca("request --no-password --overwrite %s \"%s\"" % (filename, cn))
- iceca("sign --in %s_req.pem --out %s_cert.pem" % (filename, filename))
+ runIceca("request --no-password --overwrite %s \"%s\"" % (filename, cn))
+ runIceca("sign --in %s_req.pem --out %s_cert.pem" % (filename, filename))
os.remove("%s_req.pem" % filename)
print
print
+for x in sys.argv[1:]:
+ if x[0:7] == "--iceca":
+ iceca = x[8:]
+
cwd = os.getcwd()
if not os.path.exists("certs") or os.path.basename(cwd) != "secure":
@@ -40,7 +46,7 @@ os.chdir("certs")
# First, create the certificate authority.
#
print "======= Creating Certificate Authority ======="
-iceca("init --overwrite --no-password")
+runIceca("init --overwrite --no-password")
print
print
@@ -56,6 +62,6 @@ try:
except OSError:
pass
-iceca("import --key-pass password --store-pass password --java ca_cert ca/db/ca_cert.pem ca/db/ca_key.pem certs.jks")
+runIceca("import --key-pass password --store-pass password --java ca_cert ca/db/ca_cert.pem ca/db/ca_key.pem certs.jks")
os.chdir("..")
diff --git a/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp
index 0307a9e38d3..f93a811864e 100644
--- a/cpp/demo/IceGrid/sessionActivation/Client.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp
@@ -130,7 +130,10 @@ HelloClient::run(int argc, char* argv[])
password = trim(password);
try
- {
+ {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
session = registry->createSession(id, password);
break;
}
diff --git a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.dsp b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.dsp
index f3661a1899c..fc7b6c7b04b 100644
--- a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.dsp
+++ b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.sessionActivation.client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.sessionActivation.client.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.sessionActivation.client - Win32 Debug
+CFG=IceGrid.sessionActivation.client.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.sessionActivation.client - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.sessionActivation.client.mak" CFG="IceGrid.sessionActivation.client - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.sessionActivation.client.mak" CFG="IceGrid.sessionActivation.client.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.sessionActivation.client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.sessionActivation.client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.sessionActivation.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.sessionActivation.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.sessionActivation.client - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.sessionActivation.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.sessionActivation.client.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.client.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.sessionActivation.client - Win32 Release"
-# Name "IceGrid.sessionActivation.client - Win32 Debug"
+# Name "IceGrid.sessionActivation.client.exe - Win32 Release"
+# Name "IceGrid.sessionActivation.client.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -113,7 +113,7 @@ SOURCE=.\Hello.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.sessionActivation.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.sessionActivation.client.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -129,7 +129,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.client.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.dsp b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.dsp
index a2bb0e6cf37..4b8c0234989 100644
--- a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.dsp
+++ b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.sessionActivation.server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.sessionActivation.server.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.sessionActivation.server - Win32 Debug
+CFG=IceGrid.sessionActivation.server.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.sessionActivation.server - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.sessionActivation.server.mak" CFG="IceGrid.sessionActivation.server - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.sessionActivation.server.mak" CFG="IceGrid.sessionActivation.server.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.sessionActivation.server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.sessionActivation.server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.sessionActivation.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.sessionActivation.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.sessionActivation.server - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.sessionActivation.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.sessionActivation.server.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.server.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.sessionActivation.server - Win32 Release"
-# Name "IceGrid.sessionActivation.server - Win32 Debug"
+# Name "IceGrid.sessionActivation.server.exe - Win32 Release"
+# Name "IceGrid.sessionActivation.server.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\HelloI.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.sessionActivation.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.sessionActivation.server.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.sessionActivation.server.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp
index 450b7bf773a..871f0f08a65 100644
--- a/cpp/demo/IceGrid/simple/Client.cpp
+++ b/cpp/demo/IceGrid/simple/Client.cpp
@@ -59,6 +59,9 @@ HelloClient::run(int argc, char* argv[])
HelloPrx hello;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
hello = HelloPrx::checkedCast(communicator()->stringToProxy("hello"));
}
catch(const Ice::NotRegisteredException&)
diff --git a/cpp/demo/IceGrid/simple/IceGrid.simple.client.dsp b/cpp/demo/IceGrid/simple/IceGrid.simple.client.dsp
index a39088df407..d3eb62bdcf6 100644
--- a/cpp/demo/IceGrid/simple/IceGrid.simple.client.dsp
+++ b/cpp/demo/IceGrid/simple/IceGrid.simple.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.simple.client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.simple.client.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.simple.client - Win32 Debug
+CFG=IceGrid.simple.client.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.simple.client - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.simple.client.mak" CFG="IceGrid.simple.client - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.simple.client.mak" CFG="IceGrid.simple.client.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.simple.client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.simple.client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.simple.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.simple.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.simple.client - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.simple.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.simple.client.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib IceGrid.lib Glacier2.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.simple.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.simple.client.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.simple.client - Win32 Release"
-# Name "IceGrid.simple.client - Win32 Debug"
+# Name "IceGrid.simple.client.exe - Win32 Release"
+# Name "IceGrid.simple.client.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -113,7 +113,7 @@ SOURCE=.\Hello.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.simple.client - Win32 Release"
+!IF "$(CFG)" == "IceGrid.simple.client.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -129,7 +129,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.simple.client - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.simple.client.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
diff --git a/cpp/demo/IceGrid/simple/IceGrid.simple.server.dsp b/cpp/demo/IceGrid/simple/IceGrid.simple.server.dsp
index d79ef24da58..d5e866f0f0b 100644
--- a/cpp/demo/IceGrid/simple/IceGrid.simple.server.dsp
+++ b/cpp/demo/IceGrid/simple/IceGrid.simple.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="IceGrid.simple.server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="IceGrid.simple.server.exe" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
-CFG=IceGrid.simple.server - Win32 Debug
+CFG=IceGrid.simple.server.exe - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,12 @@ CFG=IceGrid.simple.server - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "IceGrid.simple.server.mak" CFG="IceGrid.simple.server - Win32 Debug"
+!MESSAGE NMAKE /f "IceGrid.simple.server.mak" CFG="IceGrid.simple.server.exe - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "IceGrid.simple.server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "IceGrid.simple.server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.simple.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "IceGrid.simple.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -28,7 +28,7 @@ CFG=IceGrid.simple.server - Win32 Debug
CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "IceGrid.simple.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.simple.server.exe - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -51,10 +51,10 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no
+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089
# SUBTRACT LINK32 /debug /nodefaultlib
-!ELSEIF "$(CFG)" == "IceGrid.simple.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.simple.server.exe - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -84,8 +84,8 @@ LINK32=link.exe
# Begin Target
-# Name "IceGrid.simple.server - Win32 Release"
-# Name "IceGrid.simple.server - Win32 Debug"
+# Name "IceGrid.simple.server.exe - Win32 Release"
+# Name "IceGrid.simple.server.exe - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=.\HelloI.h
SOURCE=.\Hello.ice
-!IF "$(CFG)" == "IceGrid.simple.server - Win32 Release"
+!IF "$(CFG)" == "IceGrid.simple.server.exe - Win32 Release"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib"
# Begin Custom Build
@@ -137,7 +137,7 @@ BuildCmds= \
$(BuildCmds)
# End Custom Build
-!ELSEIF "$(CFG)" == "IceGrid.simple.server - Win32 Debug"
+!ELSEIF "$(CFG)" == "IceGrid.simple.server.exe - Win32 Debug"
USERDEP__HELLO="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\sliced.lib"
# Begin Custom Build
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 23:23:15 +0000