rahulj 99/11/22 18:01:07
Modified: c/obj Makefile.in
c/src Makefile.in Makefile.incl configure configure.in
runConfigure
c/src/dom Makefile.in
c/src/framework Makefile.in
c/src/internal Makefile.in
c/src/parsers Makefile.in
c/src/sax Makefile.in
c/src/util Makefile.in
c/src/util/Compilers HPCCDefs.hpp Makefile.in
c/src/util/MsgLoaders/ICU Makefile.in
c/src/util/MsgLoaders/InMemory Makefile.in
c/src/util/MsgLoaders/MsgCatalog Makefile.in
c/src/util/Platforms Makefile.in
c/src/util/Platforms/AIX AIXPlatformUtils.cpp
c/src/util/Platforms/HPUX HPPlatformUtils.cpp
c/src/util/Platforms/Linux LinuxPlatformUtils.cpp
c/src/util/Transcoders/ICU Makefile.in
c/src/util/Transcoders/Iconv Makefile.in
c/src/validators/DTD Makefile.in
Log:
Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
Revision Changes Path
1.3 +11 -5 xml-xerces/c/obj/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/obj/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 1999/11/12 20:38:43 1.2
+++ Makefile.in 1999/11/23 01:59:16 1.3
@@ -55,6 +55,9 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.3 1999/11/23 01:59:16 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
+#
# Revision 1.2 1999/11/12 20:38:43 rahulj
# Replaced XML4CROOT with XERCESCROOT.
#
@@ -77,8 +80,11 @@
###################################################################
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
PREFIX = @prefix@
+LDFLAGS = @ldflags@
+LIBS = @libs@
include ../src/Makefile.incl
@@ -106,7 +112,7 @@
#######################################################
ifeq (${PLATFORM},HPUX)
- ifeq (${COMPILER},CC)
+ ifeq (${CXX},CC)
###### Start HP-UX CC compiler specific stuff #######
DUMMYEXE=$(XML_LIB_DIR)/dummyExe
TEMPLATESOBJS=$(wildcard $(TEMPLATESREPOSITORY)/*.o)
@@ -115,7 +121,7 @@
\rm -f $(DUMMYEXE)
$(DUMMYEXE): $(ALL_OBJECTS)
- ${MAKE_SHARED} -o [EMAIL PROTECTED] $(PLATFORM_LIBRARIES) $^ $(ALLLIBS)
+ ${MAKE_SHARED} -o [EMAIL PROTECTED] $^ $(PLATFORM_LIBRARIES) $(ALLLIBS)
###### End HP-UX CC compiler specific stuff #######
else
@@ -144,14 +150,14 @@
${THISLIB}${VER}${SHLIBSUFFIX}: $(ALL_OBJECTS)
@echo Building ${THISLIB}${VER}${SHLIBSUFFIX}
- ${MAKE_SHARED} -o [EMAIL PROTECTED] $(PLATFORM_LIBRARIES)
$(EXTRA_LINK_OPTIONS) $^ $(TEMPLATESOBJS) $(ALLLIBS)
+ ${MAKE_SHARED} -o [EMAIL PROTECTED] $^ $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
## OS390
ifeq (${PLATFORM},OS390)
## OS390BATCH
ifeq (${OS390BATCH},1)
${BATCH_TARGET}: $(ALL_OBJECTS)
@echo Building ${BATCH_TARGET}
- ${MAKE_SHARED} -o [EMAIL PROTECTED] $(PLATFORM_LIBRARIES)
$(EXTRA_LINK_OPTIONS) $^ $(TEMPLATESOBJS) $(ALLLIBS)
+ ${MAKE_SHARED} -o [EMAIL PROTECTED] $^ $(TEMPLATESOBJS)
$(PLATFORM_LIBRARIES) $(EXTRA_LINK_OPTIONS) $(ALLLIBS)
else
$(CP) ${LIBNAME}${VER}${OS390SIDEDECK} ${LIB}
endif
1.5 +6 -2 xml-xerces/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 1999/11/12 21:14:32 1.4
+++ Makefile.in 1999/11/23 01:59:25 1.5
@@ -55,6 +55,9 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.5 1999/11/23 01:59:25 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
+#
# Revision 1.4 1999/11/12 21:14:32 rahulj
# fixed ver number.
#
@@ -108,14 +111,15 @@
#all these setting come from the arguments passed in to runConfigure.
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
PREFIX = @prefix@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
PRODUCTNAME=xerces
PRODUCTVERSION=${VER}
-BINTARGETDIR=${HOME}/${PRODUCTNAME}-c-${PLATFORM}-${COMPILER}-${PRODUCTVERSION}
+BINTARGETDIR=${HOME}/${PRODUCTNAME}-c-${PLATFORM}-${CXX}-${PRODUCTVERSION}
all: Prepare Util Sax Internal Framework Parsers Dom Validators
${THISLIB}${VER}${SHLIBSUFFIX}
1.5 +62 -110 xml-xerces/c/src/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/Makefile.incl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.incl 1999/11/17 22:36:31 1.4
+++ Makefile.incl 1999/11/23 01:59:28 1.5
@@ -55,6 +55,9 @@
#
#
# $Log: Makefile.incl,v $
+# Revision 1.5 1999/11/23 01:59:28 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
+#
# Revision 1.4 1999/11/17 22:36:31 rahulj
# Code works with ICU transcoding service
#
@@ -105,41 +108,40 @@
XML_BUILD_OPTIONS = ${CXXFLAGS}
+XML_LIB_DIR = $(XERCESCROOT)/lib
+XML_INC_DIR = $(XERCESCROOT)/include
+XML_INCL = -I$(XML_INC_DIR)
+
####################### PLATFORM DEPENDENCIES #####################
#=============== SOLARIS SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, SOLARIS)
- ifeq (${COMPILER}, g++)
- PLATFORM_CPP_COMPILER = g++
- PLATFORM_C_COMPILER = gcc
- PLATFORM_LIBRARIES=-L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
+ ifeq (${CXX}, g++)
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
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -shared
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared
+ ALLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lm -lw
-lgen
else
- PLATFORM_CPP_COMPILER = CC
- PLATFORM_C_COMPILER = cc
- PLATFORM_LIBRARIES=-L/usr/local/SUNWspro/lib -L/usr/ccs/lib
PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -instances=static
-features=rtti -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
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -G
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -G
+ EXTRA_LINK_OPTIONS = ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib
-lm -lw -lC -lc -lgen
endif
SHLIBSUFFIX=.so
endif
#================= AIX SPECIFIC OPTIONS ===========================
ifeq (${PLATFORM}, AIX)
-PLATFORM_CPP_COMPILER = xlC_r
-PLATFORM_C_COMPILER = xlc_r
-ifdef ICUROOT
- PLATFORM_LIBRARIES=-L/usr/lpp/xlC/lib -L${ICUROOT}/lib
- EXTRA_LINK_OPTIONS = -licu-uc -lbsd
-else
- PLATFORM_LIBRARIES=-L/usr/lpp/xlC/lib
- EXTRA_LINK_OPTIONS = -lbsd
-endif
+
+#PLATFORM_CPP_COMPILER = xlC_r
+#PLATFORM_C_COMPILER = xlc_r
+#ifdef ICUROOT
+# ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -L${ICUROOT}/lib -licu-uc -lbsd
+#else
+# ALLLIBS = -L/usr/lpp/xlC/lib -lbsd
+#endif
+
+ALLLIBS = ${LIBS} -L/usr/lpp/xlC/lib -lbsd
PLATFORM_COMPILE_OPTIONS = -qnotempinc -D_THREAD_SAFE
MAKE_SHARED = makeC++SharedLib_r -p 5000
MAKE_SHARED_C = makeC++SharedLib_r -p 5000
@@ -148,20 +150,19 @@
#=============== LINUX SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, LINUX)
-PLATFORM_CPP_COMPILER = g++
-PLATFORM_C_COMPILER = gcc
-PLATFORM_LIBRARIES=-L/usr/lib -L/usr/local/lib -L/usr/ccs/lib
+#PLATFORM_CPP_COMPILER = g++
+#PLATFORM_C_COMPILER = gcc
PLATFORM_COMPILE_OPTIONS = -fpic -instances=static -D${PLATFORM} -D_REENTRANT
-MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -shared -fpic
-MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -shared -fpic
-ALLLIBS = -lc -lpthread
+MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fpic
+MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fpic
+ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -lc
SHLIBSUFFIX=.so
endif
#=============== OS2 SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, OS/2)
-PLATFORM_CPP_COMPILER = icc
-PLATFORM_C_COMPILER = icc
+#PLATFORM_CPP_COMPILER = icc
+#PLATFORM_C_COMPILER = icc
PLATFORM_LIBRARIES= CPPOM30.LIB os2386.lib mmpm2.lib
PLATFORM_COMPILE_OPTIONS = /C+ /Gd- /Ge- /Gm+ /Gs- /Re /J+ /Ms /Sm /Sn /Ss+
MAKE_SHARED = ilink /nofree
@@ -174,40 +175,6 @@
endif
#================= HP SPECIFIC OPTIONS ===========================
-#ifeq (${PLATFORM}, HPUX)
-# ifeq (${COMPILER}, aCC)
-# PLATFORM_CPP_COMPILER = aCC
-# PLATFORM_C_COMPILER = aCC
-# PLATFORM_LIBRARIES=-L/opt/aCC/lib -L/usr/ccs/lib
-# PLATFORM_COMPILE_OPTIONS = $(COMPILESWITCH) -D_HP_UX -DHPaCC
-D_PTHREADS_DRAFT4 \
-# +DAportable -w +z +inst_compiletime
-# MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -b
-# MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -b
-# EXTRA_LINK_OPTIONS = -lcma -lCsup -lstream
-# SHLIBSUFFIX=.sl
-# else
-# ifneq (${DEBUG}, 1)
-# XML_BUILD_OPTIONS = -w +O1
-# endif
-# PLATFORM_CPP_COMPILER = CC
-# PLATFORM_C_COMPILER = cc
-# PLATFORM_LIBRARIES= -L${ICUROOT}/lib -L/opt/CC/lib -L/usr/lib
-# TEMPLATESREPOSITORY = ${ALL_OBJECTS_DIR}/ptrepository
-# COMMON_COMPILE_OPTIONS = $(COMPILESWITCH) -D_HP_UX -DXML4C_TMPLSINC \
-# -D_PTHREADS_DRAFT4 +DAportable -w +eh +z -z +a1
-# ifeq ($(MODULE), dom)
-# PLATFORM_COMPILE_OPTIONS = -DDOM_PROJ $(COMMON_COMPILE_OPTIONS)
-# else
-# PLATFORM_COMPILE_OPTIONS = $(COMMON_COMPILE_OPTIONS)
-ptr${TEMPLATESREPOSITORY}
-# endif
-# ALLINCLUDES= -I$(XERCESCROOT)/src -I$(ICUROOT)/include
-# MAKE_SHARED = $(PLATFORM_CPP_COMPILER) $(PLATFORM_COMPILE_OPTIONS)
$(ALLINCLUDES)
-# MAKE_SHARED_C = $(PLATFORM_C_COMPILER) $(PLATFORM_COMPILE_OPTIONS)
$(ALLINCLUDES)
-# ALLLIBS = -licu-uc -lcma -lm
-# EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,-a,shared
-# SHLIBSUFFIX=.sl
-# endif
-#endif
ifeq (${PLATFORM}, HPUX)
@@ -216,41 +183,28 @@
OSVERDEFINE=HPUX10
endif
- ifeq (${COMPILER}, aCC)
- PLATFORM_CPP_COMPILER = aCC
- PLATFORM_C_COMPILER = aCC
- PLATFORM_COMPILE_OPTIONS = $(COMPILESWITCH) -D_HP_UX -DHPaCC \
- -D_PTHREADS_DRAFT4 -D${OSVERDEFINE} +DAportable -w +z \
- +inst_compiletime
- MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -b
- MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -b
- ALLLIBS = -lcma -lCsup -lstream
+ ifeq (${CXX}, aCC)
+ PLATFORM_COMPILE_OPTIONS = -D_HP_UX -DHPaCC \
+ -D${OSVERDEFINE} +DAportable +z +inst_compiletime
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -b
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -b
+ ALLLIBS = ${LIBS} -lCsup -lstream
SHLIBSUFFIX=.sl
else
- ifneq (${DEBUG}, 1)
- XML_BUILD_OPTIONS = -w +O1
- endif
- PLATFORM_CPP_COMPILER = CC
- PLATFORM_C_COMPILER = cc
-ifdef ICUROOT
- PLATFORM_LIBRARIES= -L${ICUROOT}/lib
-endif
+# ifneq (${DEBUG}, 1)
+# XML_BUILD_OPTIONS = +O1
+# endif
TEMPLATESREPOSITORY = ${ALL_OBJECTS_DIR}/ptrepository
- COMMON_COMPILE_OPTIONS = $(COMPILESWITCH) -D_HP_UX -DXML4C2_TMPLSINC \
- -D_PTHREADS_DRAFT4 -D${OSVERDEFINE} +DAportable -w +eh +z -z +a1
+ COMMON_COMPILE_OPTIONS = -D_HP_UX -DXML4C_TMPLSINC \
+ -D${OSVERDEFINE} +DAportable +eh +z -z +a1
ifeq ($(MODULE), dom)
PLATFORM_COMPILE_OPTIONS = -DDOM_PROJ $(COMMON_COMPILE_OPTIONS)
else
PLATFORM_COMPILE_OPTIONS = $(COMMON_COMPILE_OPTIONS)
-ptr${TEMPLATESREPOSITORY}
endif
-ifdef ICUROOT
- ALLINCLUDES=-I$(XERCESCROOT)/src/com/ibm/xml -I$(XERCESCROOT)/src
-I$(ICUROOT)/include
-else
- ALLINCLUDES=-I$(XERCESCROOT)/src/com/ibm/xml -I$(XERCESCROOT)/src
-endif
- MAKE_SHARED = $(PLATFORM_CPP_COMPILER) $(PLATFORM_COMPILE_OPTIONS)
$(ALLINCLUDES)
- MAKE_SHARED_C = $(PLATFORM_C_COMPILER) $(PLATFORM_COMPILE_OPTIONS)
$(ALLINCLUDES)
- ALLLIBS = -licu-uc -lcma -lm
+ MAKE_SHARED = $(CXX) $(PLATFORM_COMPILE_OPTIONS) $(XML_INCL)
+ MAKE_SHARED_C = $(CC) $(PLATFORM_COMPILE_OPTIONS) $(XML_INCL)
+ ALLLIBS = ${LIBS}
EXTRA_LINK_OPTIONS = -b -Wl,+s -Wl,-a,shared
SHLIBSUFFIX=.sl
endif
@@ -292,32 +246,30 @@
CAT = cat
AR = ar -cqv
CD = cd
-CC1 = ${PLATFORM_CPP_COMPILER} ${PLATFORM_COMPILE_OPTIONS}
-JUST_CC = ${PLATFORM_C_COMPILER} -D${PLATFORM}
+CC1 = ${CXX} ${PLATFORM_COMPILE_OPTIONS}
+JUST_CC = ${CC} -D${PLATFORM}
ECHO = echo
CREATE_DEPENDS_FILE = echo "" > depends
MAKE_DEPEND = ${CC1} -E -xM
########################## DIRECTORIES ############################
-XML_LIB_DIR = $(XERCESCROOT)/lib
-XML_INC_DIR = $(XERCESCROOT)/include
-ifeq (${MESSAGELOADER}, ICU)
- INTL_INC_DIR1 = $(ICUROOT)/include
-endif
-ifeq (${TRANSCODER}, ICU)
- INTL_INC_DIR1 = $(ICUROOT)/include
-endif
+#ifeq (${MESSAGELOADER}, ICU)
+# INTL_INC_DIR1 = $(ICUROOT)/include
+#endif
+#ifeq (${TRANSCODER}, ICU)
+# INTL_INC_DIR1 = $(ICUROOT)/include
+#endif
#################### COMPILE/LINK FLAGS ###########################
-ifeq (${MESSAGELOADER}, ICU)
- XML_INCL = -I. -I$(XML_INC_DIR) -I$(INTL_INC_DIR1)
-else
- ifeq (${TRANSCODER}, ICU)
- XML_INCL = -I. -I$(XML_INC_DIR) -I$(INTL_INC_DIR1)
- else
- XML_INCL = -I. -I$(XML_INC_DIR)
- endif
-endif
+#ifeq (${MESSAGELOADER}, ICU)
+# XML_INCL = -I. -I$(XML_INC_DIR) -I$(INTL_INC_DIR1)
+#else
+# ifeq (${TRANSCODER}, ICU)
+# XML_INCL = -I. -I$(XML_INC_DIR) -I$(INTL_INC_DIR1)
+# else
+# XML_INCL = -I. -I$(XML_INC_DIR)
+# endif
+#endif
##################### HELPER MACROS ###############################
DEPFILE = depends
1.3 +22 -164 xml-xerces/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 1999/11/12 21:15:34 1.2
+++ configure 1999/11/23 01:59:30 1.3
@@ -1049,105 +1049,9 @@
fi
-echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:1054: checking for pthread_create in -lpthread" >&5
-ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpthread $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1062 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char pthread_create();
-
-int main() {
-pthread_create()
-; return 0; }
-EOF
-if { (eval echo configure:1073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
- LIBS="-lpthread $LIBS"
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-if test $ac_cv_lib_pthread_pthread_create = no; then
-echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:1102: checking for pthread_create in -lpthreads" >&5
-ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lpthreads $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1110 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char pthread_create();
-
-int main() {
-pthread_create()
-; return 0; }
-EOF
-if { (eval echo configure:1121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo pthreads | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
- LIBS="-lpthreads $LIBS"
-else
- echo "$ac_t""no" 1>&6
-fi
-
-fi
-
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1151: checking how to run the C preprocessor" >&5
+echo "configure:1055: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1162,13 +1066,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1166 "configure"
+#line 1070 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1179,13 +1083,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1183 "configure"
+#line 1087 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1196,13 +1100,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1200 "configure"
+#line 1104 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1226,60 +1130,13 @@
fi
echo "$ac_t""$CPP" 1>&6
-for ac_hdr in inttypes.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1234: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1239 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed
'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-if test $ac_cv_header_inttypes_h = no; then
-HAVE_INTTYPES_H=0
-else
-HAVE_INTTYPES_H=1
-fi
-
-
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1278: checking for ANSI C header files" >&5
+echo "configure:1135: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1283 "configure"
+#line 1140 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1287,7 +1144,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1304,7 +1161,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1308 "configure"
+#line 1165 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1322,7 +1179,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1326 "configure"
+#line 1183 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1343,7 +1200,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1347 "configure"
+#line 1204 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1354,7 +1211,7 @@
exit (0); }
EOF
-if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1378,12 +1235,12 @@
fi
echo $ac_n "checking for XMLByte""... $ac_c" 1>&6
-echo "configure:1382: checking for XMLByte" >&5
+echo "configure:1239: checking for XMLByte" >&5
if eval "test \"`echo '$''{'ac_cv_type_XMLByte'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1387 "configure"
+#line 1244 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1418,7 +1275,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1422: checking host system type" >&5
+echo "configure:1279: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1453,11 +1310,12 @@
*) platform=UNKNOWN ;;
esac
+
+cxx=${CXX}
-compiler=${CXX}
+cc=${CC}
-# prefix=${prefix}
@@ -1653,14 +1511,14 @@
[EMAIL PROTECTED]@%$INSTALL_DATA%g
[EMAIL PROTECTED]@%$AUTOCONF%g
[EMAIL PROTECTED]@%$CPP%g
[EMAIL PROTECTED]@%$HAVE_INTTYPES_H%g
[EMAIL PROTECTED]@%$host%g
[EMAIL PROTECTED]@%$host_alias%g
[EMAIL PROTECTED]@%$host_cpu%g
[EMAIL PROTECTED]@%$host_vendor%g
[EMAIL PROTECTED]@%$host_os%g
[EMAIL PROTECTED]@%$platform%g
[EMAIL PROTECTED]@%$compiler%g
[EMAIL PROTECTED]@%$cxx%g
[EMAIL PROTECTED]@%$cc%g
[EMAIL PROTECTED]@%$osver%g
[EMAIL PROTECTED]@%$cxxflags%g
[EMAIL PROTECTED]@%$cppflags%g
1.2 +13 -17 xml-xerces/c/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.in 1999/11/09 01:02:52 1.1
+++ configure.in 1999/11/23 01:59:32 1.2
@@ -11,20 +11,15 @@
dnl Checks for libraries
AC_CHECK_LIB(m, floor)
+dnl
+dnl Do not know how to use this macro, so comment it out.
+dnl
dnl special pthread handling (AIX uses pthreads instead of pthread)
-AC_CHECK_LIB(pthread, pthread_create)
-if test $ac_cv_lib_pthread_pthread_create = no; then
-AC_CHECK_LIB(pthreads, pthread_create)
-fi
-
-dnl Checks for header files
-AC_CHECK_HEADERS(inttypes.h)
-if test $ac_cv_header_inttypes_h = no; then
-HAVE_INTTYPES_H=0
-else
-HAVE_INTTYPES_H=1
-fi
-AC_SUBST(HAVE_INTTYPES_H)
+dnl AC_CHECK_LIB(pthread, pthread_create)
+dnl if test $ac_cv_lib_pthread_pthread_create = no; then
+dnl AC_CHECK_LIB(pthreads, pthread_create)
+dnl fi
+dnl
dnl Checks for typedefs
AC_CHECK_TYPE(XMLByte,unsigned char)
@@ -48,12 +43,13 @@
esac
AC_SUBST(platform)
-compiler=${CXX}
-AC_SUBST(compiler)
+cxx=${CXX}
+AC_SUBST(cxx)
-# prefix=${prefix}
-AC_SUBST(prefix)
+cc=${CC}
+AC_SUBST(cc)
+AC_SUBST(prefix)
AC_SUBST(osver)
cxxflags=${CXXFLAGS}
1.5 +114 -70 xml-xerces/c/src/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/runConfigure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- runConfigure 1999/11/17 22:36:33 1.4
+++ runConfigure 1999/11/23 01:59:33 1.5
@@ -58,6 +58,9 @@
#
#
# $Log: runConfigure,v $
+# Revision 1.5 1999/11/23 01:59:33 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
+#
# Revision 1.4 1999/11/17 22:36:33 rahulj
# Code works with ICU transcoding service
#
@@ -72,9 +75,19 @@
#
#
+#
+# runConfigure:
+# This script will run the "configure" script for the appropriate
+# platform. Only supported platforms are recognized.
+#
+# The following variables are defined and exported at the end of this
+# script.
#
-# runConfigure : This script will run the "configure" script for the
appropriate platform
-# Only supported platforms are recognized
+# LIBS
+# LDFLAGS
+# CXXFLAGS
+# TRANSCODER
+#
usage()
{
@@ -125,7 +138,7 @@
# Set up the default values for each parameter
debug=off # by default debug is off
transcoder=native # by default use native transcoder
-msgloader=iconv # by default use native transcoder
+msgloader=inmem # by default use native transcoder
netaccessor=fileonly # by default use fileonly
for i in $*
@@ -176,19 +189,16 @@
echo "C++ Compiler: $cppcompiler"
echo "Extra compile options: $compileroption"
echo "Extra link options: $linkeroption"
-if test $debug = "off"; then
- echo "Debug is OFF"
- debugflag="-w -O";
-else
- echo "Debug is ON"
- debugflag="-g";
-fi
echo "Message Loader: $msgloader"
echo "Net Accessor: $netaccessor"
echo "Transcoder: $transcoder"
echo "Thread option: $thread"
+
+#
# 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
@@ -197,9 +207,55 @@
echo "I do not recognize the platform '$platform'. Please type '${0}
-h' for help."
exit -1;;
esac
+
+
+#
+# Enable debugging or not...
+#
+
+if test $debug = "off"; then
+ echo "Debug is OFF"
+ debugflag="-O";
+else
+ echo "Debug is ON"
+ debugflag="-g";
+fi
+
+
+
+#
+# Check for the threading option only for hp-11
+#
+
+threadingLibs="-lpthread"
+if test $platform = "hp-11"; then
+ if test $thread; then
+ case $thread in
+ pthread)
+ ;;
+
+ dce)
+ threadingLibs="-lcma";
+ threadingDefines="-D_PTHREADS_DRAFT4 -DXML_USE_DCE" ;;
+
+ *)
+ echo "I do not recognize the thread option '$thread'. Please type
'${0} -h' for help."
+ exit -1;;
+ esac
+ fi
+elif test $platform = "aix"; then
+ threadingLibs="-lpthreads"
+elif test $platform = "hp-10"; then
+ threadingLibs="-lcma"
+ threadingDefines="-DXML_USE_DCE"
+fi
+
+
+#
+# Now check for what kind of transcoding service is desired.
+#
-# Now check for the transcoder
-transcoderoption="-DXML_USE_NATIVE_TRANSCODER"
+transcodingDefines="-DXML_USE_NATIVE_TRANSCODER"
TRANSCODER=NATIVE
if test $transcoder; then
@@ -209,12 +265,12 @@
echo '***Error*** ICUROOT environment variable not defined.
Exiting...';
exit -1;
fi
- transcoderoption="-DXML_USE_ICU_TRANSCODER" ;
+ transcodingDefine="-DXML_USE_ICU_TRANSCODER -I${ICUROOT}/include" ;
+ transcodingLibs="-L${ICUROOT}/lib -licu-uc";
TRANSCODER=ICU ;;
native)
- transcoderoption="-DXML_USE_NATIVE_TRANSCODER" ;
- TRANSCODER=NATIVE ;;
+ ;;
*)
echo "I do not recognize the transcoder option '$transcoder'. Please
type '${0} -h' for help."
@@ -224,10 +280,14 @@
export TRANSCODER
+
+#
# Now check for the message loader
-MESSAGELOADER=INMEM; # By default use in-memory
-msgloaderoption="-DXML_USE_INMEM_MESSAGELOADER"
+#
+MESSAGELOADER=INMEM; # By default use in-memory
+msgloaderDefines="-DXML_USE_INMEM_MESSAGELOADER"
+
if test $msgloader ; then
case $msgloader in
icu)
@@ -236,15 +296,14 @@
exit -1;
fi
MESSAGELOADER=ICU;
- msgloaderoption="-DXML_USE_ICU_MESSAGELOADER" ;;
+ msgloaderDefines="-DXML_USE_ICU_MESSAGELOADER" ;;
inmem)
- MESSAGELOADER=INMEM;
- msgloaderoption="-DXML_USE_INMEM_MESSAGELOADER" ;;
+ ;;
iconv)
MESSAGELOADER=ICONV;
- msgloaderoption="-DXML_USE_ICONV_MESSAGELOADER" ;;
+ msgloaderDefines="-DXML_USE_ICONV_MESSAGELOADER" ;;
*)
echo "I do not recognize the message loader option '$msgloader'.
Please type '${0} -h' for help."
@@ -254,66 +313,26 @@
export MESSAGELOADER
-# Check for the threading option only for hp-11
-if test $platform = "hp-11"; then
- if test $thread; then
- case $thread in
- pthread)
- threadingoption="-DXML_USE_PTHREAD" ;;
-
- dce)
- threadingoption="-DXML_USE_DCE" ;;
-
- *)
- echo "I do not recognize the thread option '$thread'. Please type
'${0} -h' for help."
- exit -1;;
- esac
- else
- echo "You must provide a thread option for HPUX-11". Cannot
proceed any further.
- exit -1;
- fi
-fi
-
-# Set the C compiler and C++ compiler environment variables
-CC=$ccompiler; export CC
-CXX=$cppcompiler; export CXX
-case $cppcompiler in
- xlC | xlc | xlC_r | xlc_r)
- LDFLAGS="-lC"; export LDFLAGS
- LIBS="-L/usr/lpp/xlC/lib"; export LIBS ;;
-
- g++ | c++)
- LDFLAGS="-lc"; export LDFLAGS
- LIBS="-L/usr/local/lib"; export LIBS ;;
-
- cc | CC)
- LDFLAGS="-lC"; export LDFLAGS
- LIBS="-L/usr/lib -L/usr/ccs/lib"; export LIBS ;;
-
- acc | aCC)
- LDFLAGS="-lC"; export LDFLAGS
- LIBS="-L/usr/lib -L/opt/aCC/lib"; export LIBS ;;
- *)
- echo "I do not recognize the C++ compiler '$cppcompiler'. Continuing
anyway ..."
- ;;
-esac
-USELIBWWW=0; # By default use file-only
+#
# Check for the type of net accessor
+#
+
+USELIBWWW=0; # By default use file-only
if test $netaccessor ; then
case $netaccessor in
fileonly)
- netaccessoroption="" ;;
+ netaccessorDefines="" ;;
libwww)
if test -z ${LIBWWWROOT} ; then
echo "You have not defined your LIBWWWROOT environment variable.
Cannot proceed further ..."
exit -1;
fi
- netaccessoroption="-DXML_USE_NETACCESSOR_LIBWWW
-I${LIBWWWROOT}/include" ;
- LIBS="$LIBS -L${LIBWWWROOT}/lib -lwww";
+ netaccessorDefines="-DXML_USE_NETACCESSOR_LIBWWW
-I${LIBWWWROOT}/include" ;
+ netaccessorLibs="-L${LIBWWWROOT}/lib -lwww";
USELIBWWW=1;;
*)
@@ -324,9 +343,34 @@
export USELIBWWW;
+
+
+#
+# Set the C compiler and C++ compiler environment variables
+#
+
+case $cppcompiler in
+ xlC | xlc | xlC_r | xlc_r | g++ | c++ | cc | CC | aCC)
+ ;;
+
+ *)
+ echo "I do not recognize the C++ compiler '$cppcompiler'. Continuing
anyway ..."
+ ;;
+esac
+
+export CC=$ccompiler
+export CXX=$cppcompiler
+
+
+
+#
# Set the extra C and C++ compiler flags
-CXXFLAGS="$debugflag $compileroption $transcoderoption $msgloaderoption
$threadingoption $netaccessoroption"; export CXXFLAGS
-CFLAGS="$debugflag $compileroption $transcoderoption $msgloaderoption
$threadingoption $netaccessoroption"; export CFLAGS
+#
+
+export CXXFLAGS="$debugflag $transcodingDefines $msgloaderDefines
$threadingDefines $netaccessorDefines"
+export CFLAGS="$debugflag $transcodingDefines $msgloaderDefines
$threadingDefines $netaccessorDefines"
+export LIBS="$transcodingLibs $threadingLibs $netaccessorLibs"
+
echo
rm -f config.cache
1.2 +5 -4 xml-xerces/c/src/dom/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:09:11 1.1
+++ Makefile.in 1999/11/23 01:59:43 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:09:11 twl
-# Initial revision
+# Revision 1.2 1999/11/23 01:59:43 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:09:11 twl
+# Initial checkin
+#
# Revision 1.4 1999/11/08 20:44:28 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -209,9 +213,6 @@
$(RM) Makefile $(DEPFILE)
@echo "Removing all $(MODULE) header files ..."
@for file in $(DOM_CPP_PUBHEADERS); do \
- rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
- done
- @for file in $(DOM_C_FILES); do \
rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
done
@echo "Removing all $(MODULE) object files ..."
1.2 +5 -4 xml-xerces/c/src/framework/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:08:26 1.1
+++ Makefile.in 1999/11/23 01:59:47 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:08:26 twl
-# Initial revision
+# Revision 1.2 1999/11/23 01:59:47 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:08:26 twl
+# Initial checkin
+#
# Revision 1.5 1999/11/08 20:44:34 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -139,9 +143,6 @@
$(RM) Makefile $(DEPFILE)
@echo "Removing all $(MODULE) header files ..."
@for file in $(FRAMEWORK_CPP_PUBHEADERS); do \
- rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
- done
- @for file in $(FRAMEWORK_C_FILES); do \
rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
done
@echo "Removing all $(MODULE) object files ..."
1.2 +5 -4 xml-xerces/c/src/internal/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:08:09 1.1
+++ Makefile.in 1999/11/23 01:59:51 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:08:09 twl
-# Initial revision
+# Revision 1.2 1999/11/23 01:59:51 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:08:09 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:44:42 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -130,9 +134,6 @@
$(RM) Makefile $(DEPFILE)
@echo "Removing all $(MODULE) header files ..."
@for file in $(INTERNAL_CPP_PUBHEADERS); do \
- rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
- done
- @for file in $(INTERNAL_C_FILES); do \
rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
done
@echo "Removing all $(MODULE) object files ..."
1.2 +5 -4 xml-xerces/c/src/parsers/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:07:50 1.1
+++ Makefile.in 1999/11/23 01:59:56 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:07:50 twl
-# Initial revision
+# Revision 1.2 1999/11/23 01:59:56 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:07:50 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:44:53 rahul
# Swat for adding in Product name and CVS comment log variable.
#
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -115,9 +119,6 @@
$(RM) Makefile $(DEPFILE)
@echo "Removing all $(MODULE) header files ..."
@for file in $(PARSERS_CPP_PUBHEADERS); do \
- rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
- done
- @for file in $(PARSERS_C_FILES); do \
rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
done
@echo "Removing all $(MODULE) object files ..."
1.2 +5 -4 xml-xerces/c/src/sax/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/sax/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:07:46 1.1
+++ Makefile.in 1999/11/23 01:59:59 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:07:46 twl
-# Initial revision
+# Revision 1.2 1999/11/23 01:59:59 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:07:46 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:01 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -125,9 +129,6 @@
$(RM) Makefile $(DEPFILE)
@echo "Removing all $(MODULE) header files ..."
@for file in $(SAX_CPP_PUBHEADERS); do \
- rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
- done
- @for file in $(SAX_C_FILES); do \
rm -f $(XML_INC_DIR)/$(MODULE)/$$file; \
done
@echo "Removing all $(MODULE) object files ..."
1.2 +5 -1 xml-xerces/c/src/util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:04:40 1.1
+++ Makefile.in 1999/11/23 02:00:05 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:04:40 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:00:05 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:04:40 twl
+# Initial checkin
+#
# Revision 1.4 1999/11/08 20:45:09 rahul
# Swat for adding in Product name and CVS comment log variable.
#
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.4 +11 -8 xml-xerces/c/src/util/Compilers/HPCCDefs.hpp
Index: HPCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Compilers/HPCCDefs.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HPCCDefs.hpp 1999/11/12 20:36:57 1.3
+++ HPCCDefs.hpp 1999/11/23 02:00:12 1.4
@@ -56,6 +56,9 @@
/**
* $Log: HPCCDefs.hpp,v $
+ * Revision 1.4 1999/11/23 02:00:12 rahulj
+ * Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
+ *
* Revision 1.3 1999/11/12 20:36:57 rahulj
* Changed library name to xerces-c.lib.
*
@@ -87,22 +90,22 @@
// Define our version of the XML character
//
---------------------------------------------------------------------------
typedef unsigned short XMLCh;
+typedef unsigned short UTF16Ch;
//
---------------------------------------------------------------------------
-// Provide prototypes for some string methods that are not always available
-// on all platforms.
+// Define unsigned 16 and 32 bits integers
//
---------------------------------------------------------------------------
-int stricmp(const char* const str1, const char* const str2);
-int strnicmp(const char* const str1, const char* const str2, const unsigned
int count);
+typedef unsigned short XMLUInt16;
+typedef unsigned int XMLUInt32;
//
---------------------------------------------------------------------------
-// Force on the XML4C debug token if it was on in the build environment
+// Provide prototypes for some string methods that are not always available
+// on all platforms.
//
---------------------------------------------------------------------------
-#if 0
-#define XML4C_DEBUG
-#endif
+int stricmp(const char* const str1, const char* const str2);
+int strnicmp(const char* const str1, const char* const str2, const unsigned
int count);
//
---------------------------------------------------------------------------
1.2 +10 -6 xml-xerces/c/src/util/Compilers/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Compilers/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:07:36 1.1
+++ Makefile.in 1999/11/23 02:00:13 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:07:36 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:00:13 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:07:36 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:24 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -95,7 +99,7 @@
VCPPDefs.hpp
-ifeq (${COMPILER},CC)
+ifeq (${CXX},CC)
ifeq (${PLATFORM},SOLARIS)
CPP_OBJECTS = SunCCDefs.o
endif
@@ -103,16 +107,16 @@
CPP_OBJECTS = HPCCDefs.o
endif
endif
-ifeq (${COMPILER},xlC_r)
+ifeq (${CXX},xlC_r)
CPP_OBJECTS = CSetDefs.o
endif
-ifeq (${COMPILER},g++)
+ifeq (${CXX},g++)
CPP_OBJECTS = GCCDefs.o
endif
-ifeq (${COMPILER},aCC)
+ifeq (${CXX},aCC)
CPP_OBJECTS = HPCCDefs.o
endif
-ifeq (${COMPILER},c++)
+ifeq (${CXX},c++)
ifeq (${PLATFORM},OS390)
CPP_OBJECTS = MVSCPPDefs.o
endif
1.2 +5 -1 xml-xerces/c/src/util/MsgLoaders/ICU/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/ICU/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:07:25 1.1
+++ Makefile.in 1999/11/23 02:00:18 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:07:25 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:00:18 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:07:25 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:26 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.2 +5 -1 xml-xerces/c/src/util/MsgLoaders/InMemory/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/InMemory/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:07:20 1.1
+++ Makefile.in 1999/11/23 02:00:22 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:07:20 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:00:22 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:07:20 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:27 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.2 +5 -1 xml-xerces/c/src/util/MsgLoaders/MsgCatalog/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/MsgLoaders/MsgCatalog/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:07:16 1.1
+++ Makefile.in 1999/11/23 02:00:25 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:07:16 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:00:25 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:07:16 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:27 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.3 +5 -1 xml-xerces/c/src/util/Platforms/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Platforms/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.in 1999/11/17 22:36:37 1.2
+++ Makefile.in 1999/11/23 02:00:28 1.3
@@ -55,6 +55,9 @@
#
#
# $Log: Makefile.in,v $
+# Revision 1.3 1999/11/23 02:00:28 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
+#
# Revision 1.2 1999/11/17 22:36:37 rahulj
# Code works with ICU transcoding service
#
@@ -67,7 +70,8 @@
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.2 +4 -1 xml-xerces/c/src/util/Platforms/AIX/AIXPlatformUtils.cpp
Index: AIXPlatformUtils.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Platforms/AIX/AIXPlatformUtils.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AIXPlatformUtils.cpp 1999/11/09 01:07:11 1.1
+++ AIXPlatformUtils.cpp 1999/11/23 02:00:34 1.2
@@ -56,9 +56,12 @@
/**
* $Log: AIXPlatformUtils.cpp,v $
- * Revision 1.1 1999/11/09 01:07:11 twl
- * Initial revision
+ * Revision 1.2 1999/11/23 02:00:34 rahulj
+ * Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
*
+ * Revision 1.1.1.1 1999/11/09 01:07:11 twl
+ * Initial checkin
+ *
* Revision 1.6 1999/11/08 20:45:29 rahul
* Swat for adding in Product name and CVS comment log variable.
*
@@ -145,7 +148,7 @@
// Here you would also set the fgLibLocation global variable
// XMLPlatformUtils::fgLibLocation is the variable to be set
- static const char * libraryPath = 0;
+ char * libraryPath = 0;
char libName[256];
strcpy(libName, XML4C_DLLName);
1.2 +109 -80 xml-xerces/c/src/util/Platforms/HPUX/HPPlatformUtils.cpp
Index: HPPlatformUtils.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Platforms/HPUX/HPPlatformUtils.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HPPlatformUtils.cpp 1999/11/09 01:07:05 1.1
+++ HPPlatformUtils.cpp 1999/11/23 02:00:44 1.2
@@ -56,9 +56,12 @@
/**
* $Log: HPPlatformUtils.cpp,v $
- * Revision 1.1 1999/11/09 01:07:05 twl
- * Initial revision
+ * Revision 1.2 1999/11/23 02:00:44 rahulj
+ * Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
*
+ * Revision 1.1.1.1 1999/11/09 01:07:05 twl
+ * Initial checkin
+ *
* Revision 1.3 1999/11/08 20:45:29 rahul
* Swat for adding in Product name and CVS comment log variable.
*
@@ -84,25 +87,28 @@
#include <libgen.h>
#include <string.h>
#include <unistd.h>
-
#include <util/XMLString.hpp>
#include <util/XMLUni.hpp>
-#if defined (XML_USE_ICU_TRANSCODER)
+
+#if defined(XML_USE_ICU_TRANSCODER)
#include <util/Transcoders/ICU/ICUTransService.hpp>
-#else // use native transcoder
+#else
+ // Use native transcoder. Same as -DXML_USE_NATIVE_TRANSCODER
#include <util/Transcoders/Iconv/IconvTransService.hpp>
#endif
-#if defined (XML_USE_ICU_MESSAGELOADER)
+
+#if defined(XML_USE_ICU_MESSAGELOADER)
#include <util/MsgLoaders/ICU/ICUMsgLoader.hpp>
-#elif defined (XML_USE_ICONV_MESSAGELOADER)
- #include <util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp>
-#else // use In-memory message loader
+
+#else
+ // Same as -DXML_USE_INMEM_MESSAGELOADER
#include <util/MsgLoaders/InMemory/InMemMsgLoader.hpp>
#endif
+
#if !defined(XML_HPUX_KAICC)
#include <sys/timeb.h> // does not work with KAI compiler
#endif
@@ -191,6 +197,44 @@
// circular dependency between compareAndExchange() and
// mutex creation that must be broken.
atomicOpsMutex.fHandle = XMLPlatformUtils::makeMutex();
+
+
+ // Here you would also set the fgLibLocation global variable
+ // XMLPlatformUtils::fgLibLocation is the variable to be set
+
+ char* libraryPath = 0;
+ char libName[256];
+ shl_descriptor* desc = NULL;
+ int ret = 0;
+ int index = 1;
+
+ strcpy(libName, XML4C_DLLName);
+ strcat(libName, gXML4CVersionStr);
+ strcat(libName, ".sl");
+
+ ret = shl_get(index, &desc);
+ while (ret != -1)
+ {
+ char* fileName = desc->filename;
+ if (strstr(fileName, libName) != NULL)
+ {
+ char* lastSlash = strrchr(fileName, '/');
+ size_t chars_to_extract = lastSlash - fileName;
+ libraryPath = new char[chars_to_extract + 1];
+ strncpy(libraryPath, fileName, chars_to_extract);
+ libraryPath[chars_to_extract] = 0;
+ break;
+ }
+ index++;
+ ret = shl_get(index, &desc);
+ }
+
+ XMLPlatformUtils::fgLibLocation = libraryPath;
+
+ if (XMLPlatformUtils::fgLibLocation == NULL)
+ {
+ panic(XMLPlatformUtils::Panic_CantFindLib);
+ }
}
@@ -211,15 +255,14 @@
{
#if defined (XML_USE_ICU_MESSAGELOADER)
retVal = new ICUMsgLoader(msgDomain);
-#elif defined (XML_USE_ICONV_MESSAGELOADER)
- retVal = new MsgCatalogLoader(msgDomain);
#else
+ // same as -DXML_USE_INMEM_MESSAGELOADER
retVal = new InMemMsgLoader(msgDomain);
#endif
}
catch(...)
{
- panic(XMLPlatformUtils::Panic_NoDefTranscoder);
+ panic(XMLPlatformUtils::Panic_CantLoadMsgDomain);
}
return retVal;
}
@@ -240,6 +283,7 @@
//
static const char * xml4cIntlDirEnvVar = "ICU_DATA";
+ char * intlPath = 0;
//
// Check if environment variable 'ICU_DATA' is set.
@@ -250,7 +294,7 @@
if (envVal != NULL)
{
unsigned int pathLen = strlen(envVal);
- char* intlPath = new char[pathLen + 2];
+ intlPath = new char[pathLen + 2];
strcpy((char *) intlPath, envVal);
if (envVal[pathLen - 1] != '/')
@@ -265,65 +309,33 @@
}
//
- // If we did not find the environment var, so lets try to go the auto
- // search route.
+ // If the environment variable ICU_DATA is not set, assume that the
+ // converter files are stored relative to the Xerces-C library.
//
- char libName[256];
- strcpy(libName, XML4C_DLLName);
- strcat(libName, gXML4CVersionStr);
- strcat(libName, ".sl");
+ unsigned int lent = strlen(XMLPlatformUtils::fgLibLocation) +
+ strlen("/icu/data/") + 1;
+ intlPath = new char[lent];
+ strcpy(intlPath, XMLPlatformUtils::fgLibLocation);
+ strcat(intlPath, "/icu/data/");
- shl_descriptor* desc = NULL;
- int ret = 0;
- int index = 1;
+ ICUTransService::setICUPath(intlPath);
+ delete intlPath;
- ret = shl_get(index, &desc);
- while (ret != -1)
- {
- char* fileName = desc->filename;
- if (strstr(fileName, libName) != NULL)
- {
- char* lastSlash = strrchr(fileName, '/');
- size_t chars_to_extract = lastSlash - fileName;
- char *libPathName = new char[chars_to_extract + 1];
- strncpy(libPathName, fileName, chars_to_extract);
- libPathName[chars_to_extract] = 0;
- fgIntlPath = new char[strlen(libPathName)+
strlen("/icu/data/")+1];
- strcpy((char *) fgIntlPath, libPathName);
- strcat((char *) fgIntlPath, "/icu/data/");
- delete libPathName;
- break;
- }
- index++;
- ret = shl_get(index, &desc);
- }
-
- if (fgIntlPath == NULL)
- {
- fprintf(stderr,
- "Fatal error: Could not find /icu/data relative to %s \n",
- libName);
- fprintf(stderr,
- " while trying to auto detect the location ");
- fprintf(stderr, "of the converter files.\n");
- fprintf(stderr,
- " And the environment variable 'ICU_DATA' is ");
- fprintf(stderr, "not defined.\n");
- panic(XMLPlatformUtils::Panic_NoTransService);
- }
-
- ICUTransService::setICUPath(fgIntlPath);
return new ICUTransService;
-#else // Use Native transcoding service
+#else
+ // Use native transcoding services.
+ // same as -DXML_USE_INMEM_MESSAGELOADER
return new IconvTransService;
#endif
-}
+} // XMLPlatformUtils::makeTransService
+
+
//
---------------------------------------------------------------------------
// XMLPlatformUtils: The panic method
//
---------------------------------------------------------------------------
@@ -332,22 +344,23 @@
//
// We just print a message and exit
//
+
fprintf(stderr,
- "The XML4C system could not be initialized.\n");
+ "The Xerces-C system could not be initialized.\n");
fprintf(stderr,
- "The most likely reason for this failure is the inability to
find\n");
+ "If you are using ICU, then the most likely reason for this
failure\n");
fprintf(stderr,
- "the ICU coverter files, if you are using ICU. The converter
files\n");
+ "is the inability to find the ICU coverter files. The converter
files\n");
fprintf(stderr,
- "have the extension .cnv and exist in a directory 'icu/data'
relative\n");
+ "have the extension .cnv and exist in a directory 'icu/data'
relative\n");
fprintf(stderr,
- "to the XML4C shared library. If you have installed the
converter files\n");
+ "to the Xerces-C shared library. If you have installed the converter
files\n");
fprintf(stderr,
- "in a different location, you need to set up the environment
variable\n");
+ "in a different location, you need to set up the environment
variable\n");
fprintf(stderr,
- "'ICU_DATA' to point directly to the directory containing
the\n");
+ "'ICU_DATA' to point directly to the directory containing the\n");
fprintf(stderr,
- "converter files.\n");
+ "converter files.\n");
exit(-1);
}
@@ -477,12 +490,12 @@
// as Unicode always
//
char* newSrc = XMLString::transcode(srcPath);
+ ArrayJanitor<char> janText(newSrc);
// Use a local buffer that is big enough for the largest legal path.
// Note #1186: dirName() is not thread safe.
char* tmpPath = dirname(newSrc); // dirname() never returns NULL.
- delete [] newSrc;
char* newXMLString = new char[strlen(tmpPath) + 2];
ArrayJanitor<char> newJanitor(newXMLString);
@@ -516,9 +529,37 @@
// Mutex methods
// -----------------------------------------------------------------------
-#if !defined (APP_NO_THREADS)
+#if !defined(APP_NO_THREADS)
+void* XMLPlatformUtils::makeMutex()
+{
+ pthread_mutex_t* mutex = new pthread_mutex_t;
+ pthread_mutexattr_t* attr = new pthread_mutexattr_t;
+#if defined(XML_USE_DCE)
+ pthread_mutexattr_create(attr);
+ pthread_mutexattr_setkind_np(attr, MUTEX_RECURSIVE_NP);
+ if (pthread_mutex_init(mutex, *attr))
+ {
+ ThrowXML(XMLPlatformUtilsException,
+ XML4CExcepts::Mutex_CouldNotCreate);
+ }
+ pthread_mutexattr_delete(attr);
+#else
+ pthread_mutexattr_init(attr);
+ pthread_mutexattr_settype(attr, PTHREAD_MUTEX_RECURSIVE);
+ if (pthread_mutex_init(mutex, attr))
+ {
+ ThrowXML(XMLPlatformUtilsException,
+ XML4CExcepts::Mutex_CouldNotCreate);
+ }
+ pthread_mutexattr_destroy(attr);
+#endif
+ delete attr;
+
+ return (void*) mutex;
+}
+
void XMLPlatformUtils::closeMutex(void* const mtxHandle)
{
pthread_mutex_t* mutex = (pthread_mutex_t *) mtxHandle;
@@ -541,18 +582,6 @@
XML4CExcepts::Mutex_CouldNotLock);
}
}
-}
-
-void* XMLPlatformUtils::makeMutex()
-{
- pthread_mutex_t* mutex = new pthread_mutex_t;
-
- if (pthread_mutex_init(mutex, pthread_mutexattr_default))
- {
- ThrowXML(XMLPlatformUtilsException,
- XML4CExcepts::Mutex_CouldNotCreate);
- }
- return (void*) mutex;
}
void XMLPlatformUtils::unlockMutex(void* const mtxHandle)
1.3 +15 -16
xml-xerces/c/src/util/Platforms/Linux/LinuxPlatformUtils.cpp
Index: LinuxPlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/util/Platforms/Linux/LinuxPlatformUtils.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LinuxPlatformUtils.cpp 1999/11/17 22:35:33 1.2
+++ LinuxPlatformUtils.cpp 1999/11/23 02:00:48 1.3
@@ -56,6 +56,9 @@
/**
* $Log: LinuxPlatformUtils.cpp,v $
+ * Revision 1.3 1999/11/23 02:00:48 rahulj
+ * Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
+ *
* Revision 1.2 1999/11/17 22:35:33 rahulj
* Replaced default attr mutexes with recursive mutexes. Also code works
with ICU transcoding service
*
@@ -192,11 +195,10 @@
// Here you would also set the fgLibLocation global variable
// XMLPlatformUtils::fgLibLocation is the variable to be set
-
- static const char *sharedLibEnvVar = "LD_LIBRARY_PATH";
- static const char * libraryPath = 0;
- char libName[256];
+ static const char* sharedLibEnvVar = "LD_LIBRARY_PATH";
+ char* libraryPath = 0;
+ char libName[256];
// Construct the library name from the global variables
@@ -209,7 +211,7 @@
if (libEnvVar == NULL)
{
- panic( XMLPlatformUtils::Panic_NoTransService );
+ panic(XMLPlatformUtils::Panic_CantFindLib);
}
//
@@ -255,7 +257,7 @@
if (XMLPlatformUtils::fgLibLocation == NULL)
{
- panic( XMLPlatformUtils::Panic_NoTransService );
+ panic(XMLPlatformUtils::Panic_CantFindLib);
}
}
@@ -284,7 +286,7 @@
catch(...)
{
- panic( XMLPlatformUtils::Panic_NoDefTranscoder );
+ panic(XMLPlatformUtils::Panic_CantLoadMsgDomain);
}
return retVal;
}
@@ -322,7 +324,7 @@
}
ICUTransService::setICUPath(intlPath);
- if (intlPath != NULL) delete intlPath;
+ delete intlPath;
return new ICUTransService;
}
@@ -332,13 +334,8 @@
// converter files are stored relative to the Xerces-C library.
//
- char libName[256];
- strcpy(libName, XML4C_DLLName);
- strcat(libName, gXML4CVersionStr);
- strcat(libName, ".so");
-
unsigned int lent = strlen(XMLPlatformUtils::fgLibLocation) +
- strlen(libName) + strlen("/icu/data/") + 1;
+ strlen("/icu/data/") + 1;
intlPath = new char[lent];
strcpy(intlPath, XMLPlatformUtils::fgLibLocation);
strcat(intlPath, "/icu/data/");
@@ -509,7 +506,8 @@
ArrayJanitor<char> janText(newSrc);
// Use a local buffer that is big enough for the largest legal path
- char* tmpPath = dirname((char*)newSrc);
+ // Note #1186: dirName() is not thread safe.
+ char* tmpPath = dirname(newSrc);
if (!tmpPath)
{
ThrowXML(XMLPlatformUtilsException,
@@ -519,7 +517,8 @@
char* newXMLString = new char [strlen(tmpPath) +2];
ArrayJanitor<char> newJanitor(newXMLString);
strcpy(newXMLString, tmpPath);
- strcat(newXMLString , "/");
+ strcat(newXMLString , "/");
+
// Return a copy of the path, in Unicode format
return XMLString::transcode(newXMLString);
}
1.2 +5 -1 xml-xerces/c/src/util/Transcoders/ICU/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Transcoders/ICU/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:06:08 1.1
+++ Makefile.in 1999/11/23 02:00:54 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:06:08 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:00:54 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:06:08 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:34 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.2 +5 -1 xml-xerces/c/src/util/Transcoders/Iconv/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Transcoders/Iconv/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:06:11 1.1
+++ Makefile.in 1999/11/23 02:01:00 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:06:11 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:01:00 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:06:11 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:35 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
1.2 +5 -4 xml-xerces/c/src/validators/DTD/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/DTD/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 1999/11/09 01:03:42 1.1
+++ Makefile.in 1999/11/23 02:01:05 1.2
@@ -55,16 +55,20 @@
#
#
# $Log: Makefile.in,v $
-# Revision 1.1 1999/11/09 01:03:42 twl
-# Initial revision
+# Revision 1.2 1999/11/23 02:01:05 rahulj
+# Code now works under HPUX 11. Tested inmemory message loader.
Revamped makefiles. Builds with both DCE threads as well as pthread libraries.
#
+# Revision 1.1.1.1 1999/11/09 01:03:42 twl
+# Initial checkin
+#
# Revision 1.3 1999/11/08 20:45:43 rahul
# Swat for adding in Product name and CVS comment log variable.
#:
#
PLATFORM = @platform@
-COMPILER = @compiler@
+CC = @cc@
+CXX = @cxx@
CXXFLAGS = @cxxflags@
CFLAGS = @cflags@
PREFIX = @prefix@
@@ -138,9 +142,6 @@
$(RM) Makefile $(DEPFILE)
@echo "Removing all $(MODULE)/$(SUBMODULE) header files ..."
@for file in $(VALIDATORS_DTD_CPP_PUBHEADERS); do \
- rm -f $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)/$$file; \
- done
- @for file in $(VALIDATORS_DTD_C_FILES); do \
rm -f $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)/$$file; \
done
@echo "Removing all $(MODULE)/$(SUBMODULE) object files ..."
