You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by rl...@apache.org on 2018/02/12 14:02:05 UTC
svn commit: r1823971 - in /xerces/c/trunk/src: ./ xercesc/util/
xercesc/util/MsgLoaders/Win32/
Author: rleigh
Date: Mon Feb 12 14:02:05 2018
New Revision: 1823971
URL: http://svn.apache.org/viewvc?rev=1823971&view=rev
Log:
Remove unused and broken Win32MsgLoader
Removed:
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Version.rc.cmake.in
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp
xerces/c/trunk/src/xercesc/util/MsgLoaders/Win32/resource.h
Modified:
xerces/c/trunk/src/CMakeLists.txt
xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp
Modified: xerces/c/trunk/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/CMakeLists.txt?rev=1823971&r1=1823970&r2=1823971&view=diff
==============================================================================
--- xerces/c/trunk/src/CMakeLists.txt (original)
+++ xerces/c/trunk/src/CMakeLists.txt Mon Feb 12 14:02:05 2018
@@ -1226,16 +1226,6 @@ if(XERCES_USE_FILEMGR_WINDOWS)
list(APPEND libxerces_c_HEADERS ${winfmgr_headers})
endif()
-# Windows resource. With some additional work to clean it up, it
-# might be possible to use with Cygwin and MinGW.
-if(MSVC)
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/xercesc/util/MsgLoaders/Win32/Version.rc.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/xercesc/util/MsgLoaders/Win32/Version.rc"
- @ONLY)
- list(APPEND libxerces_c_RESOURCES "${CMAKE_CURRENT_BINARY_DIR}/xercesc/util/MsgLoaders/Win32/Version.rc")
-endif()
-
# Definitions required for building
add_definitions(
-DHAVE_CONFIG_H=1
@@ -1256,8 +1246,7 @@ add_custom_target(xerces-c-headers SOURC
set_target_properties(xerces-c-headers PROPERTIES FOLDER "Library")
add_library(xerces-c
- ${libxerces_c_SOURCES}
- ${libxerces_c_RESOURCES})
+ ${libxerces_c_SOURCES})
target_link_libraries(xerces-c ${libxerces_c_DEPS})
if(XERCES_USE_NETACCESSOR_CURL)
target_include_directories(xerces-c SYSTEM PRIVATE ${CURL_INCLUDE_DIRS})
Modified: xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp?rev=1823971&r1=1823970&r2=1823971&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/PlatformUtils.cpp Mon Feb 12 14:02:05 2018
@@ -101,9 +101,6 @@
#if XERCES_USE_MSGLOADER_INMEMORY
# include <xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp>
#endif
-#if XERCES_USE_WIN32_MSGLOADER
-# include <xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp>
-#endif
#include <xercesc/util/TransService.hpp>
#if XERCES_USE_TRANSCODER_ICU
@@ -445,8 +442,6 @@ XMLMsgLoader* XMLPlatformUtils::loadAMsg
ms = new ICUMsgLoader(msgDomain);
#elif defined (XERCES_USE_MSGLOADER_ICONV)
ms = new MsgCatalogLoader(msgDomain);
- #elif defined (XERCES_USE_WIN32_MSGLOADER)
- ms = new Win32MsgLoader(msgDomain);
#elif defined (XERCES_USE_MSGLOADER_INMEMORY)
ms = new InMemMsgLoader(msgDomain);
#else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org