You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2005/08/16 03:06:48 UTC
cvs commit: xml-xalan/c/src/xalanc/XalanEXSLT XalanEXSLTDateTime.cpp
dmitryh 2005/08/15 18:06:48
Modified: c Makefile.incl.in configure.in runConfigure
c/src/xalanc Makefile.in
c/src/xalanc/Include OS390Definitions.hpp
c/src/xalanc/Utils Makefile.in
c/src/xalanc/Utils/XalanMsgLib Makefile.in
c/src/xalanc/XalanEXSLT XalanEXSLTDateTime.cpp
Log:
Fix for XALANC-541
Revision Changes Path
1.38 +36 -13 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.incl.in 8 Jul 2005 17:30:49 -0000 1.37
+++ Makefile.incl.in 16 Aug 2005 01:06:47 -0000 1.38
@@ -431,16 +431,21 @@
ifeq ($(PLATFORM), OS390)
SUPPORTED = TRUE
- PLATFORM_COMPILE_OPTIONS =-Wc,dll,"langlvl(extended),float(ieee)" -D${PLATFORM} -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
+ PLATFORM_COMPILE_OPTIONS =-Wc,dll,"langlvl(extended),float(ieee)" -D${PLATFORM} -D_XOPEN_SOURCE_EXTENDED -DXALAN_XSLT_BUILD_DLL -DXALAN_PLATFORMSUPPORT_BUILD_DLL -DXALAN_DOM_BUILD_DLL -DXALAN_XALANEXTEXTENSIONS_BUILD_DLL -DXALAN_XALANSOURCETREE_BUILD_DLL -DXALAN_TRANSFORMER_BUILD_DLL -DXALAN_XERCESPARSERLIAISON_BUILD_DLL -DXALAN_XMLSUPPORT_BUILD_DLL -DXALAN_XPATH_BUILD_DLL -DXALAN_XPATHCAPI_BUILD_DLL -DXALAN_ALLINONE_BUILD_DLL -DXALAN_EXSLT_BUILD_DLL -DXALAN_ICUBRIDGE_BUILD_DLL -DXALAN_DOMSUPPORT_BUILD_DLL
ALLLIBS =
+ifeq (${OS390_XPLINK},1)
+ SHLIBSUFFIX=.xplink.dll
+ OS390SIDEDECK=.xplink.x
+else
SHLIBSUFFIX=.dll
OS390SIDEDECK=.x
+endif
- CPPMSGFLAGS = -2 -DNDEBUG -Wc,'targ(zosv1r3)' -DXALAN_XALANMSGLIB_BUILD_DLL
- CMSGFLAGS = -2 -DNDEBUG -Wc,'targ(zosv1r3)' -DXALAN_XALANMSGLIB_BUILD_DLL
- CXXMSGFLAGS = -2 -DNDEBUG -Wc,'targ(zosv1r3)' -DXALAN_XALANMSGLIB_BUILD_DLL
+ CPPMSGFLAGS = -2 -DNDEBUG -DXALAN_XALANMSGLIB_BUILD_DLL
+ CMSGFLAGS = -2 -DNDEBUG -DXALAN_XALANMSGLIB_BUILD_DLL
+ CXXMSGFLAGS = -2 -DNDEBUG -DXALAN_XALANMSGLIB_BUILD_DLL
- CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC1 = $(CXX) $(CXXFLAGS) ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS)
ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG
else
@@ -448,27 +453,45 @@
endif
CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC5 = $(CXX) $(CXXMSGFLAGS) -Wl,compt=pm4 $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = ${CXX} $(CXXFLAGS) -Wl,compat=pm4 -D${PLATFORM} -Wl,dll
- MAKE_SHARED_MSG = ${CXX} $(CXXMSGFLAGS) -Wl,compat=pm4 -D${PLATFORM} -Wl,dll
- LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,compat=pm4
+ CC5 = $(CXX) $(CXXMSGFLAGS) $(PLATFORM_COMPILE_OPTIONS) {$LDFLAGS}
+ MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll ${LDFLAGS}
+ MAKE_SHARED_MSG = ${CXX} $(CXXMSGFLAGS) -D${PLATFORM} -Wl,dll ${LDFLAGS}
+ LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) ${LDFLAGS}
XERCES_LIB=$(XERCESCROOT)/lib/libxerces-c2_6_0.x
- ICU_LIB=$(XERCESCROOT)/lib/libicuuc32.0.x $(XERCESCROOT)/lib/libicui18n32.0.x
+ ICU_LIB=$(XERCESCROOT)/lib/libicuuc33.0$(OS390SIDEDECK) $(XERCESCROOT)/lib/libicui18n33.0$(OS390SIDEDECK)
LIB=$(LIB_NAME).$(VER)$(SHLIBSUFFIX)
LIBRARY_SEARCH_PATH=
LIBRARY_LINK_NAME=$(XSL_LIB_DIR)/$(LIB_NAME).$(VER)$(OS390SIDEDECK)
+ LOCAL_LIB=${XSL_LIB_DIR}/lib$(LOC_PROJECT_NAME).$(VER)$(OS390SIDEDECK)
LOC_LIB=${LOC_LIBNAME}.${VER}$(SHLIBSUFFIX)
MESSAGELIB=${XSL_LIB_DIR}/${LOC_LIB}
## OS390BATCH
ifeq (${OS390BATCH},1)
- BATCH_PROJECT_NAME = IXMLC18
- BATCH_MESSAGE_NAME = IXMMSG18
+ BATCH_XALAN_UTIL_NAME = IXMXAL20
+ BATCH_TEST_UTIL_NAME = IXMTST20
+ifeq (${OS390_XPLINK},1)
+ BATCH_PROJECT_NAME = IXMLX20
+ BATCH_MESSAGE_NAME = IXMMXG20
+ BATCH_XML_PROJ_NAME = IXM4C6XX
+ BATCH_ICUUC_PROJ_NAME = IXMI33XC
+ BATCH_ICUIN_PROJ_NAME = IXMI33XN
+else
+ BATCH_PROJECT_NAME = IXMLC20
+ BATCH_MESSAGE_NAME = IXMMSG20
+ BATCH_XML_PROJ_NAME = IXM4C56X
+ BATCH_ICUUC_PROJ_NAME = IXMI33UC
+ BATCH_ICUIN_PROJ_NAME = IXMI33IN
+endif
+
+ XERCES_LIB = "//'${LOADEXP}(${BATCH_XML_PROJ_NAME})'"
+ ICU_LIB = "//'${LOADEXP}(${BATCH_ICUUC_PROJ_NAME})'" "//'${LOADEXP}(${BATCH_ICUIN_PROJ_NAME})'"
+ LOCAL_LIB = "//'${LOADEXP}(${BATCH_MESSAGE_NAME})'"
BATCH_TARGET = "//'${LOADMOD}(${BATCH_PROJECT_NAME})'"
- ALLLIBS = "//'${LOADEXP}(IXM4C54X)'" "//'${LOADEXP}(IXM26UCX)'" "//'${LOADEXP}(IXMI26IN)'"
+# ALLLIBS = ${XERCES_LIB} ${ICU_LIB} "//'${LOADEXP}(${BATCH_MESSAGE_NAME})'"
LIBRARY_LINK_NAME= "//'${LOADEXP}(${BATCH_PROJECT_NAME})'"
MESSAGELIB="//'${LOADMOD}(${BATCH_MESSAGE_NAME})'"
endif ## OS390BATCH
1.9 +1 -1 xml-xalan/c/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure.in 7 Jan 2005 16:37:28 -0000 1.8
+++ configure.in 16 Aug 2005 01:06:47 -0000 1.9
@@ -10,7 +10,7 @@
dnl Check for gcc problems
-if test "$CXX" = "g++" -o "$CXX" = "c++" -o "$CXX" = "g++3"; then
+if test "$CXX" = "g++" -o "$CXX" = "c++"; then
AC_MSG_CHECKING([whether -fno-elide-constructors works correctly])
1.13 +80 -19 xml-xalan/c/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xalan/c/runConfigure,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- runConfigure 8 Jul 2005 17:30:49 -0000 1.12
+++ runConfigure 16 Aug 2005 01:06:47 -0000 1.13
@@ -17,6 +17,9 @@
#
#
# $Log$
+# Revision 1.13 2005/08/16 01:06:47 dmitryh
+# Fix for XALANC-541
+#
# Revision 1.12 2005/07/08 17:30:49 dmitryh
# Fix for XALANC-526
#
@@ -145,7 +148,7 @@
echo "Usage: runConfigure \"options\""
echo " where options may be any of the following:"
echo " -p <platform> (accepts 'aix', 'linux', 'freebsd', 'netbsd', 'solaris',
- 'hp-10', 'hp-11', 'hp-11-ia64', 'irix', 'tru64', 'macosx', 'os400', 'cygwin')"
+ 'hp-10', 'hp-11', 'hp-11-ia64', 'irix', 'tru64', 'macosx', 'os390', 'os400', 'cygwin')"
echo " -c <C compiler name> (e.g. gcc, cc, xlc)"
echo " -x <C++ compiler name> (e.g. g++, CC, xlC)"
echo " -d (specifies that you want to build debug version)"
@@ -183,25 +186,22 @@
exit ${ERROR_EXIT_CODE}
fi
-# Get the command line parameters
-if test -x /bin/getopt -o -x /usr/bin/getopt; then
-set -- `getopt C:p:P:c:x:dm:n:t:m:M:r:b:l:z:h $*`
-else
-set -- `getopts C:p:P:c:x:dm:n:t:m:M:r:b:l:z:h $*`
-fi
-
-if [ $? != 0 ]
- then
- usage
- exit ${ERROR_EXIT_CODE}
-fi
-
# Set up the default values for each parameter
debug=off # by default debug is off
bitsToBuild=32 # by default 32 bit build assumed
transcoder=default # by default use default transcoder
-localSys=inmem # by default use inmem locale
-locale=en_US # by default use US locale
+localSys=icu # by default use icu locale system
+locale=en_US # by default use US locale
+
+# Get the command line parameters
+if test -x /bin/getopt -o -x /usr/bin/getopt; then
+ set -- `getopt C:p:P:c:x:dm:n:t:m:M:r:b:l:z:h $*`
+
+ if [ $? != 0 ]
+ then
+ usage
+ exit ${ERROR_EXIT_CODE}
+ fi
while [ $# -gt 0 ]
do
@@ -261,6 +261,60 @@
exit ${ERROR_EXIT_CODE};;
esac
done
+else
+while getopts "C:p:P:c:x:dm:n:t:m:M:r:b:l:z:h" switch;
+ do
+ case $switch in
+ p)
+ platform=$OPTARG;;
+
+ c)
+ ccompiler=$OPTARG;;
+
+ x)
+ cppcompiler=$OPTARG;;
+
+ d)
+ debug=on;;
+
+ t)
+ transcoder=$OPTARG;;
+
+ r)
+ thread=$OPTARG;;
+
+ b)
+ bitsToBuild=$OPTARG;;
+
+ z)
+ compileroptions="$compileroptions $OPTARG";;
+
+ l)
+ linkeroptions="$linkeroptions $OPTARG";;
+
+ m)
+ localSys=$OPTARG;;
+
+ M)
+ locale=$OPTARG;;
+
+ P)
+ configureoptions="$configureoptions --prefix=$OPTARG";;
+
+ C)
+ configureoptions="$configureoptions $OPTARG";;
+
+ h)
+ usage
+ exit ${ERROR_EXIT_CODE};;
+
+ *)
+ echo "unknown option -$switch $OPTARG"
+ usage
+ exit ${ERROR_EXIT_CODE};;
+ esac
+done
+fi
echo "Generating makefiles with the following options ..."
echo "Platform: $platform"
@@ -281,7 +335,7 @@
#
case $platform in
- aix | linux | freebsd | netbsd | solaris | hp-11 | hp-11-ia64 | irix | tru64 | macosx | os400 | cygwin)
+ aix | linux | freebsd | netbsd | solaris | hp-11 | hp-11-ia64 | irix | tru64 | macosx | os390 | os400 | cygwin)
# platform has been recognized
;;
*)
@@ -298,6 +352,8 @@
echo "Debug is OFF"
if test $platform = "os400"; then
debugflag="";
+ elif test $platform = "os390"; then
+ debugflag="-DNDEBUG";
elif test $platform = "linux"; then
if test $cppcompiler = "icpc"; then
debugflag="-O3 -DNDEBUG";
@@ -320,7 +376,7 @@
#
# aix | linux | hp-11 | hp-11-ia64 | solaris |
-# freebsd | netbsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx
+# freebsd | netbsd | irix | openserver | unixware | os390 | os400 | ptx | tru64 | macosx
#
if test $bitsToBuild = 64; then
bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
@@ -391,7 +447,9 @@
exit ${ERROR_EXIT_CODE};
fi
transcodingDefines="-I${ICUROOT}/include";
- transcodingLibs="-L${ICUROOT} -L${ICUROOT}/lib -L${ICUROOT}/data";
+ if test $platform != "os390"; then
+ transcodingLibs="-L${ICUROOT} -L${ICUROOT}/lib -L${ICUROOT}/data";
+ fi
TRANSCODER=ICU;;
default)
@@ -470,6 +528,9 @@
threadingLibs="-pthread -lpthread"
elif test $platform = "os400"; then
threadingLibs=""
+elif test $platform = "os390"; then
+ threadingLibs=""
+ threadingDefines="-D_OPEN_THREADS"
fi
1.37 +6 -6 xml-xalan/c/src/xalanc/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Makefile.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.in 9 Dec 2004 18:26:34 -0000 1.36
+++ Makefile.in 16 Aug 2005 01:06:47 -0000 1.37
@@ -168,17 +168,17 @@
compile: $(ALL_OBJECTS)
ifeq (${OS390BATCH},1)
-XalanExe: lib "//'$(LOADSAMP)(IXMXAL19)'"
+XalanExe: lib "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'"
-"//'$(LOADSAMP)(IXMXAL19)'": ${XSL_OBJ_DIR}/XalanExe.o
+"//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@
${XSL_OBJ_DIR}/XalanExe.o: $(XALANEXE_DIR)/XalanExe.cpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
-testXSLT: lib "//'$(LOADSAMP)(IXMTST19)'"
+testXSLT: lib "//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'"
-"//'$(LOADSAMP)(IXMTST19)'": ${XSL_OBJ_DIR}/process.o
+"//'$(LOADSAMP)(${BATCH_TEST_UTIL_NAME})'": ${XSL_OBJ_DIR}/process.o
${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS} \
${EXTRA_LINK_OPTIONS} $(XALAN_LIB) $(ALLLIBS) $^ -o $@
${XSL_OBJ_DIR}/process.o: $(TESTXSLT_DIR)/process.cpp
@@ -232,7 +232,7 @@
$(XSL_LIB_DIR)/$(LIB): $(ALL_OBJECTS)
$(MAKE_SHARED) $(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(LINK_SONAME) $(ALLLIBS) $^ -o $@ $(OTHER_LINK_LIB_PARAMERES)
ifeq ($(PLATFORM), OS390)
- cp -p *.x ${XSL_LIB_DIR}
+ mv *.x ${XSL_LIB_DIR}
else
rm -f $(XSL_LIB_DIR)/$(LINK_NAME) && \
$(LN) -fs $(LIB) $(XSL_LIB_DIR)/$(LINK_NAME)
@@ -287,7 +287,7 @@
rm -f $(XSL_LIB_DIR)/$(LIB)
rm -f $(XSL_LIB_DIR)/$(LINK_NAME)
rm -f $(XSL_LIB_DIR)/$(SO_NAME)
- rm -f $(XSL_LIB_DIR)/$(LIB).$(OS390SIDEDECK)
+ rm -f $(LIBRARY_LINK_NAME)
rm -f $(XSL_LIB_DIR)/$(LIB).map1
rm -f $(XSL_BIN_DIR)/testXSLT$(EXT)
rm -f $(XSL_BIN_DIR)/testXPath$(EXT)
1.6 +6 -1 xml-xalan/c/src/xalanc/Include/OS390Definitions.hpp
Index: OS390Definitions.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/OS390Definitions.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OS390Definitions.hpp 8 Aug 2005 15:25:52 -0000 1.5
+++ OS390Definitions.hpp 16 Aug 2005 01:06:47 -0000 1.6
@@ -33,10 +33,15 @@
#define XALAN_XALANDOMCHAR_USHORT_MISMATCH
#define XALAN_USE_WCHAR_CAST_HACK
+#define XALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
#define XALAN_NON_ASCII_PLATFORM
+#define XALAN_USE_ALT_MAP_IMPL
#define XALAN_EXPLICIT_SCOPE_IN_TEMPLATE_BUG
-#define XALAN_NEW_STD_ALLOCATOR
+//#define XALAN_NEW_STD_ALLOCATOR
+#define XALAN_HAS_STD_ITERATORS
+#define XALAN_HAS_STD_DISTANCE
#define XALAN_HAS_CPP_NAMESPACE
+#define XALAN_POSIX2_AVAILABLE
#endif // OS390DEFINITIONS_HEADER_GUARD_1357924680
1.11 +5 -0 xml-xalan/c/src/xalanc/Utils/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 8 Jul 2005 17:30:49 -0000 1.10
+++ Makefile.in 16 Aug 2005 01:06:47 -0000 1.11
@@ -62,6 +62,11 @@
$(MESSAGELIB): $(XSL_NLS_DIR)/include/LocalMsgData.hpp
$(MAKE) -C XalanMsgLib
+ifeq ($(PLATFORM), OS390)
+ifneq (${OS390BATCH},1)
+ @$(MOVE) XalanMsgLib/*.x ../../../lib
+endif
+endif
$(XSL_NLS_DIR)/include/LocalMsgData.hpp : $(XSL_BIN_DIR)/MsgCreator $(XLIFF_FILE_NAME)
$(XSL_BIN_DIR)/MsgCreator $(XLIFF_FILE_NAME) -TYPE $(MESSAGELOADER) -LOCALE $(LOCALE)
1.7 +3 -1 xml-xalan/c/src/xalanc/Utils/XalanMsgLib/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Utils/XalanMsgLib/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 6 Apr 2004 15:08:45 -0000 1.6
+++ Makefile.in 16 Aug 2005 01:06:47 -0000 1.7
@@ -33,6 +33,7 @@
$(MESSAGELIB) : ${XSL_OBJ_DIR}/XalanMsgLib.o
$(MAKE_SHARED_LOC) $(EXTRA_LOC_LINK_OPTIONS) $^ -o $@
+ifneq ($(PLATFORM), OS390)
rm -f $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX) && \
$(LN) -fs $(LOC_LIB) $(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX)
ifeq ($(PLATFORM), AIX)
@@ -43,6 +44,7 @@
$(XSL_LIB_DIR)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
+endif ## ! OS390
${XSL_OBJ_DIR}/XalanMsgLib.o : $(XALANMSGLIB_SRC)/XalanMsgLib.cpp $(XALANMSGLIB_SRC)/XalanMsgLib.hpp ${XSL_NLS_DIR}/include/LocalMsgData.hpp
$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $(XALANMSGLIB_SRC)/XalanMsgLib.cpp
@@ -63,7 +65,7 @@
$(DESTDIR)/$(libdir)/$(LOC_LIBNAME)$(SHLIBSUFFIX).$(LIB_MAJOR_VER)
endif ## AIX
-endif ## OS390
+endif ## ! OS390
doClean:
1.12 +1 -1 xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp
Index: XalanEXSLTDateTime.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTDateTime.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanEXSLTDateTime.cpp 29 Apr 2005 21:39:45 -0000 1.11
+++ XalanEXSLTDateTime.cpp 16 Aug 2005 01:06:48 -0000 1.12
@@ -110,7 +110,7 @@
-#if defined(WIN32) || defined(__DECCXX)
+#if defined(WIN32) || defined(__DECCXX) || defined(OS390)
static struct tm*
localtime_r(const time_t *clock, struct tm *res)
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org