You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jb...@apache.org on 2001/06/05 21:42:27 UTC
cvs commit: xml-xerces/c/samples/DOMPrint DOMPrint.cpp
jberry 01/06/05 12:42:27
Modified: c/samples Makefile.incl configure configure.in runConfigure
c/samples/DOMPrint DOMPrint.cpp
Log:
Add support for Mac OS X command line configuration and build.
Small tweak to DOMPrint to start to illustrate getErrorCount API.
Revision Changes Path
1.28 +12 -2 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.incl 2001/02/13 13:10:47 1.27
+++ Makefile.incl 2001/06/05 19:42:26 1.28
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.27 2001/02/13 13:10:47 tng Exp $
+# $Id: Makefile.incl,v 1.28 2001/06/05 19:42:26 jberry Exp $
#
################## LIBRARY NAMES AND DIRECTORIES ##################
@@ -245,12 +245,22 @@
LIBRARY_SEARCH_PATHS=
endif
+
#=============== TRU64 SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, TRU64)
CMP= -c ${CXXFLAGS}
CC = cxx -c -D${PLATFORM}
LINK = cxx -D${PLATFORM}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
-
SHLIBSUFFIX=.so
+endif
+
+
+#=============== MacOS SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, MACOSX)
+ CMP= -c ${CXXFLAGS}
+ CC= c++ -c -D${PLATFORM}
+ LINK = c++ -D${PLATFORM}
+ PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
+ SHLIBSUFFIX=.dylib
endif
1.14 +6 -5 xml-xerces/c/samples/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- configure 2001/05/17 15:27:38 1.13
+++ configure 2001/06/05 19:42:26 1.14
@@ -1,7 +1,7 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
+# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -1260,7 +1260,7 @@
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
-
+
else
echo "$ac_t""no" 1>&6
fi
@@ -1305,7 +1305,8 @@
*-*-solaris*) platform=SOLARIS ;;
*-*-sysv5*) platform=UNIXWARE ;;
*-*-UnixWare*) platform=UNIXWARE ;;
- *-*-unixware*) platform=UNIXWARE ;;
+ *-*-*unixware*) platform=UNIXWARE ;;
+ *-*-sysv5uw7*) platform=UNIXWARE ;;
*-*-linux*) platform=LINUX ;;
*-*-irix*) platform=IRIX ;;
*-*-aix*) platform=AIX ;;
@@ -1319,6 +1320,7 @@
*-*-os400*) platform=OS400 ;;
*-*-OS400*) platform=OS400 ;;
*-*-osf*) platform=TRU64 ;;
+ *-apple-*) platform=MACOSX ;;
*) platform=UNKNOWN ;;
esac
@@ -1333,7 +1335,7 @@
cflags=${CFLAGS}
-ldflags=${LDFLAGS}
+
trap '' 1 2 15
cat > confcache <<\EOF
@@ -1511,7 +1513,6 @@
s%@compiler@%$compiler%g
s%@cxxflags@%$cxxflags%g
s%@cflags@%$cflags%g
-s%@ldflags@%$ldflags%g
CEOF
EOF
1.12 +1 -0 xml-xerces/c/samples/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure.in 2001/05/17 15:27:39 1.11
+++ configure.in 2001/06/05 19:42:26 1.12
@@ -48,6 +48,7 @@
*-*-os400*) platform=OS400 ;;
*-*-OS400*) platform=OS400 ;;
*-*-osf*) platform=TRU64 ;;
+ *-apple-*) platform=MACOSX ;;
*) platform=UNKNOWN ;;
esac
AC_SUBST(platform)
1.16 +3 -3 xml-xerces/c/samples/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/runConfigure,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- runConfigure 2001/02/13 13:10:48 1.15
+++ runConfigure 2001/06/05 19:42:26 1.16
@@ -58,7 +58,7 @@
#
#
-# $Id: runConfigure,v 1.15 2001/02/13 13:10:48 tng Exp $
+# $Id: runConfigure,v 1.16 2001/06/05 19:42:26 jberry Exp $
#
#
@@ -71,7 +71,7 @@
echo "Usage: runConfigure \"options\""
echo " where options may be any of the following:"
echo " -p <platform> (accepts 'aix', 'unixware', 'linux', 'solaris',
-'hp-10', 'hp-11', 'os400', 'irix', 'ptx', 'tru64')"
+'hp-10', 'hp-11', 'os400', 'irix', 'ptx', 'tru64', 'macosx')"
echo " -c <C compiler name> (e.g. gcc, xlc or icc)"
echo " -x <C++ compiler name> (e.g. g++, xlC, or icc)"
echo " -d (specifies that you want to build debug version)"
@@ -167,7 +167,7 @@
# Now check if the options are correct or not, bail out if incorrect
case $platform in
- aix | unixware | linux | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64)
+ aix | unixware | linux | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx)
# platform has been recognized
;;
*)
1.32 +4 -1 xml-xerces/c/samples/DOMPrint/DOMPrint.cpp
Index: DOMPrint.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/DOMPrint/DOMPrint.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DOMPrint.cpp 2001/05/17 15:27:58 1.31
+++ DOMPrint.cpp 2001/06/05 19:42:27 1.32
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMPrint.cpp,v 1.31 2001/05/17 15:27:58 tng Exp $
+ * $Id: DOMPrint.cpp,v 1.32 2001/06/05 19:42:27 jberry Exp $
*/
@@ -437,6 +437,9 @@
try
{
parser->parse(gXmlFile);
+ int errorCount = parser->getErrorCount();
+ if (errorCount > 0)
+ errorsOccured = true;
}
catch (const XMLException& e)
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org