summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rwxr-xr-xcpp/allDemos.py1
-rw-r--r--cpp/demo/Makefile3
-rw-r--r--cpp/demo/Makefile.mak3
-rw-r--r--cpp/demo/cookbook/Makefile21
-rw-r--r--cpp/demo/cookbook/Makefile.mak19
-rw-r--r--cpp/demo/cookbook/compression/.depend5
-rw-r--r--cpp/demo/cookbook/compression/.gitignore7
-rw-r--r--cpp/demo/cookbook/compression/Client.cpp193
-rw-r--r--cpp/demo/cookbook/compression/Compression.ice25
-rw-r--r--cpp/demo/cookbook/compression/Makefile49
-rw-r--r--cpp/demo/cookbook/compression/Makefile.mak49
-rw-r--r--cpp/demo/cookbook/compression/README16
-rw-r--r--cpp/demo/cookbook/compression/Server.cpp48
-rw-r--r--cpp/demo/cookbook/compression/config.client1
-rw-r--r--cpp/demo/cookbook/compression/config.server1
-rwxr-xr-xcpp/demo/cookbook/compression/cookbook.compression.client.vcproj488
-rwxr-xr-xcpp/demo/cookbook/compression/cookbook.compression.server.vcproj489
-rwxr-xr-xcpp/demo/cookbook/compression/expect.py35
-rwxr-xr-xcpp/demo/demo.sln7
19 files changed, 2 insertions, 1458 deletions
diff --git a/cpp/allDemos.py b/cpp/allDemos.py
index a5aaafba867..6b14cc46f71 100755
--- a/cpp/allDemos.py
+++ b/cpp/allDemos.py
@@ -64,7 +64,6 @@ demos = [
"book/simple_filesystem",
"book/printer",
"book/lifecycle",
- "cookbook/compression",
]
if not Util.isNoServices():
diff --git a/cpp/demo/Makefile b/cpp/demo/Makefile
index f5279049ab2..f3e4bd9ce42 100644
--- a/cpp/demo/Makefile
+++ b/cpp/demo/Makefile
@@ -18,8 +18,7 @@ SUBDIRS = IceUtil \
IceStorm \
Glacier2 \
IceGrid \
- book \
- cookbook
+ book
$(EVERYTHING)::
@for subdir in $(SUBDIRS); \
diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak
index 78eeaf03641..7087e49a975 100644
--- a/cpp/demo/Makefile.mak
+++ b/cpp/demo/Makefile.mak
@@ -13,8 +13,7 @@ top_srcdir = ..
SUBDIRS = IceUtil \
Ice \
- book \
- cookbook
+ book
!if "$(CPP_COMPILER)" != "VC60"
diff --git a/cpp/demo/cookbook/Makefile b/cpp/demo/cookbook/Makefile
deleted file mode 100644
index 98990d6dac7..00000000000
--- a/cpp/demo/cookbook/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2009 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 = ../..
-
-include $(top_srcdir)/config/Make.rules
-
-SUBDIRS = compression
-
-$(EVERYTHING)::
- @for subdir in $(SUBDIRS); \
- do \
- echo "making $@ in $$subdir"; \
- ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
- done
diff --git a/cpp/demo/cookbook/Makefile.mak b/cpp/demo/cookbook/Makefile.mak
deleted file mode 100644
index c1f5013028c..00000000000
--- a/cpp/demo/cookbook/Makefile.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2009 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 = ..\..
-
-!include $(top_srcdir)\config\Make.rules.mak
-
-SUBDIRS = compression
-
-$(EVERYTHING)::
- @for %i in ( $(SUBDIRS) ) do \
- @echo "making $@ in %i" && \
- cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
diff --git a/cpp/demo/cookbook/compression/.depend b/cpp/demo/cookbook/compression/.depend
deleted file mode 100644
index 52eedde1a5d..00000000000
--- a/cpp/demo/cookbook/compression/.depend
+++ /dev/null
@@ -1,5 +0,0 @@
-Compression$(OBJEXT): Compression.cpp Compression.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/ObjectFactory.h $(includedir)/IceUtil/Iterator.h
-Client$(OBJEXT): Client.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Compression.h
-Server$(OBJEXT): Server.cpp $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/Exception.h $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Proxy.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/IceUtil/StaticMutex.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h Compression.h
-Compression.cpp: Compression.ice
-Compression.ice: $(SLICE2CPP) $(SLICEPARSERLIB)
diff --git a/cpp/demo/cookbook/compression/.gitignore b/cpp/demo/cookbook/compression/.gitignore
deleted file mode 100644
index cfa926556c1..00000000000
--- a/cpp/demo/cookbook/compression/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by makegitignore.py
-
-// IMPORTANT: Do not edit this file -- any edits made here will be lost!
-client
-server
-Compression.cpp
-Compression.h
diff --git a/cpp/demo/cookbook/compression/Client.cpp b/cpp/demo/cookbook/compression/Client.cpp
deleted file mode 100644
index 54685ef45a5..00000000000
--- a/cpp/demo/cookbook/compression/Client.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2005 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.
-//
-// **********************************************************************
-
-#include <Ice/Ice.h>
-#include <Compression.h>
-#include <fstream>
-
-using namespace std;
-using namespace Compression;
-
-//
-// Implementation of the Ice::Stats interface.
-//
-class StatsI : public Ice::Stats
-{
-public:
-
- StatsI() : _total(0) {}
-
- virtual void bytesSent(const string&, Ice::Int sz)
- {
- _total += sz;
- }
-
- virtual void bytesReceived(const string&, Ice::Int)
- {
- }
-
- void reset()
- {
- _total = 0;
- }
-
- Ice::Int total() const
- {
- return _total;
- }
-
-private:
-
- Ice::Int _total;
-};
-typedef IceUtil::Handle<StatsI> StatsIPtr;
-
-class Client : public Ice::Application
-{
-public:
-
- Client() : _stats(new StatsI)
- {
- }
-
- Ice::StatsPtr stats() const
- {
- return _stats;
- }
-
- virtual int run(int, char*[]);
-
-private:
-
- StatsIPtr _stats;
-};
-
-int
-main(int argc, char* argv[])
-{
- Client app;
-
- Ice::InitializationData initData;
- initData.properties = Ice::createProperties();
- initData.properties->load("config.client");
- initData.stats = app.stats();
- return app.main(argc, argv, initData);
-}
-
-int
-Client::run(int argc, char* argv[])
-{
- if(argc == 1)
- {
- cerr << "Usage: " << argv[0] << " file" << endl;
- return 1;
- }
-
- //
- // Read the input file into a byte sequence.
- //
- ifstream in;
- in.open(argv[1], ios::binary);
- if(!in.good())
- {
- cerr << argv[0] << ": unable to open file `" << argv[1] << "'" << endl;
- return 1;
- }
-
- in.seekg(0, ios::end);
- ifstream::pos_type len = in.tellg();
- in.seekg(0, ios::beg);
-
- ByteSeq source;
- source.resize(len);
- in.read(reinterpret_cast<char*>(&source[0]), len);
-
- //
- // Create our proxies.
- //
- Ice::PropertiesPtr properties = communicator()->getProperties();
- const char* proxyProperty = "Compression.Proxy";
- std::string proxy = properties->getProperty(proxyProperty);
- if(proxy.empty())
- {
- cerr << argv[0] << ": property `" << proxyProperty << "' not set" << endl;
- return EXIT_FAILURE;
- }
-
- Ice::ObjectPrx base = communicator()->stringToProxy(proxy);
- ReceiverPrx uncompressed = ReceiverPrx::checkedCast(base->ice_compress(false));
- if(!uncompressed)
- {
- cerr << argv[0] << ": invalid proxy" << endl;
- return EXIT_FAILURE;
- }
- ReceiverPrx compressed = ReceiverPrx::uncheckedCast(base->ice_compress(true));
-
- const int repetitions = 10;
- int sz = 200;
-
- while(true)
- {
- cout << "time for " << sz << " bytes:" << endl;
-
- ByteSeq seq;
- seq.resize(sz);
- copy(source.begin(), source.begin() + sz, seq.begin());
-
- IceUtil::Time tm;
- int i;
-
- //
- // Measure uncompressed latency.
- //
- _stats->reset();
- tm = IceUtil::Time::now();
- for(i = 0; i < repetitions; ++i)
- {
- uncompressed->sendData(seq);
- }
- tm = IceUtil::Time::now() - tm;
- cout << " uncompressed = " << tm * 1000 / repetitions << "ms" << flush;
- Ice::Int uncompressedTotal = _stats->total();
-
- //
- // Measure compressed latency.
- //
- _stats->reset();
- tm = IceUtil::Time::now();
- for(i = 0; i < repetitions; ++i)
- {
- compressed->sendData(seq);
- }
- tm = IceUtil::Time::now() - tm;
- cout << "\tcompressed = " << tm * 1000 / repetitions << "ms" << flush;
- Ice::Int compressedTotal = _stats->total();
- cout << "\tcompression = " << compressedTotal * 100.0 / uncompressedTotal << "%" << endl;
-
- if(sz == len)
- {
- break;
- }
- else
- {
- //
- // ifstream::pos_type has not *= operator.
- //
- sz = sz * 10;
- if(sz > len)
- {
- sz = static_cast<int>(len);
- }
- }
- }
-
- cout << "done" << endl;
-
- return EXIT_SUCCESS;
-}
diff --git a/cpp/demo/cookbook/compression/Compression.ice b/cpp/demo/cookbook/compression/Compression.ice
deleted file mode 100644
index b87f8055d3f..00000000000
--- a/cpp/demo/cookbook/compression/Compression.ice
+++ /dev/null
@@ -1,25 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2005 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.
-//
-// **********************************************************************
-
-#ifndef COMPRESSION_ICE
-#define COMPRESSION_ICE
-
-module Compression
-{
-
-sequence<byte> ByteSeq;
-
-interface Receiver
-{
- void sendData(ByteSeq bytes);
-};
-
-};
-
-#endif
diff --git a/cpp/demo/cookbook/compression/Makefile b/cpp/demo/cookbook/compression/Makefile
deleted file mode 100644
index 566afabd6ce..00000000000
--- a/cpp/demo/cookbook/compression/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2009 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 = ../../..
-
-CLIENT = client
-SERVER = server
-
-TARGETS = $(CLIENT) $(SERVER)
-
-SLICE_SRCS = Compression.ice
-
-OBJS = Compression.o
-
-COBJS = Client.o
-
-SOBJS = Server.o
-
-SRCS = $(OBJS:.o=.cpp) \
- $(COBJS:.o=.cpp) \
- $(SOBJS:.o=.cpp)
-
-SLICE_GEN = $(SLICE_SRCS:.ice=.cpp) $(SLICE_SRCS:.ice=.h)
-
-include $(top_srcdir)/config/Make.rules
-
-CPPFLAGS := -I. $(CPPFLAGS)
-
-$(CLIENT): $(OBJS) $(COBJS)
- rm -f $@
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS)
-
-$(SERVER): $(OBJS) $(SOBJS)
- rm -f $@
- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS)
-
-$(SLICE_GEN): $(SLICE_SRCS) $(SLICE2CPP)
- rm -f $(SLICE_GEN)
- $(SLICE2CPP) $(SLICE_SRCS)
-
-test::
-
-include .depend
diff --git a/cpp/demo/cookbook/compression/Makefile.mak b/cpp/demo/cookbook/compression/Makefile.mak
deleted file mode 100644
index 5bed464ec6a..00000000000
--- a/cpp/demo/cookbook/compression/Makefile.mak
+++ /dev/null
@@ -1,49 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2009 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 = ..\..\..
-
-CLIENT = client.exe
-SERVER = server.exe
-
-TARGETS = $(CLIENT) $(SERVER)
-
-OBJS = Compression.obj
-
-COBJS = Client.obj
-
-SOBJS = Server.obj
-
-SRCS = $(OBJS:.obj=.cpp) \
- $(COBJS:.obj=.cpp) \
- $(SOBJS:.obj=.cpp)
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
-!endif
-
-$(CLIENT): $(OBJS) $(COBJS)
- $(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(OBJS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-$(SERVER): $(OBJS) $(SOBJS)
- $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(OBJS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
- @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
- $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-
-clean::
- del /q Compression.cpp Compression.h
-
-!include .depend
diff --git a/cpp/demo/cookbook/compression/README b/cpp/demo/cookbook/compression/README
deleted file mode 100644
index 77dd9e4da5d..00000000000
--- a/cpp/demo/cookbook/compression/README
+++ /dev/null
@@ -1,16 +0,0 @@
-The client and server in this directory can be used to evaluate the
-performance of protocol compression for various types of input data.
-
-To use the programs, start the server:
-
-$ ./server
-
-In a separate window, start the client and pass it the name of a
-file to send:
-
-$ ./client datafile
-
-The article uses The Autobiography of Benjamin Franklin as its input
-data. You can download the full text of that book here:
-
-http://etext.lib.virginia.edu/toc/modeng/public/Fra2Aut.html
diff --git a/cpp/demo/cookbook/compression/Server.cpp b/cpp/demo/cookbook/compression/Server.cpp
deleted file mode 100644
index 8c994dee21d..00000000000
--- a/cpp/demo/cookbook/compression/Server.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2005 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.
-//
-// **********************************************************************
-
-#include <Ice/Ice.h>
-#include <Compression.h>
-
-using namespace std;
-using namespace Compression;
-
-class ReceiverI : public Receiver
-{
-public:
-
- virtual void sendData(const ByteSeq&, const Ice::Current&)
- {
- }
-};
-
-class Server : public Ice::Application
-{
-public:
-
- virtual int run(int, char*[]);
-};
-
-int
-main(int argc, char* argv[])
-{
- Server app;
- return app.main(argc, argv, "config.server");
-}
-
-int
-Server::run(int argc, char* argv[])
-{
- Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("Compression");
- Ice::ObjectPtr object = new ReceiverI;
- adapter->add(object, communicator()->stringToIdentity("receiver"));
- adapter->activate();
- communicator()->waitForShutdown();
- return EXIT_SUCCESS;
-}
diff --git a/cpp/demo/cookbook/compression/config.client b/cpp/demo/cookbook/compression/config.client
deleted file mode 100644
index ccf4325d59c..00000000000
--- a/cpp/demo/cookbook/compression/config.client
+++ /dev/null
@@ -1 +0,0 @@
-Compression.Proxy=receiver:default -p 10000
diff --git a/cpp/demo/cookbook/compression/config.server b/cpp/demo/cookbook/compression/config.server
deleted file mode 100644
index 4302168fc3f..00000000000
--- a/cpp/demo/cookbook/compression/config.server
+++ /dev/null
@@ -1 +0,0 @@
-Compression.Endpoints=default -p 10000
diff --git a/cpp/demo/cookbook/compression/cookbook.compression.client.vcproj b/cpp/demo/cookbook/compression/cookbook.compression.client.vcproj
deleted file mode 100755
index 560b820d784..00000000000
--- a/cpp/demo/cookbook/compression/cookbook.compression.client.vcproj
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="cookbook.compression.client"
- ProjectGUID="{E2E57877-5DC6-4C07-A1C2-2B78005A2CBF}"
- RootNamespace="cookbook.compression.client"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/cookbook.compression.client.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="dummyinclude ; . ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Release/cookbook.compression.client.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO /IGNORE:4089"
- AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="client.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- ProgramDatabaseFile=".\Release/client.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Release/cookbook.compression.client.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/cookbook.compression.client.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Debug/cookbook.compression.client.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO"
- AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="client.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/client.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Debug/cookbook.compression.client.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\Release/cookbook.compression.client.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="dummyinclude ; . ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Release/cookbook.compression.client.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO /IGNORE:4089"
- AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="client.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- ProgramDatabaseFile=".\Release/client.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Release/cookbook.compression.client.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/cookbook.compression.client.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Debug/cookbook.compression.client.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO"
- AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="client.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/client.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Debug/cookbook.compression.client.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath="Client.cpp"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\Compression.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath=".\Compression.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- >
- <File
- RelativePath=".\Compression.ice"
- >
- </File>
- </Filter>
- <File
- RelativePath="README"
- >
- </File>
- </Files>
- <Globals>
- <Global
- Name="ZerocIce_ConsoleOutput"
- Value="True"
- />
- <Global
- Name="ZerocIce_Enabled"
- Value="True"
- />
- <Global
- Name="ZerocIce_Home"
- Value="..\..\..\.."
- />
- <Global
- Name="ZerocIce_HomeExpanded"
- Value="..\..\..\.."
- />
- </Globals>
-</VisualStudioProject>
diff --git a/cpp/demo/cookbook/compression/cookbook.compression.server.vcproj b/cpp/demo/cookbook/compression/cookbook.compression.server.vcproj
deleted file mode 100755
index ed982a2b476..00000000000
--- a/cpp/demo/cookbook/compression/cookbook.compression.server.vcproj
+++ /dev/null
@@ -1,489 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="cookbook.compression.server"
- ProjectGUID="{8A43ED0A-C9ED-4F92-983B-0FE97673F77D}"
- RootNamespace="cookbook.compression.server"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/cookbook.compression.server.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Release/cookbook.compression.server.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO /IGNORE:4089"
- AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="server.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- ProgramDatabaseFile=".\Release/server.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Release/cookbook.compression.server.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/cookbook.compression.server.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Debug/cookbook.compression.server.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO"
- AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="server.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/server.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Debug/cookbook.compression.server.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\Release/cookbook.compression.server.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
- StringPooling="true"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Release/cookbook.compression.server.pch"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO /IGNORE:4089"
- AdditionalDependencies="Ice.lib IceUtil.lib setargv.obj"
- OutputFile="server.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- ProgramDatabaseFile=".\Release/server.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Release/cookbook.compression.server.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
- TypeLibraryName=".\Debug/cookbook.compression.server.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=". ; ..\..\..\..\cpp\include"
- PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- RuntimeTypeInfo="true"
- PrecompiledHeaderFile=".\Debug/cookbook.compression.server.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- WarnAsError="true"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalOptions="/FIXED:NO"
- AdditionalDependencies="Iced.lib IceUtild.lib setargv.obj"
- OutputFile="server.exe"
- LinkIncremental="2"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\..\cpp\lib"
- GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/server.pdb"
- SubSystem="1"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- SuppressStartupBanner="true"
- OutputFile=".\Debug/cookbook.compression.server.bsc"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
- >
- <File
- RelativePath=".\Compression.cpp"
- >
- </File>
- <File
- RelativePath="Server.cpp"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|x64"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
- >
- <File
- RelativePath=".\Compression.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- <File
- RelativePath=".\Compression.ice"
- >
- </File>
- </Filter>
- <File
- RelativePath="README"
- >
- </File>
- </Files>
- <Globals>
- <Global
- Name="ZerocIce_ConsoleOutput"
- Value="True"
- />
- <Global
- Name="ZerocIce_Enabled"
- Value="True"
- />
- <Global
- Name="ZerocIce_Home"
- Value="..\..\..\.."
- />
- <Global
- Name="ZerocIce_HomeExpanded"
- Value="..\..\..\.."
- />
- </Globals>
-</VisualStudioProject>
diff --git a/cpp/demo/cookbook/compression/expect.py b/cpp/demo/cookbook/compression/expect.py
deleted file mode 100755
index f10620a2e46..00000000000
--- a/cpp/demo/cookbook/compression/expect.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2009 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.
-#
-# **********************************************************************
-
-import sys, os
-
-path = [ ".", "..", "../..", "../../..", "../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
- path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "demoscript")) ]
-if len(path) == 0:
- raise "can't find toplevel directory!"
-sys.path.append(path[0])
-
-from demoscript import *
-import signal
-
-server = Util.spawn('./server --Ice.PrintAdapterReady')
-server.expect('.* ready')
-
-print "testing...",
-sys.stdout.flush()
-client = Util.spawn('./client Compression.cpp')
-client.expect('done')
-client.waitTestSuccess()
-server.kill(signal.SIGINT)
-server.waitTestSuccess()
-print "ok"
diff --git a/cpp/demo/demo.sln b/cpp/demo/demo.sln
index 141ed3db91d..392f6da75dd 100755
--- a/cpp/demo/demo.sln
+++ b/cpp/demo/demo.sln
@@ -295,13 +295,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "book.simple_filesystem.clie
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "book.simple_filesystem.server", "book\simple_filesystem\book.simple_filesystem.server.vcproj", "{EFCFF55E-CCD2-451E-A0B5-604249ECE4D1}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cookbook.compression.client", "cookbook\compression\cookbook.compression.client.vcproj", "{E2E57877-5DC6-4C07-A1C2-2B78005A2CBF}"
- ProjectSection(ProjectDependencies) = postProject
- {8A43ED0A-C9ED-4F92-983B-0FE97673F77D} = {8A43ED0A-C9ED-4F92-983B-0FE97673F77D}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cookbook.compression.server", "cookbook\compression\cookbook.compression.server.vcproj", "{8A43ED0A-C9ED-4F92-983B-0FE97673F77D}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Ice.interleaved.client", "Ice\interleaved\Ice.interleaved.client.vcproj", "{798DC5EC-427F-49A6-9028-F2A420CCEA4B}"
ProjectSection(ProjectDependencies) = postProject
{383AB467-E29D-4A9D-A5D4-6BCA8E754A88} = {383AB467-E29D-4A9D-A5D4-6BCA8E754A88}