diff options
49 files changed, 115 insertions, 237 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index b4b846e6c4e..4928997da11 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -108,11 +108,15 @@ bindir = $(top_srcdir)\bin libdir = $(top_srcdir)\lib headerdir = $(top_srcdir)\include +!if "$(WINRT)" == "yes" +includedir = $(SDK_INCLUDE_PATH) +!else !if "$(ice_src_dist)" != "" includedir = $(top_srcdir)\include !else includedir = $(ice_dir)\include !endif +!endif install_libdir = $(prefix)\lib$(x64suffix) install_includedir = $(prefix)\include diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index aebacad6896..5137a6011ba 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -145,6 +145,12 @@ LDFLAGS = $(LDFLAGS) /debug /incremental:no LD_DLLFLAGS = $(LDFLAGS) /dll LD_EXEFLAGS = $(LDFLAGS) +!if "$(WINRT)" != "yes" +LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) +!else +LD_TESTFLAGS = $(LD_DLLFLAGS) +!endif + # # With MSVC, we link automatically all Ice libraries using pragma comment # diff --git a/cpp/include/Glacier2/Config.h b/cpp/include/Glacier2/Config.h index 9f4efe2b040..b73c1530b5f 100644 --- a/cpp/include/Glacier2/Config.h +++ b/cpp/include/Glacier2/Config.h @@ -28,4 +28,14 @@ # endif #endif +#ifndef GLACIER2_API +# ifdef GLACIER2_API_EXPORTS +# define GLACIER2_API ICE_DECLSPEC_EXPORT +# elif defined(ICE_STATIC_LIBS) +# define GLACIER2_API /**/ +# else +# define GLACIER2_API ICE_DECLSPEC_IMPORT +# endif +#endif + #endif diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index b0446ccc0e4..09cf13ccfd5 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -59,10 +59,10 @@ public: virtual void __write(::IceInternal::BasicStream*) const; virtual void __read(::IceInternal::BasicStream*); - + virtual void __write(const OutputStreamPtr&) const; virtual void __read(const InputStreamPtr&); - + virtual bool __usesClasses() const; protected: diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h index 205c19c1f8c..929b13bc25f 100644 --- a/cpp/include/Ice/GCObject.h +++ b/cpp/include/Ice/GCObject.h @@ -11,6 +11,7 @@ #define ICE_GC_OBJECT_H #include <Ice/Object.h> +#include <Ice/BasicStream.h> #include <IceUtil/MutexPtrLock.h> #include <IceUtil/Mutex.h> diff --git a/cpp/src/Glacier2Lib/winrt/Makefile.mak b/cpp/src/Glacier2Lib/winrt/Makefile.mak index 8a25fd9a085..19d3dcbb95d 100644 --- a/cpp/src/Glacier2Lib/winrt/Makefile.mak +++ b/cpp/src/Glacier2Lib/winrt/Makefile.mak @@ -43,11 +43,11 @@ SLICE_SRCS = Glacier2\Metrics.ice \ Glacier2\SSLInfo.ice PDBNAME = $(LIBNAME:.lib=.pdb) -CPPFLAGS = /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS -DWIN32_LEAN_AND_MEAN +CPPFLAGS = /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DICE_BUILDING_GLACIER2 -DWIN32_LEAN_AND_MEAN !include $(top_srcdir)\config\Make.rules.mak -SLICE2CPPFLAGS = --ice --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS) +SLICE2CPPFLAGS = --ice --include-dir Glacier2 $(SLICE2CPPFLAGS) $(LIBNAME): $(OBJS) $(HDIR)\PermissionsVerifierF.h $(HDIR)\RouterF.h sdks $(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME) diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp index 0240a81ec6c..c3c882488a5 100644 --- a/cpp/src/Ice/Buffer.cpp +++ b/cpp/src/Ice/Buffer.cpp @@ -9,6 +9,7 @@ #include <Ice/Buffer.h> #include <Ice/LocalException.h> +#include <Ice/BasicStream.h> using namespace std; using namespace Ice; @@ -18,7 +19,7 @@ void IceInternal::Buffer::swapBuffer(Buffer& other) { b.swap(other.b); - std::swap(i, other.i); + std::swap(i, other.i); } IceInternal::Buffer::Container::Container() : @@ -87,7 +88,7 @@ IceInternal::Buffer::Container::reserve(size_type n) { return; } - + pointer p = reinterpret_cast<pointer>(::realloc(_buf, _capacity)); if(!p) { diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index df41372bd82..8a6cd4c6701 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -11,6 +11,7 @@ #define ICE_ENDPOINT_I_H #include <Ice/EndpointIF.h> +#include <Ice/BasicStream.h> #include <Ice/Endpoint.h> #include <Ice/EndpointTypes.h> #include <Ice/TransceiverF.h> diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp index f3e87785a59..26868805206 100644 --- a/cpp/src/Ice/LoggerI.cpp +++ b/cpp/src/Ice/LoggerI.cpp @@ -18,6 +18,7 @@ #endif #include <Ice/LocalException.h> +#include <Ice/BasicStream.h> using namespace std; using namespace Ice; @@ -48,7 +49,7 @@ Init init; } -Ice::LoggerI::LoggerI(const string& prefix, const string& file, +Ice::LoggerI::LoggerI(const string& prefix, const string& file, bool convert, const IceUtil::StringConverterPtr& converter) : _prefix(prefix), _convert(convert), @@ -153,7 +154,7 @@ Ice::LoggerI::write(const string& message, bool indent) #elif defined(_WIN32) // // Convert the message from the native narrow string encoding to the console - // code page encoding for printing. If the _convert member is set to false + // code page encoding for printing. If the _convert member is set to false // we don't do any conversion. // if(!_convert) @@ -172,11 +173,11 @@ Ice::LoggerI::write(const string& message, bool indent) { // Convert message to UTF-8 string u8s = IceUtil::nativeToUTF8(s, _converter); - + // Then from UTF-8 to console CP string consoleString; _consoleConverter->fromUTF8(reinterpret_cast<const Byte*>(u8s.data()), - reinterpret_cast<const Byte*>(u8s.data() + u8s.size()), + reinterpret_cast<const Byte*>(u8s.data() + u8s.size()), consoleString); // We cannot use cerr here as writing to console using cerr diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp index 2627bd29196..4f9c11bc695 100644 --- a/cpp/src/Ice/ObjectFactoryManager.cpp +++ b/cpp/src/Ice/ObjectFactoryManager.cpp @@ -12,6 +12,7 @@ #include <Ice/ObjectFactory.h> #include <Ice/Functional.h> #include <Ice/LocalException.h> +#include <Ice/BasicStream.h> using namespace std; using namespace Ice; @@ -42,7 +43,7 @@ IceInternal::ObjectFactoryManager::remove(const string& id) ObjectFactoryPtr factory = 0; { IceUtil::Mutex::Lock sync(*this); - + FactoryMap::iterator p = _factoryMap.end(); if(_factoryMapHint != _factoryMap.end()) { @@ -51,7 +52,7 @@ IceInternal::ObjectFactoryManager::remove(const string& id) p = _factoryMapHint; } } - + if(p == _factoryMap.end()) { p = _factoryMap.find(id); @@ -64,9 +65,9 @@ IceInternal::ObjectFactoryManager::remove(const string& id) } } assert(p != _factoryMap.end()); - + factory = p->second; - + if(p == _factoryMapHint) { _factoryMap.erase(p++); @@ -77,7 +78,7 @@ IceInternal::ObjectFactoryManager::remove(const string& id) _factoryMap.erase(p); } } - + // // Destroy outside the lock // @@ -89,7 +90,7 @@ ObjectFactoryPtr IceInternal::ObjectFactoryManager::find(const string& id) const { IceUtil::Mutex::Lock sync(*this); - + FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap); FactoryMap::iterator p = factoryMap.end(); @@ -100,12 +101,12 @@ IceInternal::ObjectFactoryManager::find(const string& id) const p = _factoryMapHint; } } - + if(p == factoryMap.end()) { p = factoryMap.find(id); } - + if(p != factoryMap.end()) { _factoryMapHint = p; diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp index 341e82497c3..8816e68fb4c 100644 --- a/cpp/src/Ice/Protocol.cpp +++ b/cpp/src/Ice/Protocol.cpp @@ -9,13 +9,14 @@ #include <Ice/Protocol.h> #include <Ice/LocalException.h> +#include <Ice/BasicStream.h> namespace IceInternal { const Ice::Byte magic[] = { 0x49, 0x63, 0x65, 0x50 }; // 'I', 'c', 'e', 'P' -const Ice::Byte requestHdr[] = +const Ice::Byte requestHdr[] = { magic[0], magic[1], @@ -47,7 +48,7 @@ const Ice::Byte requestBatchHdr[] = 0, 0, 0, 0 // Number of requests in batch (placeholder) }; -const Ice::Byte replyHdr[] = +const Ice::Byte replyHdr[] = { magic[0], magic[1], @@ -81,7 +82,7 @@ stringToMajorMinor(const std::string& str, Ice::Byte& major, Ice::Byte& minor) ex.str = "invalid major version value `" + str + "'"; throw ex; } - + std::istringstream minStr(str.substr(pos + 1, std::string::npos)); Ice::Int minVersion; if(!(minStr >> minVersion) || !minStr.eof()) @@ -97,12 +98,12 @@ stringToMajorMinor(const std::string& str, Ice::Byte& major, Ice::Byte& minor) ex.str = "range error in version `" + str + "'"; throw ex; } - + major = static_cast<Ice::Byte>(majVersion); minor = static_cast<Ice::Byte>(minVersion); } -void +void throwUnsupportedProtocolException(const char* f, int l, const Ice::ProtocolVersion& v, const Ice::ProtocolVersion& s) { throw Ice::UnsupportedProtocolException(f, l, "", v, s); @@ -126,7 +127,7 @@ const ProtocolVersion currentProtocol = { IceInternal::protocolMajor, IceInterna // The encoding to use for protocol messages, this version is tied to // the protocol version. // -const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor, +const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor, IceInternal::protocolEncodingMinor }; const ProtocolVersion Protocol_1_0 = { 1, 0 }; diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h index 80492d252fb..c82080526c0 100644 --- a/cpp/src/Ice/ResponseHandler.h +++ b/cpp/src/Ice/ResponseHandler.h @@ -15,6 +15,7 @@ #include <Ice/Config.h> #include <Ice/LocalException.h> +#include <Ice/BasicStream.h> #include <Ice/ResponseHandlerF.h> namespace IceInternal @@ -25,9 +26,9 @@ class BasicStream; class ResponseHandler : virtual public ::IceUtil::Shared { public: - + virtual ~ResponseHandler(); - + virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0; virtual void sendNoResponse() = 0; virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0; diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak index 18652ff0975..ddaf9c87dc8 100644 --- a/cpp/src/Ice/winrt/Makefile.mak +++ b/cpp/src/Ice/winrt/Makefile.mak @@ -213,10 +213,9 @@ HDIR = $(headerdir)\Ice SDIR = $(slicedir)\Ice PDBNAME = $(LIBNAME:.lib=.pdb) -CPPFLAGS = /Fd$(PDBNAME) -I. -I..\.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --ice $(SLICE2CPPFLAGS) -CORE_SLICE2CPPFLAGS = --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS) -SSL_SLICE2CPPFLAGS = --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS) +CPPFLAGS = /Fd$(PDBNAME) -I. -I..\.. -DICE_BUILDING_ICE -DICE_BUILDING_ICESSL -DWIN32_LEAN_AND_MEAN $(CPPFLAGS) +CORE_SLICE2CPPFLAGS = --ice --include-dir Ice $(SLICE2CPPFLAGS) +SSL_SLICE2CPPFLAGS = --ice --include-dir IceSSL $(SLICE2CPPFLAGS) !include $(top_srcdir)\config\Make.rules.mak @@ -238,7 +237,7 @@ $(LIBNAME): $(LOCAL_OBJS) $(OBJS) sdks @if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG) $(CXX) /c /Fo$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) $< -.cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj:: +.cpp{$(ARCH)\$(CONFIG)\IceDiscovery\}.obj:: @if not exist "$(ARCH)\$(CONFIG)\IceDiscovery" mkdir $(ARCH)\$(CONFIG)\IceDiscovery $(CXX) /c /Fo$(ARCH)\$(CONFIG)\IceDiscovery\ $(CPPFLAGS) $(CXXFLAGS) $< diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h index d3f9f1bbe66..a275081964e 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.h +++ b/cpp/src/Ice/winrt/StreamEndpointI.h @@ -20,7 +20,7 @@ namespace IceInternal { -class StreamEndpointI : public IPEndpointI, WSEndpointDelegate +class StreamEndpointI : public IPEndpointI, public WSEndpointDelegate { public: diff --git a/cpp/src/IceGridLib/winrt/Makefile.mak b/cpp/src/IceGridLib/winrt/Makefile.mak index fa91cbb6d5f..c3cb21b7e40 100644 --- a/cpp/src/IceGridLib/winrt/Makefile.mak +++ b/cpp/src/IceGridLib/winrt/Makefile.mak @@ -47,8 +47,8 @@ HDIR = $(headerdir)\IceGrid SDIR = $(slicedir)\IceGrid PDBNAME = $(LIBNAME:.lib=.pdb) -CPPFLAGS = /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API +CPPFLAGS = /Fd$(PDBNAME) -I..\.. $(CPPFLAGS) -DICE_BUILDING_ICEGRID -DWIN32_LEAN_AND_MEAN +SLICE2CPPFLAGS = --checksum --ice --include-dir IceGrid !include $(top_srcdir)\config\Make.rules.mak diff --git a/cpp/src/IceStormLib/winrt/Makefile.mak b/cpp/src/IceStormLib/winrt/Makefile.mak index 8f4bfce5c45..450cd665b41 100644 --- a/cpp/src/IceStormLib/winrt/Makefile.mak +++ b/cpp/src/IceStormLib/winrt/Makefile.mak @@ -31,9 +31,9 @@ HDIR = $(headerdir)\IceStorm SDIR = $(slicedir)\IceStorm PDBNAME = $(LIBNAME:.lib=.pdb) -CPPFLAGS = /Fd$(PDBNAME) -I..\.. -DWIN32_LEAN_AND_MEAN +CPPFLAGS = /Fd$(PDBNAME) -I..\.. -DICE_BUILDING_ICESTORM -DWIN32_LEAN_AND_MEAN ICECPPFLAGS = -I.. -SLICE2CPPFLAGS = --ice --include-dir IceStorm --checksum --dll-export ICE_STORM_LIB_API +SLICE2CPPFLAGS = --ice --include-dir IceStorm --checksum !include $(top_srcdir)\config\Make.rules.mak diff --git a/cpp/src/IceUtil/winrt/Makefile.mak b/cpp/src/IceUtil/winrt/Makefile.mak index c99e4150b08..b5d082c714e 100644 --- a/cpp/src/IceUtil/winrt/Makefile.mak +++ b/cpp/src/IceUtil/winrt/Makefile.mak @@ -45,7 +45,7 @@ SRCS = $(SRCS:Retail\=..\) SRCS = $(SRCS:Debug\=..\) PDBNAME = $(LIBNAME:.lib=.pdb) -CPPFLAGS = /Fd$(PDBNAME) $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I..\..\ -DWIN32_LEAN_AND_MEAN +CPPFLAGS = /Fd$(PDBNAME) $(CPPFLAGS) -I..\..\ -DICE_BUILDING_ICEUTIL -DWIN32_LEAN_AND_MEAN !include $(top_srcdir)/config/Make.rules.mak diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak index 5d3f4cc1f81..2c8af56621f 100644 --- a/cpp/src/Makefile.mak +++ b/cpp/src/Makefile.mak @@ -12,11 +12,13 @@ top_srcdir = .. !include $(top_srcdir)/config/Make.rules.mak !if "$(WINRT)" == "yes" -SUBDIRS = IceUtil\winrt \ +SUBDIRS = IceUtil Slice slice2cpp +SUBDIRS_WINRT = IceUtil\winrt \ Ice\winrt \ Glacier2Lib\winrt \ IceStormLib\winrt \ IceGridLib\winrt + !elseif "$(CPP_COMPILER)" == "VC100" SUBDIRS = IceUtil \ Slice \ @@ -56,8 +58,20 @@ SUBDIRS = IceUtil \ iceserviceinstall !endif +!if "$(WINRT)" == "yes" +$(EVERYTHING):: + @for %i in ( $(SUBDIRS) ) do \ + @if exist %i \ + @echo "making $@ in %i" && \ + cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak WINRT=no $@" || exit 1 + @for %i in ( $(SUBDIRS_WINRT) ) do \ + @if exist %i \ + @echo "making $@ in %i" && \ + cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +!else $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ @if exist %i \ @echo "making $@ in %i" && \ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1 +!endif
\ No newline at end of file diff --git a/cpp/test/Ice/acm/Makefile.mak b/cpp/test/Ice/acm/Makefile.mak index ea59c0cb7ee..bb61b7d31d6 100644 --- a/cpp/test/Ice/acm/Makefile.mak +++ b/cpp/test/Ice/acm/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -41,12 +41,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mak b/cpp/test/Ice/adapterDeactivation/Makefile.mak index df7dae45ad5..857b6651742 100644 --- a/cpp/test/Ice/adapterDeactivation/Makefile.mak +++ b/cpp/test/Ice/adapterDeactivation/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -50,12 +50,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/admin/Makefile.mak b/cpp/test/Ice/admin/Makefile.mak index bd66034e73e..88a53965a1d 100644 --- a/cpp/test/Ice/admin/Makefile.mak +++ b/cpp/test/Ice/admin/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -41,12 +41,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/ami/Makefile.mak b/cpp/test/Ice/ami/Makefile.mak index 73a3afa68cc..a339f0448b8 100644 --- a/cpp/test/Ice/ami/Makefile.mak +++ b/cpp/test/Ice/ami/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -48,12 +48,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/binding/Makefile.mak b/cpp/test/Ice/binding/Makefile.mak index 5fba0077d30..f707af46233 100644 --- a/cpp/test/Ice/binding/Makefile.mak +++ b/cpp/test/Ice/binding/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -41,12 +41,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/dispatcher/Makefile.mak b/cpp/test/Ice/dispatcher/Makefile.mak index 8bbff9e8a24..c0a168cc955 100644 --- a/cpp/test/Ice/dispatcher/Makefile.mak +++ b/cpp/test/Ice/dispatcher/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -51,12 +51,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/echo/Makefile.mak b/cpp/test/Ice/echo/Makefile.mak index 3eb52cf3e9b..62fd0a8d8af 100644 --- a/cpp/test/Ice/echo/Makefile.mak +++ b/cpp/test/Ice/echo/Makefile.mak @@ -33,12 +33,6 @@ OBJS = $(SLICE_OBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/enums/Makefile.mak b/cpp/test/Ice/enums/Makefile.mak index 7743f1cacb0..4aa1215b93e 100644 --- a/cpp/test/Ice/enums/Makefile.mak +++ b/cpp/test/Ice/enums/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -42,12 +42,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN SLICE2CPPFLAGS = $(SLICE2CPPFLAGS) -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/exceptions/Makefile.mak b/cpp/test/Ice/exceptions/Makefile.mak index 55f21a606e1..8563430ee96 100644 --- a/cpp/test/Ice/exceptions/Makefile.mak +++ b/cpp/test/Ice/exceptions/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -59,12 +59,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb @@ -77,7 +71,7 @@ $(CLIENT)$(EXT): $(COBJS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest -$(SERVER)$(EXT): $(SOBJS) +$(SERVER)$(EXT): $(SOBJS) $(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) @if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \ $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest diff --git a/cpp/test/Ice/facets/Makefile.mak b/cpp/test/Ice/facets/Makefile.mak index fe89af3f0c4..0805d11b3f1 100644 --- a/cpp/test/Ice/facets/Makefile.mak +++ b/cpp/test/Ice/facets/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -48,12 +48,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/hash/Makefile.mak b/cpp/test/Ice/hash/Makefile.mak index db5d7465c5f..c2ac497d4b1 100644 --- a/cpp/test/Ice/hash/Makefile.mak +++ b/cpp/test/Ice/hash/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -33,12 +33,6 @@ OBJS = $(SLICE_OBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb !endif diff --git a/cpp/test/Ice/hold/Makefile.mak b/cpp/test/Ice/hold/Makefile.mak index 98b0dd2d9ba..b81fedd766e 100644 --- a/cpp/test/Ice/hold/Makefile.mak +++ b/cpp/test/Ice/hold/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -41,12 +41,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp index f8094effbae..d671ac9b17c 100644 --- a/cpp/test/Ice/info/AllTests.cpp +++ b/cpp/test/Ice/info/AllTests.cpp @@ -165,8 +165,10 @@ allTests(const Ice::CommunicatorPtr& communicator) test(info->remoteAddress == defaultHost); test(info->localAddress == defaultHost); } +#if !defined(ICE_OS_WINRT) test(info->rcvSize >= 1024); test(info->sndSize >= 2048); +#endif ostringstream os; @@ -225,8 +227,11 @@ allTests(const Ice::CommunicatorPtr& communicator) test(info->remoteAddress == defaultHost); test(info->localAddress == defaultHost); } + +#if !defined(ICE_OS_WINRT) test(info->rcvSize >= 2048); test(info->sndSize >= 1024); +#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/inheritance/Makefile.mak b/cpp/test/Ice/inheritance/Makefile.mak index 057669a74a6..41ea2c5ae6f 100644 --- a/cpp/test/Ice/inheritance/Makefile.mak +++ b/cpp/test/Ice/inheritance/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -48,12 +48,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/invoke/Makefile.mak b/cpp/test/Ice/invoke/Makefile.mak index 6cc9a727f99..5bf3b7259cf 100644 --- a/cpp/test/Ice/invoke/Makefile.mak +++ b/cpp/test/Ice/invoke/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -41,12 +41,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/location/Makefile.mak b/cpp/test/Ice/location/Makefile.mak index aa5d42f8825..603afa95de0 100644 --- a/cpp/test/Ice/location/Makefile.mak +++ b/cpp/test/Ice/location/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -42,12 +42,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/metrics/Makefile.mak b/cpp/test/Ice/metrics/Makefile.mak index 55a5444faac..d8191a77f67 100644 --- a/cpp/test/Ice/metrics/Makefile.mak +++ b/cpp/test/Ice/metrics/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -54,12 +54,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/networkProxy/Makefile.mak b/cpp/test/Ice/networkProxy/Makefile.mak index 84d5fe0d360..9d8192c9b1e 100644 --- a/cpp/test/Ice/networkProxy/Makefile.mak +++ b/cpp/test/Ice/networkProxy/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -40,12 +40,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/objects/Makefile.mak b/cpp/test/Ice/objects/Makefile.mak index 57d1eaddae0..ac5d261ddb5 100644 --- a/cpp/test/Ice/objects/Makefile.mak +++ b/cpp/test/Ice/objects/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -49,12 +49,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/operations/Makefile.mak b/cpp/test/Ice/operations/Makefile.mak index 50c16e47503..d4d9038ca2f 100644 --- a/cpp/test/Ice/operations/Makefile.mak +++ b/cpp/test/Ice/operations/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -66,12 +66,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 -bigobj -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/optional/Makefile.mak b/cpp/test/Ice/optional/Makefile.mak index a937b36fcd2..52326987214 100644 --- a/cpp/test/Ice/optional/Makefile.mak +++ b/cpp/test/Ice/optional/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -48,12 +48,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/plugin/Makefile.mak b/cpp/test/Ice/plugin/Makefile.mak index 5a3c45e909b..2902e3193fb 100644 --- a/cpp/test/Ice/plugin/Makefile.mak +++ b/cpp/test/Ice/plugin/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -42,16 +42,10 @@ CPDBFLAGS = /pdb:$(CLIENT).pdb PPDBFLAGS = /pdb:$(DLLNAME:.dll=.pdb) !endif -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - LINKWITH = $(LIBS) $(PLUGINDIR)\$(LIBNAME): $(PLUGINDIR)\$(DLLNAME) - + $(PLUGINDIR)\$(DLLNAME): $(POBJS) $(LINK) $(LD_DLLFLAGS) $(PDBFLAGS) $(POBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH) @if exist $(PLUGINDIR)\$(DLLNAME:.dll=.lib) move $(PLUGINDIR)\$(DLLNAME:.dll=.lib) $(PLUGINDIR)\$(LIBNAME) diff --git a/cpp/test/Ice/proxy/Makefile.mak b/cpp/test/Ice/proxy/Makefile.mak index 8654b9907d9..c08163168a4 100644 --- a/cpp/test/Ice/proxy/Makefile.mak +++ b/cpp/test/Ice/proxy/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -54,12 +54,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/retry/Makefile.mak b/cpp/test/Ice/retry/Makefile.mak index e0845dfb7ec..be45955bcc3 100644 --- a/cpp/test/Ice/retry/Makefile.mak +++ b/cpp/test/Ice/retry/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -50,12 +50,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/servantLocator/Makefile.mak b/cpp/test/Ice/servantLocator/Makefile.mak index 7bfe23b8176..9b2eb564aaa 100644 --- a/cpp/test/Ice/servantLocator/Makefile.mak +++ b/cpp/test/Ice/servantLocator/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -57,12 +57,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/stream/Makefile.mak b/cpp/test/Ice/stream/Makefile.mak index 5440106f74f..e48a05aeeca 100644 --- a/cpp/test/Ice/stream/Makefile.mak +++ b/cpp/test/Ice/stream/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -30,15 +30,9 @@ OBJS = $(SLICE_OBJS) \ !include $(top_srcdir)/config/Make.rules.mak -SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS) +SLICE2CPPFLAGS = --stream $(SLICE2CPPFLAGS) CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb !endif diff --git a/cpp/test/Ice/timeout/Makefile.mak b/cpp/test/Ice/timeout/Makefile.mak index 43a069068a9..ed6be9201ec 100644 --- a/cpp/test/Ice/timeout/Makefile.mak +++ b/cpp/test/Ice/timeout/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -42,12 +42,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/Ice/udp/Makefile.mak b/cpp/test/Ice/udp/Makefile.mak index 613878325b9..1238dbc9226 100644 --- a/cpp/test/Ice/udp/Makefile.mak +++ b/cpp/test/Ice/udp/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe OBJDIR = . !else @@ -41,12 +41,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/IceDiscovery/simple/Makefile.mak b/cpp/test/IceDiscovery/simple/Makefile.mak index 6e9e1393ec2..1137e6fc404 100644 --- a/cpp/test/IceDiscovery/simple/Makefile.mak +++ b/cpp/test/IceDiscovery/simple/Makefile.mak @@ -10,7 +10,7 @@ top_srcdir = ..\..\.. !if "$(WINRT)" != "yes" -NAME_PREFIX = +NAME_PREFIX = EXT = .exe !else NAME_PREFIX = Ice_udp_ @@ -39,12 +39,6 @@ OBJS = $(COBJS) \ CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(WINRT)" != "yes" -LD_TESTFLAGS = $(LD_EXEFLAGS) $(SETARGV) -!else -LD_TESTFLAGS = $(LD_DLLFLAGS) /export:dllMain -!endif - !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb SPDBFLAGS = /pdb:$(SERVER).pdb diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp index 06de796e188..9527430c197 100644 --- a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp +++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp @@ -952,7 +952,7 @@ TestSuite::MainPage::selectedProtocol() std::string TestSuite::MainPage::selectedLanguage() { - static const char* languages[] = {"winrt", "cpp", "cs", "java"}; + static const char* languages[] = {"winrt", "cpp", "csharp", "java"}; assert(_language->SelectedIndex < sizeof(languages) / sizeof(const char*)); return languages[_language->SelectedIndex]; } diff --git a/scripts/TestController.py b/scripts/TestController.py index cb6597b4948..d56900f7ff7 100644 --- a/scripts/TestController.py +++ b/scripts/TestController.py @@ -61,6 +61,7 @@ def signal_handler(signal, frame): p.terminate() sys.exit(0) signal.signal(signal.SIGINT, signal_handler) +signal.signal(signal.SIGTERM, signal_handler) if TestUtil.isDarwin(): # |