You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2006/12/30 16:07:06 UTC
svn commit: r491233 - in /xerces/c/branches/xerces-2.7/src/xercesc:
configure configure.in runConfigure util/Compilers/GCCDefs.hpp
util/Makefile.in util/NetAccessors/WinSock/Makefile.in
util/Transcoders/Win32/Makefile.in
Author: amassari
Date: Sat Dec 30 07:07:05 2006
New Revision: 491233
URL: http://svn.apache.org/viewvc?view=rev&rev=491233
Log:
Added support for WinSock and Windows Transcoder on Mingw/msys platform; patch by Charles McLouth (jira#1617)
Added:
xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in
xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/configure
xerces/c/branches/xerces-2.7/src/xercesc/configure.in
xerces/c/branches/xerces-2.7/src/xercesc/runConfigure
xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp
xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in
Modified: xerces/c/branches/xerces-2.7/src/xercesc/configure
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/configure?view=diff&rev=491233&r1=491232&r2=491233
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/configure (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/configure Sat Dec 30 07:07:05 2006
@@ -1505,6 +1505,7 @@
trap 'rm -fr `echo "Makefile \
util/Makefile \
util/Transcoders/Cygwin/Makefile \
+util/Transcoders/Win32/Makefile \
util/Transcoders/ICU/Makefile \
util/Transcoders/Iconv/Makefile \
util/Transcoders/Iconv390/Makefile \
@@ -1540,6 +1541,7 @@
util/MsgLoaders/MsgCatalog/Makefile \
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
+util/NetAccessors/WinSock/Makefile \
util/NetAccessors/libWWW/Makefile \
util/NetAccessors/MacOSURLAccessCF/Makefile \
util/regx/Makefile \
@@ -1665,6 +1667,7 @@
CONFIG_FILES=\${CONFIG_FILES-"Makefile \
util/Makefile \
util/Transcoders/Cygwin/Makefile \
+util/Transcoders/Win32/Makefile \
util/Transcoders/ICU/Makefile \
util/Transcoders/Iconv/Makefile \
util/Transcoders/Iconv390/Makefile \
@@ -1700,6 +1703,7 @@
util/MsgLoaders/MsgCatalog/Makefile \
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
+util/NetAccessors/WinSock/Makefile \
util/NetAccessors/libWWW/Makefile \
util/NetAccessors/MacOSURLAccessCF/Makefile \
util/regx/Makefile \
Modified: xerces/c/branches/xerces-2.7/src/xercesc/configure.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/configure.in?view=diff&rev=491233&r1=491232&r2=491233
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/configure.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/configure.in Sat Dec 30 07:07:05 2006
@@ -118,6 +118,7 @@
AC_OUTPUT([Makefile \
util/Makefile \
util/Transcoders/Cygwin/Makefile \
+util/Transcoders/Win32/Makefile \
util/Transcoders/ICU/Makefile \
util/Transcoders/Iconv/Makefile \
util/Transcoders/Iconv390/Makefile \
@@ -152,6 +153,7 @@
util/MsgLoaders/MsgCatalog/Makefile \
util/MsgLoaders/MsgFile/Makefile \
util/NetAccessors/Socket/Makefile \
+util/NetAccessors/WinSock/Makefile \
util/NetAccessors/libWWW/Makefile \
util/NetAccessors/MacOSURLAccessCF/Makefile \
util/regx/Makefile \
Modified: xerces/c/branches/xerces-2.7/src/xercesc/runConfigure
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/runConfigure?view=diff&rev=491233&r1=491232&r2=491233
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/runConfigure (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/runConfigure Sat Dec 30 07:07:05 2006
@@ -59,9 +59,9 @@
[default: no debug]"
echo " -m <message loader> can be 'inmem', 'icu', 'MsgFile' or
'iconv' [default: inmem]"
- echo " -n <net accessor> can be 'fileonly', 'libwww', 'socket' or
+ echo " -n <net accessor> can be 'fileonly', 'libwww', 'socket', 'winsock' or
'native' [default: socket]"
- echo " -t <transcoder> can be 'icu', 'Iconv400', 'Uniconv390',
+ echo " -t <transcoder> can be 'icu', 'Iconv400', 'Uniconv390', 'Win32',
'IconvFBSD', 'IconvGNU' or 'native'
[default: native]"
echo " -r <thread option> can be 'pthread' or 'dce'
@@ -508,6 +508,9 @@
IconvGNU)
TRANSCODER=IconvGNU ;
transcodingDefines="-DXML_USE_GNU_TRANSCODER -I/usr/local/include" ;;
+ Win32)
+ TRANSCODER=Win32 ;
+ transcodingDefines="-DXML_USE_WIN32_TRANSCODER" ;;
native)
if test $platform = "cygwin"; then
TRANSCODER=Cygwin ;
@@ -612,6 +615,17 @@
netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW `libwww-config --cflags`"
netaccessorLibs="`libwww-config --libs`"
USELIBWWW=1;;
+
+ winsock)
+ if test $platform = "mingw-msys"; then
+ NETACCESSOR=WinSock
+ netaccessorDefines="-DXML_USE_NETACCESSOR_WINSOCK"
+ netaccessorLibs="-lws2_32"
+ else
+ echo "netaccessor option '$netaccessor' is supported on 'mingw-msys' only."
+ exit ${ERROR_EXIT_CODE}
+ fi
+ ;;
native)
if test $platform = "macosx"; then
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp?view=diff&rev=491233&r1=491232&r2=491233
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Compilers/GCCDefs.hpp Sat Dec 30 07:07:05 2006
@@ -64,7 +64,11 @@
// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
-typedef unsigned short XMLCh;
+#if defined(__MINGW32__) && defined(_WCHAR_T_DEFINED)
+typedef wchar_t XMLCh;
+#else
+typedef unsigned short XMLCh;
+#endif
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
Modified: xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in?view=diff&rev=491233&r1=491232&r2=491233
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Makefile.in Sat Dec 30 07:07:05 2006
@@ -416,7 +416,11 @@
ifeq (${TRANSCODER},Uniconv390)
TRANSCODERMODULE=Uniconv390
else
- TRANSCODERMODULE=Iconv
+ ifeq (${TRANSCODER},Win32)
+ TRANSCODERMODULE=Win32
+ else
+ TRANSCODERMODULE=Iconv
+ endif
endif
endif
endif
@@ -452,6 +456,10 @@
else
ifeq (${NETACCESSOR},LibWWW)
NETACCESSORMODULE=libWWW
+ else
+ ifeq (${NETACCESSOR},WinSock)
+ NETACCESSORMODULE=WinSock
+ endif
endif
endif
endif
Added: xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in?view=auto&rev=491233
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in (added)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/NetAccessors/WinSock/Makefile.in Sat Dec 30 07:07:05 2006
@@ -0,0 +1,52 @@
+#
+# Copyright 1999-2000,2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+#
+# $Log$
+#
+#
+
+PLATFORM = @platform@
+CC = @cc@
+CXX = @cxx@
+CXXVER = @cxxver@
+GCC = @GCC@
+GXX = @GXX@
+CXXFLAGS = @cxxflags@
+CFLAGS = @cflags@
+PREFIX = @prefix@
+PREFIX_INCLUDE = @prefix_include@
+LDFLAGS = @ldflags@
+LIBS = @libs@
+OSVER = @osver@
+USELIBWWW = @uselibwww@
+MESSAGELOADER = @messageloader@
+TRANSCODER = @transcoder@
+NETACCESSOR = @netaccessor@
+THREADS = @threads@
+
+MODULE = util
+SUBMODULE = NetAccessors/WinSock
+
+include ../../../Makefile.incl
+
+CPP_PUBHEADERS = WinSockNetAccessor.hpp \
+ BinHTTPURLInputStream.hpp
+
+CPP_OBJECTS = WinSockNetAccessor.$(TO) \
+ BinHTTPURLInputStream.$(TO)
+
+include ../../Makefile.util.submodule
Added: xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in?view=auto&rev=491233
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in (added)
+++ xerces/c/branches/xerces-2.7/src/xercesc/util/Transcoders/Win32/Makefile.in Sat Dec 30 07:07:05 2006
@@ -0,0 +1,49 @@
+#
+# Copyright 2002,2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+#
+# $Log$
+#
+#
+
+PLATFORM = @platform@
+CC = @cc@
+CXX = @cxx@
+CXXVER = @cxxver@
+GCC = @GCC@
+GXX = @GXX@
+CXXFLAGS = @cxxflags@
+CFLAGS = @cflags@
+PREFIX = @prefix@
+PREFIX_INCLUDE = @prefix_include@
+LDFLAGS = @ldflags@
+LIBS = @libs@
+OSVER = @osver@
+USELIBWWW = @uselibwww@
+MESSAGELOADER = @messageloader@
+TRANSCODER = @transcoder@
+THREADS = @threads@
+
+MODULE = util
+SUBMODULE = Transcoders/Win32
+
+include ../../../Makefile.incl
+
+CPP_PUBHEADERS = Win32TransService.hpp
+
+CPP_OBJECTS = Win32TransService.$(TO)
+
+include ../../Makefile.util.submodule
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org