Hi,
I just merged the changes you had submitted for the UnixWare 7 port into
the source code base. However, you have not sent in the new platform
specific files for UnixWare namely:
src/util/Compilers/SCOCCDefs.hpp
src/util/Platforms/UnixWare/UnixWareDefs.hpp
src/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
Please send in these files so that this merge can be completed.
Thanks,
rahul
[EMAIL PROTECTED] wrote:
>
> Hi,
>
> Below you should find patches to Xerces C for UnixWare 7 support.
> These are the first round of changes to simply get Xerces C to build
> without error on UnixWare 7. The patch consists of context diffs
> produced in the xml-xerces/c/src directory to the files:
>
> util/Compilers/Makefile.in
> util/Platforms/Makefile.in
> util/AutoSense.hpp
> util/XML4CDefs.hpp
> Makefile.incl
> configure
> configure.in
> runConfigure
> Makefile.in
>
> The modifications were made to an anonymous CVS snapshot taken approximately
> 14:03 PST Nov 13, 1999.
> -rr-
>
> =====================cut here for patches================================
> *** util/Compilers/Makefile.in.00 Sat Nov 13 14:27:09 1999
> --- util/Compilers/Makefile.in Sun Nov 14 18:20:59 1999
> ***************
> *** 89,94 ****
> --- 89,95 ----
> HPCCDefs.hpp \
> IBMVAOS2Defs.hpp \
> IBMVAW32Defs.hpp \
> + SCOCCDefs.hpp \
> SunCCDefs.hpp \
> SunKaiDefs.hpp \
> TandemCCDefs.hpp \
> ***************
> *** 96,101 ****
> --- 97,105 ----
>
>
> ifeq (${COMPILER},CC)
> + ifeq (${PLATFORM},UNIXWARE)
> + CPP_OBJECTS = SCOCCDefs.o
> + endif
> ifeq (${PLATFORM},SOLARIS)
> CPP_OBJECTS = SunCCDefs.o
> endif
> *** util/Platforms/Makefile.in.00 Sat Nov 13 14:27:09 1999
> --- util/Platforms/Makefile.in Sat Nov 13 14:34:28 1999
> ***************
> *** 79,84 ****
> --- 79,89 ----
>
> include ../../Makefile.incl
>
> + ifeq (${PLATFORM}, UNIXWARE)
> + SUBMODULE = Platforms/UnixWare
> + CPP_PUBHEADERS = UnixWare/UnixWareDefs.hpp
> + CPP_OBJECTS = UnixWare/UnixWarePlatformUtils.o
> + endif
> ifeq (${PLATFORM}, SOLARIS)
> SUBMODULE = Platforms/Solaris
> CPP_PUBHEADERS = Solaris/SolarisDefs.hpp
> *** util/AutoSense.hpp.00 Sat Nov 13 14:27:09 1999
> --- util/AutoSense.hpp Sun Nov 14 18:25:19 1999
> ***************
> *** 79,86 ****
> || defined(_HPUX_SOURCE)
> #define XML_HPUX
> #define XML_UNIX
> ! #elif defined(SOLARIS) || defined(__SVR4)
> #define XML_SOLARIS
> #define XML_UNIX
> #elif defined(__linux__)
> #define XML_LINUX
> --- 79,92 ----
> || defined(_HPUX_SOURCE)
> #define XML_HPUX
> #define XML_UNIX
> ! #elif defined(SOLARIS) || defined(__SVR4) || defined(UNIXWARE)
> ! #if defined(UNIXWARE)
> ! #define XML_UNIXWARE
> ! #define XML_CSET
> ! #define XML_SCOCC
> ! #else
> #define XML_SOLARIS
> + #endif
> #define XML_UNIX
> #elif defined(__linux__)
> #define XML_LINUX
> ***************
> *** 131,137 ****
> #define XML_BORLAND
> #elif defined(__xlC__)
> #define XML_CSET
> ! #elif defined(XML_SOLARIS)
> #if defined(__SUNPRO_CC)
> #define XML_SUNCC
> #elif defined(_EDG_RUNTIME_USES_NAMESPACES)
> --- 137,143 ----
> #define XML_BORLAND
> #elif defined(__xlC__)
> #define XML_CSET
> ! #elif defined(XML_SOLARIS) || defined(XML_UNIXWARE)
> #if defined(__SUNPRO_CC)
> #define XML_SUNCC
> #elif defined(_EDG_RUNTIME_USES_NAMESPACES)
> *** util/XML4CDefs.hpp.00 Sat Nov 13 14:27:09 1999
> --- util/XML4CDefs.hpp Sun Nov 14 18:19:07 1999
> ***************
> *** 109,114 ****
> --- 109,118 ----
> #include <util/Platforms/Solaris/SolarisDefs.hpp>
> #endif
>
> + #if defined(XML_UNIXWARE)
> + #include <util/Platforms/UnixWare/UnixWareDefs.hpp>
> + #endif
> +
> #if defined(XML_HPUX)
> #include <util/Platforms/HPUX/HPUXDefs.hpp>
> #endif
> ***************
> *** 153,158 ****
> --- 157,166 ----
>
> #if defined(XML_SUNCC)
> #include <util/Compilers/SunCCDefs.hpp>
> + #endif
> +
> + #if defined(XML_SCOCC)
> + #include <util/Compilers/SCOCCDefs.hpp>
> #endif
>
> #if defined(XML_SOLARIS_KAICC)
> *** Makefile.incl.00 Sat Nov 13 14:27:09 1999
> --- Makefile.incl Mon Nov 15 11:31:02 1999
> ***************
> *** 104,109 ****
> --- 104,131 ----
>
> ####################### PLATFORM DEPENDENCIES #####################
>
> + #=============== UNIXWARE SPECIFIC OPTIONS =========================
> + ifeq (${PLATFORM}, UNIXWARE)
> + ifeq (${COMPILER}, g++)
> + PLATFORM_CPP_COMPILER = g++
> + PLATFORM_C_COMPILER = gcc
> + PLATFORM_LIBRARIES=-L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
> + PLATFORM_COMPILE_OPTIONS = -fPIC -instances=static -D${PLATFORM}
> -D_REENTRANT
> + MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -shared
> + MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -shared
> + EXTRA_LINK_OPTIONS = -lm -lw -lgen
> + else
> + PLATFORM_CPP_COMPILER = CC
> + PLATFORM_C_COMPILER = cc
> + PLATFORM_LIBRARIES=-L/usr/local/lib -L/usr/ccs/lib
> + PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -instances=static
> -D${PLATFORM} -D_REENTRANT
> + MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -G
> + MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -G
> + EXTRA_LINK_OPTIONS = -lm -lw -lC -lc -lgen
> + endif
> + SHLIBSUFFIX=.so
> + endif
> +
> #=============== SOLARIS SPECIFIC OPTIONS =========================
> ifeq (${PLATFORM}, SOLARIS)
> ifeq (${COMPILER}, g++)
> *** configure.00 Sat Nov 13 14:27:09 1999
> --- configure Sat Nov 13 14:31:23 1999
> ***************
> *** 1441,1446 ****
> --- 1441,1449 ----
>
> case "${host}" in
> *-*-solaris*) platform=SOLARIS ;;
> + *-*-sysv5*) platform=UNIXWARE ;;
> + *-*-UnixWare*) platform=UNIXWARE ;;
> + *-*-unixware*) platform=UNIXWARE ;;
> *-*-linux*) platform=LINUX ;;
> *-*-aix*) platform=AIX ;;
> *-*-hp*) platform=HPUX ;
> *** configure.in.00 Sat Nov 13 14:27:09 1999
> --- configure.in Sat Nov 13 14:35:24 1999
> ***************
> *** 35,40 ****
> --- 35,43 ----
> dnl Platform-specific Makefile setup
> case "${host}" in
> *-*-solaris*) platform=SOLARIS ;;
> + *-*-sysv5*) platform=UNIXWARE ;;
> + *-*-UnixWare*) platform=UNIXWARE ;;
> + *-*-unixware*) platform=UNIXWARE ;;
> *-*-linux*) platform=LINUX ;;
> *-*-aix*) platform=AIX ;;
> *-*-hp*) platform=HPUX ;
> *** runConfigure.00 Sat Nov 13 14:27:09 1999
> --- runConfigure Sat Nov 13 14:31:59 1999
> ***************
> *** 187,193 ****
>
> # Now check if the options are correct or not, bail out if incorrect
> case $platform in
> ! aix | linux | solaris | hp-10 | hp-11)
> # platform has been recognized
> ;;
> *)
> --- 187,193 ----
>
> # Now check if the options are correct or not, bail out if incorrect
> case $platform in
> ! aix | linux | unixware | solaris | hp-10 | hp-11)
> # platform has been recognized
> ;;
> *)
> *** Makefile.in.00 Sat Nov 13 16:11:47 1999
> --- Makefile.in Sat Nov 13 16:12:19 1999
> ***************
> *** 274,280 ****
> -${CP} -f ${XERCESCROOT}/samples/runConfigure
> ${BINTARGETDIR}/samples
> -${CP} -f ${XERCESCROOT}/samples/Makefile.in
> ${BINTARGETDIR}/samples
> -${CP} -f ${XERCESCROOT}/samples/Makefile.incl
> ${BINTARGETDIR}/samples
> ! -${CP} -f ${XERCESCROOT}/samples/Maefile
> ${BINTARGETDIR}/samples
>
> -${CP} -Rf ${XERCESCROOT}/samples/data/* ${BINTARGETDIR}/samples/data
> -${CP} -Rf ${XERCESCROOT}/samples/SAXCount/*
> ${BINTARGETDIR}/samples/SAXCount
> --- 274,280 ----
> -${CP} -f ${XERCESCROOT}/samples/runConfigure
> ${BINTARGETDIR}/samples
> -${CP} -f ${XERCESCROOT}/samples/Makefile.in
> ${BINTARGETDIR}/samples
> -${CP} -f ${XERCESCROOT}/samples/Makefile.incl
> ${BINTARGETDIR}/samples
> ! -${CP} -f ${XERCESCROOT}/samples/Makefile
> ${BINTARGETDIR}/samples
>
> -${CP} -Rf ${XERCESCROOT}/samples/data/* ${BINTARGETDIR}/samples/data
> -${CP} -Rf ${XERCESCROOT}/samples/SAXCount/*
> ${BINTARGETDIR}/samples/SAXCount
