From fdrake@users.sourceforge.net Thu Mar 1 03:19:29 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 19:19:29 -0800 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv10105/lib Modified Files: expat.h.in Log Message: Sam TH: BeOS defines __declspec, but we don't use it there. This closes SF tracker patch #403581. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** expat.h.in 2001/01/26 19:18:31 1.2 --- expat.h.in 2001/03/01 03:19:27 1.3 *************** *** 10,14 **** #ifndef XMLPARSEAPI ! # ifdef __declspec # define XMLPARSEAPI __declspec(dllimport) # else --- 10,14 ---- #ifndef XMLPARSEAPI ! # if defined(__declspec) && !defined(__BEOS__) # define XMLPARSEAPI __declspec(dllimport) # else From fdrake@users.sourceforge.net Thu Mar 1 03:44:47 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 19:44:47 -0800 Subject: [Expat-checkins] CVS: expat/lib expat.h,1.11,1.12 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv12024 Modified Files: expat.h Log Message: Updated version from config.h.in update (includes wrapping of lots of long lines). Index: expat.h =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** expat.h 2001/01/24 19:37:36 1.11 --- expat.h 2001/03/01 03:44:45 1.12 *************** *** 10,14 **** #ifndef XMLPARSEAPI ! # ifdef __declspec # define XMLPARSEAPI __declspec(dllimport) # else --- 10,14 ---- #ifndef XMLPARSEAPI ! # if defined(__declspec) && !defined(__BEOS__) # define XMLPARSEAPI __declspec(dllimport) # else *************** *** 131,149 **** } XML_Memory_Handling_Suite; ! /* Constructs a new parser; encoding is the encoding specified by the external ! protocol or null if there is none specified. */ XML_Parser XMLPARSEAPI XML_ParserCreate(const XML_Char *encoding); ! /* Constructs a new parser and namespace processor. Element type names ! and attribute names that belong to a namespace will be expanded; unprefixed attribute names are never expanded; unprefixed element type names are expanded only if there is a default namespace. The expanded ! name is the concatenation of the namespace URI, the namespace separator character, ! and the local part of the name. If the namespace separator is '\0' then ! the namespace URI and the local part will be concatenated without any ! separator. When a namespace is not declared, the name and prefix will be ! passed through without expansion. */ XML_Parser XMLPARSEAPI --- 131,149 ---- } XML_Memory_Handling_Suite; ! /* Constructs a new parser; encoding is the encoding specified by the ! external protocol or null if there is none specified. */ XML_Parser XMLPARSEAPI XML_ParserCreate(const XML_Char *encoding); ! /* Constructs a new parser and namespace processor. Element type ! names and attribute names that belong to a namespace will be expanded; unprefixed attribute names are never expanded; unprefixed element type names are expanded only if there is a default namespace. The expanded ! name is the concatenation of the namespace URI, the namespace ! separator character, and the local part of the name. If the namespace ! separator is '\0' then the namespace URI and the local part will be ! concatenated without any separator. When a namespace is not declared, ! the name and prefix will be passed through without expansion. */ XML_Parser XMLPARSEAPI *************** *** 306,317 **** The parser argument is the parser parsing the entity containing the reference; it can be passed as the parser argument to XML_ExternalEntityParserCreate. ! The systemId argument is the system identifier as specified in the entity declaration; ! it will not be null. The base argument is the system identifier that should be used as the base for resolving systemId if systemId was relative; this is set by XML_SetBase; it may be null. ! The publicId argument is the public identifier as specified in the entity declaration, ! or null if none was specified; the whitespace in the public identifier ! will have been normalized as required by the XML spec. The context argument specifies the parsing context in the format expected by the context argument to --- 306,317 ---- The parser argument is the parser parsing the entity containing the reference; it can be passed as the parser argument to XML_ExternalEntityParserCreate. ! The systemId argument is the system identifier as specified in the entity ! declaration; it will not be null. The base argument is the system identifier that should be used as the base for resolving systemId if systemId was relative; this is set by XML_SetBase; it may be null. ! The publicId argument is the public identifier as specified in the entity ! declaration, or null if none was specified; the whitespace in the public ! identifier will have been normalized as required by the XML spec. The context argument specifies the parsing context in the format expected by the context argument to *************** *** 320,326 **** The handler should return 0 if processing should not continue because of a fatal error in the handling of the external entity. ! In this case the calling parser will return an XML_ERROR_EXTERNAL_ENTITY_HANDLING ! error. ! Note that unlike other handlers the first argument is the parser, not userData. */ typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser, --- 320,327 ---- The handler should return 0 if processing should not continue because of a fatal error in the handling of the external entity. ! In this case the calling parser will return an ! XML_ERROR_EXTERNAL_ENTITY_HANDLING error. ! Note that unlike other handlers the first argument is the parser, not ! userData. */ typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser, *************** *** 335,339 **** The map[b] member gives information about byte sequences whose first byte is b. ! If map[b] is c where c is >= 0, then b by itself encodes the Unicode scalar value c. If map[b] is -1, then the byte sequence is malformed. If map[b] is -n, where n >= 2, then b is the first byte of an n-byte --- 336,341 ---- The map[b] member gives information about byte sequences whose first byte is b. ! If map[b] is c where c is >= 0, then b by itself encodes the Unicode scalar ! value c. If map[b] is -1, then the byte sequence is malformed. If map[b] is -n, where n >= 2, then b is the first byte of an n-byte *************** *** 428,433 **** XML_EndCdataSectionHandler end); ! /* This sets the default handler and also inhibits expansion of internal entities. ! The entity reference will be passed to the default handler. */ void XMLPARSEAPI --- 430,436 ---- XML_EndCdataSectionHandler end); ! /* This sets the default handler and also inhibits expansion of ! internal entities. The entity reference will be passed to the default ! handler. */ void XMLPARSEAPI *************** *** 435,440 **** XML_DefaultHandler handler); ! /* This sets the default handler but does not inhibit expansion of internal entities. ! The entity reference will not be passed to the default handler. */ void XMLPARSEAPI --- 438,444 ---- XML_DefaultHandler handler); ! /* This sets the default handler but does not inhibit expansion of ! internal entities. The entity reference will not be passed to the ! default handler. */ void XMLPARSEAPI *************** *** 498,502 **** processing instruction or character data. It causes the corresponding markup to be passed to the default handler. */ ! void XML_DefaultCurrent(XML_Parser parser); /* If do_nst is non-zero, and namespace processing is in effect, and --- 502,507 ---- processing instruction or character data. It causes the corresponding markup to be passed to the default handler. */ ! void XMLPARSEAPI ! XML_DefaultCurrent(XML_Parser parser); /* If do_nst is non-zero, and namespace processing is in effect, and *************** *** 535,542 **** XML_UseParserAsHandlerArg(XML_Parser parser); ! /* Sets the base to be used for resolving relative URIs in system identifiers in ! declarations. Resolving relative identifiers is left to the application: ! this value will be passed through as the base argument to the ! XML_ExternalEntityRefHandler, XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base argument will be copied. Returns zero if out of memory, non-zero otherwise. */ --- 540,547 ---- XML_UseParserAsHandlerArg(XML_Parser parser); ! /* Sets the base to be used for resolving relative URIs in system ! identifiers in declarations. Resolving relative identifiers is left ! to the application: this value will be passed through as the base ! argument to the XML_ExternalEntityRefHandler, XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base argument will be copied. Returns zero if out of memory, non-zero otherwise. */ *************** *** 577,593 **** XML_ParseBuffer(XML_Parser parser, int len, int isFinal); ! /* Creates an XML_Parser object that can parse an external general entity; ! context is a '\0'-terminated string specifying the parse context; ! encoding is a '\0'-terminated string giving the name of the externally specified encoding, ! or null if there is no externally specified encoding. ! The context string consists of a sequence of tokens separated by formfeeds (\f); ! a token consisting of a name specifies that the general entity of the name ! is open; a token of the form prefix=uri specifies the namespace for a particular ! prefix; a token of the form =uri specifies the default namespace. ! This can be called at any point after the first call to an ExternalEntityRefHandler ! so longer as the parser has not yet been freed. ! The new parser is completely independent and may safely be used in a separate thread. ! The handlers and userData are initialized from the parser argument. ! Returns 0 if out of memory. Otherwise returns a new XML_Parser object. */ XML_Parser XMLPARSEAPI XML_ExternalEntityParserCreate(XML_Parser parser, --- 582,600 ---- XML_ParseBuffer(XML_Parser parser, int len, int isFinal); ! /* Creates an XML_Parser object that can parse an external general ! entity; context is a '\0'-terminated string specifying the parse ! context; encoding is a '\0'-terminated string giving the name of the ! externally specified encoding, or null if there is no externally ! specified encoding. The context string consists of a sequence of ! tokens separated by formfeeds (\f); a token consisting of a name ! specifies that the general entity of the name is open; a token of the ! form prefix=uri specifies the namespace for a particular prefix; a ! token of the form =uri specifies the default namespace. This can be ! called at any point after the first call to an ! ExternalEntityRefHandler so longer as the parser has not yet been ! freed. The new parser is completely independent and may safely be ! used in a separate thread. The handlers and userData are initialized ! from the parser argument. Returns 0 if out of memory. Otherwise ! returns a new XML_Parser object. */ XML_Parser XMLPARSEAPI XML_ExternalEntityParserCreate(XML_Parser parser, *************** *** 679,683 **** of the current parse position, and sets the integer pointed to by size to the size of this buffer (the number of input bytes). Otherwise ! returns a null pointer. Also returns a null pointer if a parse isn't active. NOTE: The character pointer returned should not be used outside --- 686,691 ---- of the current parse position, and sets the integer pointed to by size to the size of this buffer (the number of input bytes). Otherwise ! returns a null pointer. Also returns a null pointer if a parse isn't ! active. NOTE: The character pointer returned should not be used outside From fdrake@users.sourceforge.net Thu Mar 1 03:47:14 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 19:47:14 -0800 Subject: [Expat-checkins] CVS: expat configure.in,1.10,1.11 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv12209 Modified Files: configure.in Log Message: Sam TH: Only configure makefiles in child directories that exist. [...and added explanation as to why this is useful -- FLD.] This closes SF tracker patch #403585. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** configure.in 2001/01/24 19:42:05 1.10 --- configure.in 2001/03/01 03:47:12 1.11 *************** *** 81,90 **** AC_SUBST(FILEMAP_OBJ) if test -z "$HAVE_MMAP"; then ! FILEMAP_OBJ=unixfilemap.o else ! FILEMAP_OBJ=readfilemap.o fi AC_CHECK_FUNCS(memmove bcopy) ! AC_OUTPUT(Makefile lib/Makefile lib/expat.h xmlwf/Makefile examples/Makefile) --- 81,105 ---- AC_SUBST(FILEMAP_OBJ) if test -z "$HAVE_MMAP"; then ! FILEMAP_OBJ=unixfilemap.o else ! FILEMAP_OBJ=readfilemap.o fi AC_CHECK_FUNCS(memmove bcopy) ! dnl Generate makefiles only for the directories that are present; ! dnl this allows this (and the generated configure script) to work ! dnl in "embedded distributions", where only part of the Expat sources ! dnl are included in the sources for another project. ! ! OUTPUT="Makefile lib/Makefile lib/expat.h" ! if test -d xmlwf; then ! OUTPUT="$OUTPUT xmlwf/Makefile" ! fi ! if test -d sample; then ! OUTPUT="$OUTPUT sample/Makefile" ! fi ! if test -d examples; then ! OUTPUT="$OUTPUT examples/Makefile" ! fi ! AC_OUTPUT($OUTPUT) From fdrake@users.sourceforge.net Thu Mar 1 04:04:28 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:04:28 -0800 Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.10,1.11 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv13701/lib Modified Files: Makefile.in Log Message: Sam TH: Remove gcc-specific cruft from the Makefile -- this hurts portability! This closes SF tracker patch #403584, and probably more platform-specific build process bugs than I care to think about. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/lib/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile.in 2001/01/24 19:41:12 1.10 --- Makefile.in 2001/03/01 04:04:26 1.11 *************** *** 108,129 **** .c.o: ! @echo '$(COMPILE) -c $<'; \ ! $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-cp .deps/$(*F).pp .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm .deps/$(*F).pp .c.lo: ! @echo '$(LTCOMPILE) -c $<'; \ ! test -d .deps || mkdir .deps ; \ ! $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< ! @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ ! < .deps/$(*F).pp > .deps/$(*F).P; \ ! tr ' ' '\012' < .deps/$(*F).pp \ ! | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ ! >> .deps/$(*F).P; \ ! rm -f .deps/$(*F).pp Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status --- 108,115 ---- .c.o: ! $(COMPILE) -c $< .c.lo: ! $(LTCOMPILE) -c $< Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status From fdrake@users.sourceforge.net Thu Mar 1 04:07:22 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:07:22 -0800 Subject: [Expat-checkins] CVS: expat configure.in,1.11,1.12 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv13972 Modified Files: configure.in Log Message: There is no sample/Makefile.in, so do not try to generate sample/Makefile even if the directory exists. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** configure.in 2001/03/01 03:47:12 1.11 --- configure.in 2001/03/01 04:07:20 1.12 *************** *** 97,103 **** OUTPUT="$OUTPUT xmlwf/Makefile" fi - if test -d sample; then - OUTPUT="$OUTPUT sample/Makefile" - fi if test -d examples; then OUTPUT="$OUTPUT examples/Makefile" --- 97,100 ---- From fdrake@users.sourceforge.net Thu Mar 1 04:13:36 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:13:36 -0800 Subject: [Expat-checkins] CVS: expat/sample .cvsignore,NONE,1.1 Makefile.in,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/sample In directory usw-pr-cvs1:/tmp/cvs-serv14659 Added Files: .cvsignore Makefile.in Log Message: Sam TH: Add a Makefile.in for the sample application. FLD: Tell CVS to ignore the generated Makefile. This closes SF tracker patch #403583. --- NEW FILE --- Makefile --- NEW FILE --- ################################################################ # Process this file with top-level configure script to produce Makefile # # Copyright 2000 Clark Cooper # # This file is part of EXPAT. # # EXPAT is free software; you can redistribute it and/or modify it # under the terms of the License (based on the MIT/X license) contained # in the file COPYING that comes with this distribution. # # EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT. # LIBDIR = ../lib/.libs INCDIR = ../lib LDFLAGS = @LDFLAGS@ -static LIBS = -L$(LIBDIR) -lexpat CFLAGS = @CFLAGS@ -I$(INCDIR) srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ all: elements elements: elements.o $(CC) -o elements elements.o $(LDFLAGS) $(LIBS) clean: rm -f elements core *.o From fdrake@users.sourceforge.net Thu Mar 1 04:14:25 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:14:25 -0800 Subject: [Expat-checkins] CVS: expat configure.in,1.12,1.13 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv14759 Modified Files: configure.in Log Message: Spoke to soon -- one of the patches added a Makefile.in to the sample/ directory, so we do need to configure it. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** configure.in 2001/03/01 04:07:20 1.12 --- configure.in 2001/03/01 04:14:23 1.13 *************** *** 97,100 **** --- 97,103 ---- OUTPUT="$OUTPUT xmlwf/Makefile" fi + if test -d sample; then + OUTPUT="$OUTPUT sample/Makefile" + fi if test -d examples; then OUTPUT="$OUTPUT examples/Makefile" From fdrake@users.sourceforge.net Thu Mar 1 04:18:30 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:18:30 -0800 Subject: [Expat-checkins] CVS: expat/sample elements.c,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/sample In directory usw-pr-cvs1:/tmp/cvs-serv15093 Modified Files: elements.c Log Message: Sam TH: Use the current name for the Expat header file. This is part of SF tracker patch #403582. Index: elements.c =================================================================== RCS file: /cvsroot/expat/expat/sample/elements.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** elements.c 2000/04/21 04:20:31 1.3 --- elements.c 2001/03/01 04:18:28 1.4 *************** *** 5,9 **** #include ! #include "xmlparse.h" void startElement(void *userData, const char *name, const char **atts) --- 5,9 ---- #include ! #include "expat.h" void startElement(void *userData, const char *name, const char **atts) From fdrake@users.sourceforge.net Thu Mar 1 04:28:29 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:28:29 -0800 Subject: [Expat-checkins] CVS: expat/examples Makefile.in,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv16259/examples Modified Files: Makefile.in Log Message: Sam TH: Fix a variety of build control problems for the auxiliary directories. This closes SF tracker patch #403582. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/examples/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.in 2000/09/18 16:26:21 1.1 --- Makefile.in 2001/03/01 04:28:27 1.2 *************** *** 19,29 **** # CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ ! LIBS = -lexpat ! CFLAGS = @CFLAGS@ all: outline outline: outline.o ! $(CC) -o outline outline.o $(LDFLAGS) $(LIBS) \ No newline at end of file --- 19,40 ---- # + LIBDIR = ../lib/.libs + INCDIR = ../lib + CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ -static ! LIBS = -L$(LIBDIR) -lexpat ! CFLAGS = @CFLAGS@ -I$(INCDIR) ! ! srcdir = @srcdir@ ! top_srcdir = @top_srcdir@ ! VPATH = @srcdir@ + all: outline outline: outline.o ! $(CC) -o outline outline.o $(LDFLAGS) $(LIBS) ! ! clean: ! rm -f outline core *.o From fdrake@users.sourceforge.net Thu Mar 1 04:28:29 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:28:29 -0800 Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv16259/xmlwf Modified Files: Makefile.in Log Message: Sam TH: Fix a variety of build control problems for the auxiliary directories. This closes SF tracker patch #403582. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.in 2000/09/28 19:47:34 1.2 --- Makefile.in 2001/03/01 04:28:27 1.3 *************** *** 1,6 **** LIBDIR= ../lib/.libs INCDIR= ../lib ! LDFLAGS= @LDFLAGS@ CFLAGS= @CFLAGS@ -I$(INCDIR) --- 1,26 ---- + ################################################################ + # Process this file with top-level configure script to produce Makefile + # + # Copyright 2000 Clark Cooper + # + # This file is part of EXPAT. + # + # EXPAT is free software; you can redistribute it and/or modify it + # under the terms of the License (based on the MIT/X license) contained + # in the file COPYING that comes with this distribution. + # + # EXPAT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + # SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT. + # + LIBDIR= ../lib/.libs INCDIR= ../lib ! LDFLAGS= @LDFLAGS@ -static CFLAGS= @CFLAGS@ -I$(INCDIR) *************** *** 9,15 **** LIBS= -L$(LIBDIR) -lexpat xmlwf: $(OBJS) $(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS) clean: ! rm -f xmlwf core *.o \ No newline at end of file --- 29,40 ---- LIBS= -L$(LIBDIR) -lexpat + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + VPATH = @srcdir@ + + xmlwf: $(OBJS) $(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS) clean: ! rm -f xmlwf core *.o From fdrake@users.sourceforge.net Thu Mar 1 04:28:29 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:28:29 -0800 Subject: [Expat-checkins] CVS: expat Makefile.in,1.6,1.7 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv16259 Modified Files: Makefile.in Log Message: Sam TH: Fix a variety of build control problems for the auxiliary directories. This closes SF tracker patch #403582. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Makefile.in 2000/12/27 18:08:15 1.6 --- Makefile.in 2001/03/01 04:28:27 1.7 *************** *** 77,81 **** VERSION = @VERSION@ ! SUBDIRS = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 CONFIG_HEADERS = config.h:config.hin --- 77,81 ---- VERSION = @VERSION@ ! SUBDIRS = lib examples sample xmlwf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 CONFIG_HEADERS = config.h:config.hin *************** *** 84,87 **** --- 84,89 ---- DISTRIBUTION = $(DISTDIR).tar.gz + buildlib: lib + all: $(SUBDIRS) *************** *** 120,124 **** cd $$dir; $(MAKE) distclean; cd ..; \ done ! rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile maintainer-clean: distclean --- 122,126 ---- cd $$dir; $(MAKE) distclean; cd ..; \ done ! rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile sample/Makefile maintainer-clean: distclean From fdrake@users.sourceforge.net Thu Mar 1 04:43:25 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Feb 2001 20:43:25 -0800 Subject: [Expat-checkins] CVS: expat expat.spec,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv17715 Added Files: expat.spec Log Message: Added .spec file for building RPMs; contributed by Sean Reifschneider. Minor changes to reflect build process updates and bump the version number for the next release; remove the "tummy" suffix from the RPM version since this is part of the stock package. --- NEW FILE --- %define version 1.95.2 %define release 1 Summary: Expat is an XML 1.0 parser written in C. Name: expat Version: %{version} Release: %{release} Copyright: Mozilla or GPL Group: Utilities/parsers URL: http://expat.sourceforge.net/ Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz BuildRoot: /var/tmp/%{name}-buildroot %description Expat is an XML 1.0 parser written in C by James Clark. It aims to be fully conforming. It is currently not a validating XML parser. %prep %setup %build ./configure make lib xmlwf %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/bin mkdir -p $RPM_BUILD_ROOT/usr/lib mkdir -p $RPM_BUILD_ROOT/usr/include make install prefix=$RPM_BUILD_ROOT/usr install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf %files %doc COPYING Changes MANIFEST README doc/reference.html doc/style.css /usr/bin/xmlwf /usr/lib /usr/include %changelog * Sun Feb 18 2001 Sean Reifschneider [Release 1.95.1-1tummy] - Updated to 1.95.1 release. - Removed the "/usr/include/expat" directory for headers, as it now uses "expat.h" instead of "xmlparser.h". * Thu Jan 25 2001 Sean Reifschneider [Release 1.1-3tummy] - Moved xmlparse.h into "/usr/include/expat" directory to prevent conflict with w3c-libwww-devel package. * Wed Sep 6 2000 Sean Reifschneider - Modified to install into /usr. - Modified to use RPM_BUILD_ROOT instead of writing directly to install location. From fdrake@users.sourceforge.net Sat Mar 3 07:20:06 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 02 Mar 2001 23:20:06 -0800 Subject: [Expat-checkins] CVS: expat expat.spec,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv25261 Modified Files: expat.spec Log Message: Update the license type; error pointed out by Greg Stein. Index: expat.spec =================================================================== RCS file: /cvsroot/expat/expat/expat.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** expat.spec 2001/03/01 04:43:23 1.1 --- expat.spec 2001/03/03 07:20:04 1.2 *************** *** 6,10 **** Version: %{version} Release: %{release} ! Copyright: Mozilla or GPL Group: Utilities/parsers URL: http://expat.sourceforge.net/ --- 6,10 ---- Version: %{version} Release: %{release} ! Copyright: MIT/X Group: Utilities/parsers URL: http://expat.sourceforge.net/ From gstein@usw-pr-cvs1.sourceforge.net Sat Mar 10 15:41:52 2001 From: gstein@usw-pr-cvs1.sourceforge.net (Greg Stein) Date: Sat, 10 Mar 2001 07:41:52 -0800 Subject: [Expat-checkins] CVS: expat/conftools .cvsignore,NONE,1.1 PrintPath,NONE,1.1 config.guess,1.1,NONE config.sub,1.1,NONE ltconfig,1.1,NONE ltmain.sh,1.2,NONE Message-ID: Update of /cvsroot/expat/expat/conftools In directory usw-pr-cvs1:/tmp/cvs-serv4034/conftools Added Files: .cvsignore PrintPath Removed Files: config.guess config.sub ltconfig ltmain.sh Log Message: Revamp config/build to keep generated files out of CVS (some libtool files were out of date, and we've previously seen expat.h out of sync). *) Use new script "buildconf.sh" to create the set of generated files (aclocal.m4, config.h.in, configure). This is intended to be used by developers (rerun when configure.in changes) and just before a release (releases include these outputs). Developers now need the "autoconf" and "libtool" packages. *) config.h.in is now built by autoheader and includes bits from acconfig.h rather than manual construction/maintenance. (renamed from config.hin) *) added conftools/PrintPath from the ASF; it is a portable "which" *) added "extraclean" target to top-level Makefile to get rid of all generated files (return to pure CVS state; before buildconf.sh) *) updates various bits for config.hin -> config.h.in rename *) no longer need to delete the ".deps" subdir since we don't create it anymore (dependencies are explicit rather than auto-generated). --- NEW FILE --- config.guess config.sub ltconfig ltmain.sh --- NEW FILE --- #!/bin/sh # Look for program[s] somewhere in $PATH. # # Options: # -s # Do not print out full pathname. (silent) # -pPATHNAME # Look in PATHNAME instead of $PATH # # Usage: # PrintPath [-s] [-pPATHNAME] program [program ...] # # Initially written by Jim Jagielski for the Apache configuration mechanism # (with kudos to Kernighan/Pike) # # This script falls under the Apache License. # See http://www.apache.org/licenses/LICENSE ## # Some "constants" ## pathname=$PATH echo="yes" ## # Find out what OS we are running for later on ## os=`(uname) 2>/dev/null` ## # Parse command line ## for args in $* do case $args in -s ) echo="no" ;; -p* ) pathname="`echo $args | sed 's/^..//'`" ;; * ) programs="$programs $args" ;; esac done ## # Now we make the adjustments required for OS/2 and everyone # else :) # # First of all, all OS/2 programs have the '.exe' extension. # Next, we adjust PATH (or what was given to us as PATH) to # be whitespace seperated directories. # Finally, we try to determine the best flag to use for # test/[] to look for an executable file. OS/2 just has '-r' # but with other OSs, we do some funny stuff to check to see # if test/[] knows about -x, which is the prefered flag. ## if [ "x$os" = "xOS/2" ] then ext=".exe" pathname=`echo -E $pathname | sed 's/^;/.;/ s/;;/;.;/g s/;$/;./ s/;/ /g s/\\\\/\\//g' ` test_exec_flag="-r" else ext="" # No default extensions pathname=`echo $pathname | sed 's/^:/.:/ s/::/:.:/g s/:$/:./ s/:/ /g' ` # Here is how we test to see if test/[] can handle -x testfile="pp.t.$$" cat > $testfile </dev/null`; then test_exec_flag="-x" else test_exec_flag="-r" fi rm -f $testfile fi for program in $programs do for path in $pathname do if [ $test_exec_flag $path/${program}${ext} ] && \ [ ! -d $path/${program}${ext} ]; then if [ "x$echo" = "xyes" ]; then echo $path/${program}${ext} fi exit 0 fi # Next try without extension (if one was used above) if [ "x$ext" != "x" ]; then if [ $test_exec_flag $path/${program} ] && \ [ ! -d $path/${program} ]; then if [ "x$echo" = "xyes" ]; then echo $path/${program} fi exit 0 fi fi done done exit 1 --- config.guess DELETED --- --- config.sub DELETED --- --- ltconfig DELETED --- --- ltmain.sh DELETED --- From gstein@usw-pr-cvs1.sourceforge.net Sat Mar 10 15:41:52 2001 From: gstein@usw-pr-cvs1.sourceforge.net (Greg Stein) Date: Sat, 10 Mar 2001 07:41:52 -0800 Subject: [Expat-checkins] CVS: expat/lib .cvsignore,1.1,1.2 Makefile.in,1.11,1.12 expat.h,1.12,NONE Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv4034/lib Modified Files: .cvsignore Makefile.in Removed Files: expat.h Log Message: Revamp config/build to keep generated files out of CVS (some libtool files were out of date, and we've previously seen expat.h out of sync). *) Use new script "buildconf.sh" to create the set of generated files (aclocal.m4, config.h.in, configure). This is intended to be used by developers (rerun when configure.in changes) and just before a release (releases include these outputs). Developers now need the "autoconf" and "libtool" packages. *) config.h.in is now built by autoheader and includes bits from acconfig.h rather than manual construction/maintenance. (renamed from config.hin) *) added conftools/PrintPath from the ASF; it is a portable "which" *) added "extraclean" target to top-level Makefile to get rid of all generated files (return to pure CVS state; before buildconf.sh) *) updates various bits for config.hin -> config.h.in rename *) no longer need to delete the ".deps" subdir since we don't create it anymore (dependencies are explicit rather than auto-generated). Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/lib/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** .cvsignore 2000/10/30 21:25:05 1.1 --- .cvsignore 2001/03/10 15:41:50 1.2 *************** *** 1,3 **** Makefile - .deps .libs --- 1,5 ---- Makefile .libs + *.lo + *.la + expat.h Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/lib/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Makefile.in 2001/03/01 04:04:26 1.11 --- Makefile.in 2001/03/10 15:41:50 1.12 *************** *** 120,129 **** cd $(top_builddir) && $(MAKE) config.status ! $(top_builddir)/config.h: $(top_builddir)/config.hin cd $(top_builddir) && $(MAKE) config.h clean: rm -f $(LIBRARY) *.o *.lo *~ ! rm -rf .libs _libs .deps distclean: clean --- 120,129 ---- cd $(top_builddir) && $(MAKE) config.status ! $(top_builddir)/config.h: $(top_builddir)/config.h.in cd $(top_builddir) && $(MAKE) config.h clean: rm -f $(LIBRARY) *.o *.lo *~ ! rm -rf .libs _libs distclean: clean --- expat.h DELETED --- From gstein@usw-pr-cvs1.sourceforge.net Sat Mar 10 15:41:52 2001 From: gstein@usw-pr-cvs1.sourceforge.net (Greg Stein) Date: Sat, 10 Mar 2001 07:41:52 -0800 Subject: [Expat-checkins] CVS: expat acconfig.h,NONE,1.1 buildconf.sh,NONE,1.1 .cvsignore,1.3,1.4 Makefile.in,1.7,1.8 configure.in,1.13,1.14 aclocal.m4,1.1,NONE config.hin,1.4,NONE Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv4034 Modified Files: .cvsignore Makefile.in configure.in Added Files: acconfig.h buildconf.sh Removed Files: aclocal.m4 config.hin Log Message: Revamp config/build to keep generated files out of CVS (some libtool files were out of date, and we've previously seen expat.h out of sync). *) Use new script "buildconf.sh" to create the set of generated files (aclocal.m4, config.h.in, configure). This is intended to be used by developers (rerun when configure.in changes) and just before a release (releases include these outputs). Developers now need the "autoconf" and "libtool" packages. *) config.h.in is now built by autoheader and includes bits from acconfig.h rather than manual construction/maintenance. (renamed from config.hin) *) added conftools/PrintPath from the ASF; it is a portable "which" *) added "extraclean" target to top-level Makefile to get rid of all generated files (return to pure CVS state; before buildconf.sh) *) updates various bits for config.hin -> config.h.in rename *) no longer need to delete the ".deps" subdir since we don't create it anymore (dependencies are explicit rather than auto-generated). --- NEW FILE --- /* This file is used by autoheader to add items to expat_config.h.in */ #ifdef WORDS_BIGENDIAN #define XML_BYTE_ORDER 21 #else #define XML_BYTE_ORDER 12 #endif @BOTTOM@ #define XML_NS #define XML_DTD #define XML_CONTEXT_BYTES 1024 #ifndef HAVE_MEMMOVE #ifdef HAVE_BCOPY #define memmove(d,s,l) bcopy((s),(d),(l)) #else #define memmove(d,s,l) ;punting on memmove; #endif #endif --- NEW FILE --- #! /bin/sh # # Build aclocal.m4 from libtool's libtool.m4 # ltpath=`conftools/PrintPath libtoolize` ltpath=`dirname $ltpath` ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 echo "Incorporating $ltfile into aclocal.m4 ..." echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4 echo "dnl edits here will be lost" >> aclocal.m4 cat $ltfile >> aclocal.m4 # # Create the libtool helper files # # Note: we always replace the files, and we copy (rather than link) them. # echo "Copying libtool helper files ..." $ltpath/libtoolize --force --copy # # Generate the autoconf header template (config.h.in) and ./configure # echo "Creating config.h.in ..." autoheader echo "Creating configure ..." ### do some work to toss config.cache? autoconf Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** .cvsignore 2000/09/18 16:26:20 1.3 --- .cvsignore 2001/03/10 15:41:49 1.4 *************** *** 1,7 **** --- 1,9 ---- Makefile + aclocal.m4 configure config.cache config.log config.status + config.h.in config.h expat-[0-9]*.[0-9]* *************** *** 9,11 **** libtool *~ - --- 11,12 ---- Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Makefile.in 2001/03/01 04:28:27 1.7 --- Makefile.in 2001/03/10 15:41:49 1.8 *************** *** 79,83 **** SUBDIRS = lib examples sample xmlwf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! CONFIG_HEADERS = config.h:config.hin DISTDIR = $(PACKAGE)-$(VERSION) --- 79,83 ---- SUBDIRS = lib examples sample xmlwf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! CONFIG_HEADERS = config.h DISTDIR = $(PACKAGE)-$(VERSION) *************** *** 88,94 **** all: $(SUBDIRS) - .PHONY: all $(SUBDIRS) clean distclean maintainer-clean dist install \ - uninstall distdir - Makefile: Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) config.status --- 88,91 ---- *************** *** 104,115 **** $(AUTOCONF) ! config.h: config.hin config.status CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \ $(SHELL) ./config.status ! $(SUBDIRS): config.status cd $@; $(MAKE) - clean: @list='$(SUBDIRS)'; for dir in $$list; do \ --- 101,111 ---- $(AUTOCONF) ! config.h: config.h.in config.status CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \ $(SHELL) ./config.status ! $(SUBDIRS): cd $@; $(MAKE) clean: @list='$(SUBDIRS)'; for dir in $$list; do \ *************** *** 122,127 **** cd $$dir; $(MAKE) distclean; cd ..; \ done ! rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile sample/Makefile maintainer-clean: distclean rm -f $(DISTRIBUTION) --- 118,129 ---- cd $$dir; $(MAKE) distclean; cd ..; \ done ! rm -f config.h config.status config.log config.cache libtool ! rm -f Makefile examples/Makefile xmlwf/Makefile sample/Makefile + extraclean: distclean + rm -f aclocal.m4 config.h.in configure + rm -f conftools/config.guess conftools/config.sub + rm -f conftools/ltconfig conftools/ltmain.sh + maintainer-clean: distclean rm -f $(DISTRIBUTION) *************** *** 149,150 **** --- 151,157 ---- cd $$dir; $(MAKE) uninstall; cd ..; \ done + + .PHONY: buildlib all $(SUBDIRS) \ + clean distclean extraclean maintainer-clean \ + dist distdir \ + install uninstall Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** configure.in 2001/03/01 04:14:23 1.13 --- configure.in 2001/03/10 15:41:49 1.14 *************** *** 44,48 **** LIBAGE=1 ! AC_CONFIG_HEADER(config.h:config.hin) AC_LIBTOOL_WIN32_DLL --- 44,48 ---- LIBAGE=1 ! AC_CONFIG_HEADER(config.h) AC_LIBTOOL_WIN32_DLL *************** *** 79,83 **** AC_FUNC_MEMCMP AC_FUNC_MMAP ! AC_SUBST(FILEMAP_OBJ) if test -z "$HAVE_MMAP"; then FILEMAP_OBJ=unixfilemap.o --- 79,83 ---- AC_FUNC_MEMCMP AC_FUNC_MMAP ! if test -z "$HAVE_MMAP"; then FILEMAP_OBJ=unixfilemap.o *************** *** 85,88 **** --- 85,89 ---- FILEMAP_OBJ=readfilemap.o fi + AC_SUBST(FILEMAP_OBJ) AC_CHECK_FUNCS(memmove bcopy) --- aclocal.m4 DELETED --- --- config.hin DELETED --- From fdrake@usw-pr-cvs1.sourceforge.net Tue Mar 13 17:27:17 2001 From: fdrake@usw-pr-cvs1.sourceforge.net (Fred L. Drake) Date: Tue, 13 Mar 2001 09:27:17 -0800 Subject: [Expat-checkins] CVS: expat MANIFEST,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv28487 Modified Files: MANIFEST Log Message: Update the MANIFEST to reflect Greg's recent changes. Index: MANIFEST =================================================================== RCS file: /cvsroot/expat/expat/MANIFEST,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MANIFEST 2000/12/27 18:08:15 1.2 --- MANIFEST 2001/03/13 17:27:15 1.3 *************** *** 4,16 **** Makefile.in README - aclocal.m4 - config.hin configure configure.in ! conftools/config.guess ! conftools/config.sub conftools/install-sh - conftools/ltconfig - conftools/ltmain.sh conftools/missing conftools/mkinstalldirs --- 4,11 ---- Makefile.in README configure configure.in ! conftools/PrintPath conftools/install-sh conftools/missing conftools/mkinstalldirs *************** *** 23,27 **** lib/asciitab.h lib/expat.dsp - lib/expat.h lib/iasciitab.h lib/latin1tab.h --- 18,21 ---- From fdrake@users.sourceforge.net Thu Mar 29 05:21:59 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 28 Mar 2001 21:21:59 -0800 Subject: [Expat-checkins] CVS: expat/xmlwf .cvsignore,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv26840/xmlwf Modified Files: .cvsignore Log Message: Sam TH : Tell CVS to ignore the generated executable. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** .cvsignore 2000/10/30 21:25:05 1.3 --- .cvsignore 2001/03/29 05:21:57 1.4 *************** *** 3,4 **** --- 3,5 ---- xmlwf.plg Makefile + xmlwf