From 62cba8cd46a535585a4422daab489f114feab6f3 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 26 Feb 2016 20:46:27 +0100 Subject: Windows msbuild build updates --- cpp/test/IceStorm/rep1/.depend.mak | 483 --------------------- cpp/test/IceStorm/rep1/Makefile.mak | 76 ---- .../rep1/msbuild/publisher/publisher.vcxproj | 268 ++++++++++++ .../msbuild/publisher/publisher.vcxproj.filters | 135 ++++++ cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj | 308 +++++++++++++ .../IceStorm/rep1/msbuild/sub/sub.vcxproj.filters | 135 ++++++ .../rep1/msbuild/subscriber/subscriber.vcxproj | 308 +++++++++++++ .../msbuild/subscriber/subscriber.vcxproj.filters | 135 ++++++ cpp/test/IceStorm/rep1/run.py | 6 +- 9 files changed, 1292 insertions(+), 562 deletions(-) delete mode 100755 cpp/test/IceStorm/rep1/.depend.mak delete mode 100644 cpp/test/IceStorm/rep1/Makefile.mak create mode 100644 cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj create mode 100644 cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters create mode 100644 cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj create mode 100644 cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters create mode 100644 cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj create mode 100644 cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters (limited to 'cpp/test/IceStorm/rep1') diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak deleted file mode 100755 index 83abfdb477e..00000000000 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ /dev/null @@ -1,483 +0,0 @@ - -Single.h: \ - Single.ice - -Single.obj: \ - Single.cpp \ - "Single.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.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\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\InputStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\OutputStream.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - -Publisher.obj: \ - Publisher.cpp \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\Comparable.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\InputStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\OutputStream.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.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\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Ice\InterfaceByValue.h" \ - "$(includedir)\IceUtil\Options.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceStorm\IceStorm.h" \ - "$(includedir)\IceStorm\Metrics.h" \ - "$(includedir)\IceStorm\Config.h" \ - "Single.h" \ - -Subscriber.obj: \ - Subscriber.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\Options.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Comparable.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\InputStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\OutputStream.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Ice\InterfaceByValue.h" \ - "$(includedir)\IceStorm\IceStorm.h" \ - "$(includedir)\IceStorm\Metrics.h" \ - "$(includedir)\IceStorm\Config.h" \ - "Single.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - -Sub.obj: \ - Sub.cpp \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\MutexPtrLock.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\ScopedArray.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\IceUtil\Options.h" \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Comparable.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(includedir)\Ice\StreamHelpers.h" \ - "$(includedir)\IceUtil\Iterator.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\InputStream.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\GCObject.h" \ - "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Incoming.h" \ - "$(includedir)\Ice\ServantLocatorF.h" \ - "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\OutputStream.h" \ - "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\RouterF.h" \ - "$(includedir)\Ice\LocatorF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\Service.h" \ - "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Ice\InterfaceByValue.h" \ - "$(includedir)\IceStorm\IceStorm.h" \ - "$(includedir)\IceStorm\Metrics.h" \ - "$(includedir)\IceStorm\Config.h" \ - "Single.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceStorm/rep1/Makefile.mak b/cpp/test/IceStorm/rep1/Makefile.mak deleted file mode 100644 index 90449719f6b..00000000000 --- a/cpp/test/IceStorm/rep1/Makefile.mak +++ /dev/null @@ -1,76 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ..\..\.. - -PUBLISHER = publisher.exe -SUBSCRIBER = subscriber.exe -SUB = sub.exe - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(SUB) - -SLICE_OBJS = .\Single.obj - -POBJS = $(SLICE_OBJS) \ - .\Publisher.obj - -SOBJS = $(SLICE_OBJS) \ - .\Subscriber.obj - -SUB_OBJS = $(SLICE_OBJS) \ - .\Sub.obj - -OBJS = $(POBJS) \ - $(SOBJS) \ - $(SUB_OBJS) - -!include $(top_srcdir)/config/Make.rules.mak - -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -LIBS = $(LIBS) - -!if "$(GENERATE_PDB)" == "yes" -PPDBFLAGS = /pdb:$(PUBLISHER:.exe=.pdb) -SPDBFLAGS = /pdb:$(SUBSCRIBER:.exe=.pdb) -SUB_PDBFLAGS = /pdb:$(SUB:.exe=.pdb) -!endif - -$(PUBLISHER): $(POBJS) - $(LINK) $(LD_EXEFLAGS) $(PPDBFLAGS) $(SETARGV) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUBSCRIBER): $(SOBJS) - $(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -$(SUB): $(SUB_OBJS) - $(LINK) $(LD_EXEFLAGS) $(SUB_PDBFLAGS) $(SETARGV) $(SUB_OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) - @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ - $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest - -!if "$(OPTIMIZE)" == "yes" - -all:: - @echo release > build.txt - -!else - -all:: - @echo debug > build.txt - -!endif - -clean:: - del /q build.txt - del /q Single.cpp Single.h - -for %f in (0.db\*) do if not %f == 0.db\.gitignore del /q %f - -for %f in (1.db\*) do if not %f == 1.db\.gitignore del /q %f - -for %f in (2.db\*) do if not %f == 2.db\.gitignore del /q %f diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj new file mode 100644 index 00000000000..e4c8855c4e1 --- /dev/null +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj @@ -0,0 +1,268 @@ + + + + + Cpp11-Debug + Win32 + + + Cpp11-Debug + x64 + + + Cpp11-Release + Win32 + + + Cpp11-Release + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + + {58B8CF53-AC7C-4FE5-ABA1-A356034BFE10} + 8.1 + + + + Application + true + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters new file mode 100644 index 00000000000..9567ad3b292 --- /dev/null +++ b/cpp/test/IceStorm/rep1/msbuild/publisher/publisher.vcxproj.filters @@ -0,0 +1,135 @@ + + + + + {eb21b4cc-0165-4547-ab93-eb53227601da} + + + {a3318928-b0e7-40be-9d26-7f2534a5bd21} + + + {68d51317-9f28-448f-b442-7eadaae5dfea} + ice + + + {5e3e509d-7c85-47d8-8c96-56ef328e0b6c} + + + {056169a6-2448-489e-8998-01154b1bf5bd} + + + {e848af66-a93e-4d5a-9252-278383d4daec} + + + {66c4185b-4ded-4575-9f53-869fd17c3ae1} + + + {e2532ebb-ae5d-472a-8684-6cbf4a8cea82} + + + {6e07d96c-9164-4144-aa43-4d3b0f51d5cf} + + + {3289c952-876f-4c60-8225-e88269209c9e} + + + {3c6a1c5e-11f4-493a-a52c-6f52304b2373} + + + {7ccd28c5-d4d5-4ab3-b06c-d8af357f7c6a} + + + {600e93e6-a1c0-48f0-bb15-03552cec073e} + + + {094c3a93-bb89-4580-8bb6-6eda733d0482} + + + {941f6ebb-9e33-4278-9322-51d5370c256d} + + + {ce71f2f6-e774-43b6-bad9-18e2e033c000} + + + {ec20c4a3-4be8-41e5-90d6-e2c95f99837b} + + + {cd2523fa-2b60-45de-b7a0-8aa08c84e805} + + + {dc6dddf8-4540-4a00-acf8-dfe31339b9fc} + + + {3b32a6df-0ccf-4d3e-9bca-23575011b80b} + + + {0b74d819-0120-460f-b133-4da7cc4f2604} + + + {8d5855ab-9174-4418-bc51-c1bba1e0fb71} + + + {b76f9801-8ca6-4b11-a54b-5e7426f76e8c} + + + + + Source Files + + + Source Files\x64\Cpp11-Debug + + + Source Files\Win32\Cpp11-Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Debug + + + Source Files\x64\Release + + + Source Files\Win32\Release + + + Source Files\x64\Cpp11-Release + + + Source Files\Win32\Cpp11-Release + + + + + Slice Files + + + + + Header Files\x64\Cpp11-Debug + + + Header Files\Win32\Cpp11-Debug + + + Header Files\x64\Debug + + + Header Files\Win32\Debug + + + Header Files\x64\Release + + + Header Files\Win32\Release + + + Header Files\x64\Cpp11-Release + + + Header Files\Win32\Cpp11-Release + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj new file mode 100644 index 00000000000..851bab04eeb --- /dev/null +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj @@ -0,0 +1,308 @@ + + + + + Cpp11-Debug + Win32 + + + Cpp11-Debug + x64 + + + Cpp11-Release + Win32 + + + Cpp11-Release + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + + {E6690528-7BB9-4B8E-8F15-4F3C58A736B9} + 8.1 + + + + Application + true + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters new file mode 100644 index 00000000000..8d00acfb0f6 --- /dev/null +++ b/cpp/test/IceStorm/rep1/msbuild/sub/sub.vcxproj.filters @@ -0,0 +1,135 @@ + + + + + {409a34f6-9f61-480a-9f10-a686ef88ef60} + + + {1cffa223-1a85-4efb-b0df-16af7e1eab33} + + + {12bc849c-47b4-475f-9abb-fa36d67ba838} + ice + + + {4dbf6356-2de1-4e9f-a56d-6667c326c62e} + + + {35e928a4-5665-4f1b-8da5-a39567342714} + + + {20d8e2eb-a904-4bce-90f1-657dcdf74fe2} + + + {339562cc-4616-4d9c-bfe0-feebeca73691} + + + {d5a20464-b4ef-4004-86cb-cd6ca67a0860} + + + {e0b95a1e-70ba-4806-a022-1db09596b4ef} + + + {6e7256f7-99fd-4adb-b048-c5fbbb44cf4c} + + + {883379e4-1aa3-4d83-b466-d90c78c3bb8c} + + + {45c6bd5b-8304-4847-97d2-9f81fcc0c112} + + + {e79d4e07-1164-40df-a278-d2ce0143f56c} + + + {97416190-720d-4b42-b0b9-cbe59fb5d229} + + + {2f353ce0-ad22-465d-b4a6-f1cecb7a0a25} + + + {ea9aac59-5d2a-40bb-aac4-7899b9a47069} + + + {63f8ed92-6494-43b3-827c-37a13249fda3} + + + {bd328f0e-2012-49e1-a988-5db2ef8ba68e} + + + {11b1c0a1-ae41-4406-890f-2d9714806766} + + + {11ddd459-1a66-464f-857d-26006b7bed99} + + + {d997c511-8dc9-4afd-b60b-b81ab2355aa3} + + + {41f144c9-3262-4db5-9bfc-a825ec1529b8} + + + {6f04a895-545d-49c3-a5ce-3689b24f09a7} + + + + + Slice Files + + + + + Source Files\x64\Cpp11-Debug + + + Source Files\Win32\Cpp11-Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Debug + + + Source Files\x64\Release + + + Source Files\Win32\Release + + + Source Files\x64\Cpp11-Release + + + Source Files\Win32\Cpp11-Release + + + Source Files + + + + + Header Files\x64\Cpp11-Debug + + + Header Files\Win32\Cpp11-Debug + + + Header Files\x64\Debug + + + Header Files\Win32\Debug + + + Header Files\x64\Release + + + Header Files\Win32\Release + + + Header Files\x64\Cpp11-Release + + + Header Files\Win32\Cpp11-Release + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj new file mode 100644 index 00000000000..5f1ed7fb929 --- /dev/null +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj @@ -0,0 +1,308 @@ + + + + + Cpp11-Debug + Win32 + + + Cpp11-Debug + x64 + + + Cpp11-Release + Win32 + + + Cpp11-Release + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + true + true + true + true + true + true + true + + + + {CB22725D-1669-4945-83D3-81CA767F0B56} + 8.1 + + + + Application + true + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + true + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + Application + false + $(DefaultPlatformToolset) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + ..\..\;%(AdditionalIncludeDirectories) + + + + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters new file mode 100644 index 00000000000..62909bb6b5e --- /dev/null +++ b/cpp/test/IceStorm/rep1/msbuild/subscriber/subscriber.vcxproj.filters @@ -0,0 +1,135 @@ + + + + + {4d6c3ce5-e90f-4c35-a2f9-ebbed5fefc34} + + + {0aff4890-bc55-4092-9fb4-c2425a6095d8} + ice + + + {23882027-8fc1-422c-bda9-51ac44426661} + + + {bbb40dc1-510f-40d7-afc8-198ffc519ba5} + + + {3046ece7-30dc-4ab4-a3ad-ba1f5b5521b4} + + + {2525a6bb-a426-48e5-8712-b9e4b0cb1186} + + + {de82a11f-61aa-40d7-a6ff-254217305949} + + + {e2d7e0bd-6472-49f4-932d-51c06d80aa76} + + + {9284536c-1fd6-44e1-b27a-6f47b805186d} + + + {862ee641-44d0-447e-8141-4c1da2313b59} + + + {0227d9ca-1d51-4ea1-812d-856bd980ce65} + + + {9613d7d3-1c6b-4d93-8648-950d0e636eae} + + + {94c5f13a-801b-4ddc-9dd8-ea2e3ddcf541} + + + {cb0b02b1-175d-49bf-88b3-bab92ba67164} + + + {d925ccf9-db67-445e-9047-f511a08d47ac} + + + {c8b71781-e3fd-4b34-a5e4-6c83342a053b} + + + {59caeaeb-5525-4339-a441-3fcfa88093ca} + + + {1cc88a0e-2332-4aed-9488-69b3a600be78} + + + {5540ce37-2815-474e-ba48-a9bd11482bed} + + + {5abe2893-4aa1-4bc2-967b-c0dee15b0bc3} + + + {a29e7c50-4f3a-4328-8fa6-c9da8a99ed05} + + + {cf08cdeb-a728-4df8-bdcc-3ffdf928f32e} + + + {49658f34-2321-4da5-ac8c-e60171cb95c5} + + + + + Source Files + + + Source Files\x64\Cpp11-Debug + + + Source Files\Win32\Cpp11-Debug + + + Source Files\x64\Debug + + + Source Files\Win32\Debug + + + Source Files\x64\Release + + + Source Files\Win32\Release + + + Source Files\x64\Cpp11-Release + + + Source Files\Win32\Cpp11-Release + + + + + Slice Files + + + + + Header Files\x64\Cpp11-Debug + + + Header Files\Win32\Cpp11-Debug + + + Header Files\x64\Debug + + + Header Files\Win32\Debug + + + Header Files\x64\Release + + + Header Files\Win32\Release + + + Header Files\x64\Cpp11-Release + + + Header Files\Win32\Cpp11-Release + + + \ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py index dc4aad5223b..80e475b317d 100755 --- a/cpp/test/IceStorm/rep1/run.py +++ b/cpp/test/IceStorm/rep1/run.py @@ -20,9 +20,9 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil, IceStormUtil -publisher = os.path.join(os.getcwd(), "publisher") -subscriber = os.path.join(os.getcwd(), "subscriber") -subscriber2 = os.path.join(os.getcwd(), "sub") +publisher = os.path.join(os.getcwd(), TestUtil.getTestExecutable("publisher")) +subscriber = os.path.join(os.getcwd(), TestUtil.getTestExecutable("subscriber")) +subscriber2 = os.path.join(os.getcwd(), TestUtil.getTestExecutable("sub")) targets = [] if TestUtil.appverifier: -- cgit v1.2.3