From fdrake@users.sourceforge.net Sat Jul 21 03:28:30 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 20 Jul 2001 19:28:30 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv13217/lib Modified Files: expat.h.in Log Message: Avoid specifying XMLPARSEAPI in the middle of a prototype's return value; some compilers that expand XMLPARSEAPI to a non-empty value complain. This closes SF patch #412076. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** expat.h.in 2001/03/01 03:19:27 1.3 --- expat.h.in 2001/07/21 02:28:28 1.4 *************** *** 550,554 **** XML_SetBase(XML_Parser parser, const XML_Char *base); ! const XML_Char XMLPARSEAPI * XML_GetBase(XML_Parser parser); --- 550,554 ---- XML_SetBase(XML_Parser parser, const XML_Char *base); ! const XML_Char * XMLPARSEAPI XML_GetBase(XML_Parser parser); *************** *** 576,580 **** XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); ! void XMLPARSEAPI * XML_GetBuffer(XML_Parser parser, int len); --- 576,580 ---- XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); ! void * XMLPARSEAPI XML_GetBuffer(XML_Parser parser, int len); *************** *** 692,696 **** the handler that makes the call. */ ! const char XMLPARSEAPI * XML_GetInputContext(XML_Parser parser, int *offset, --- 692,696 ---- the handler that makes the call. */ ! const char * XMLPARSEAPI XML_GetInputContext(XML_Parser parser, int *offset, *************** *** 707,715 **** /* Returns a string describing the error. */ ! const XML_LChar XMLPARSEAPI * XML_ErrorString(int code); /* Return a string containing the version number of this expat */ ! const XML_LChar XMLPARSEAPI * XML_ExpatVersion(void); --- 707,715 ---- /* Returns a string describing the error. */ ! const XML_LChar * XMLPARSEAPI XML_ErrorString(int code); /* Return a string containing the version number of this expat */ ! const XML_LChar * XMLPARSEAPI XML_ExpatVersion(void); From fdrake@users.sourceforge.net Sat Jul 21 04:37:14 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 20 Jul 2001 20:37:14 -0700 Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.12,1.13 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv28061/lib Modified Files: Makefile.in Log Message: Support building from directories other than the source directory. Patch contributed by Mo DeJong -- thanks! This closes SF patch #431340. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/lib/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** Makefile.in 2001/03/10 15:41:50 1.12 --- Makefile.in 2001/07/21 03:37:12 1.13 *************** *** 78,82 **** CONFIG_CLEAN_FILES = ! INCLUDES = -I$(srcdir) -I.. DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"' --- 78,82 ---- CONFIG_CLEAN_FILES = ! INCLUDES = -I$(srcdir) -I. -I.. DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"' From fdrake@users.sourceforge.net Sat Jul 21 04:37:14 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 20 Jul 2001 20:37:14 -0700 Subject: [Expat-checkins] CVS: expat configure.in,1.14,1.15 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv28061 Modified Files: configure.in Log Message: Support building from directories other than the source directory. Patch contributed by Mo DeJong -- thanks! This closes SF patch #431340. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** configure.in 2001/03/10 15:41:49 1.14 --- configure.in 2001/07/21 03:37:11 1.15 *************** *** 95,105 **** 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 --- 95,105 ---- OUTPUT="Makefile lib/Makefile lib/expat.h" ! if test -d ${srcdir}/xmlwf; then OUTPUT="$OUTPUT xmlwf/Makefile" fi ! if test -d ${srcdir}/sample; then OUTPUT="$OUTPUT sample/Makefile" fi ! if test -d ${srcdir}/examples; then OUTPUT="$OUTPUT examples/Makefile" fi From fdrake@users.sourceforge.net Tue Jul 24 17:00:54 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 09:00:54 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv15460 Modified Files: expat.h.in Log Message: The previous checkin of expat.h.in broke the build for Windows (now everyone will just have to wonder how I got anything at all working on Windows). Since we do not want to place the XMLPARSEAPI marker in the middle of a type name, always tack it onto the beginning -- anywhere else seems fragile at best. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** expat.h.in 2001/07/21 02:28:28 1.4 --- expat.h.in 2001/07/24 16:00:52 1.5 *************** *** 81,85 **** XML_Content *model); ! void XMLPARSEAPI XML_SetElementDeclHandler(XML_Parser parser, XML_ElementDeclHandler eldecl); --- 81,85 ---- XML_Content *model); ! XMLPARSEAPI void XML_SetElementDeclHandler(XML_Parser parser, XML_ElementDeclHandler eldecl); *************** *** 102,106 **** int isrequired); ! void XMLPARSEAPI XML_SetAttlistDeclHandler(XML_Parser parser, XML_AttlistDeclHandler attdecl); --- 102,106 ---- int isrequired); ! XMLPARSEAPI void XML_SetAttlistDeclHandler(XML_Parser parser, XML_AttlistDeclHandler attdecl); *************** *** 120,124 **** int standalone); ! void XMLPARSEAPI XML_SetXmlDeclHandler(XML_Parser parser, XML_XmlDeclHandler xmldecl); --- 120,124 ---- int standalone); ! XMLPARSEAPI void XML_SetXmlDeclHandler(XML_Parser parser, XML_XmlDeclHandler xmldecl); *************** *** 134,138 **** external protocol or null if there is none specified. */ ! XML_Parser XMLPARSEAPI XML_ParserCreate(const XML_Char *encoding); --- 134,138 ---- external protocol or null if there is none specified. */ ! XMLPARSEAPI XML_Parser XML_ParserCreate(const XML_Char *encoding); *************** *** 147,151 **** the name and prefix will be passed through without expansion. */ ! XML_Parser XMLPARSEAPI XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); --- 147,151 ---- the name and prefix will be passed through without expansion. */ ! XMLPARSEAPI XML_Parser XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); *************** *** 161,165 **** */ ! XML_Parser XMLPARSEAPI XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, --- 161,165 ---- */ ! XMLPARSEAPI XML_Parser XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, *************** *** 250,254 **** const XML_Char *notationName); ! void XMLPARSEAPI XML_SetEntityDeclHandler(XML_Parser parser, XML_EntityDeclHandler handler); --- 250,254 ---- const XML_Char *notationName); ! XMLPARSEAPI void XML_SetEntityDeclHandler(XML_Parser parser, XML_EntityDeclHandler handler); *************** *** 331,334 **** --- 331,339 ---- const XML_Char *publicId); + typedef int (*XML_InternalEntityRefHandler)(XML_Parser parser, + const XML_Char *context, + const XML_Char *name, + const XML_Char *text); + /* This structure is filled in by the XML_UnknownEncodingHandler to provide information to the parser about encodings that are unknown *************** *** 395,430 **** XML_Encoding *info); ! void XMLPARSEAPI XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end); ! void XMLPARSEAPI XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler); ! void XMLPARSEAPI XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler); ! void XMLPARSEAPI XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler handler); ! void XMLPARSEAPI XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler handler); ! void XMLPARSEAPI XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler handler); ! void XMLPARSEAPI XML_SetCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end); ! void XMLPARSEAPI XML_SetStartCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start); ! void XMLPARSEAPI XML_SetEndCdataSectionHandler(XML_Parser parser, XML_EndCdataSectionHandler end); --- 400,435 ---- XML_Encoding *info); ! XMLPARSEAPI void XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end); ! XMLPARSEAPI void XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler); ! XMLPARSEAPI void XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler); ! XMLPARSEAPI void XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler handler); ! XMLPARSEAPI void XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler handler); ! XMLPARSEAPI void XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler handler); ! XMLPARSEAPI void XML_SetCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end); ! XMLPARSEAPI void XML_SetStartCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start); ! XMLPARSEAPI void XML_SetEndCdataSectionHandler(XML_Parser parser, XML_EndCdataSectionHandler end); *************** *** 434,438 **** handler. */ ! void XMLPARSEAPI XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler handler); --- 439,443 ---- handler. */ ! XMLPARSEAPI void XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler handler); *************** *** 442,488 **** default handler. */ ! void XMLPARSEAPI XML_SetDefaultHandlerExpand(XML_Parser parser, XML_DefaultHandler handler); ! void XMLPARSEAPI XML_SetDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end); ! void XMLPARSEAPI XML_SetStartDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start); ! void XMLPARSEAPI XML_SetEndDoctypeDeclHandler(XML_Parser parser, XML_EndDoctypeDeclHandler end); ! void XMLPARSEAPI XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler handler); ! void XMLPARSEAPI XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler handler); ! void XMLPARSEAPI XML_SetNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end); ! void XMLPARSEAPI XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start); ! void XMLPARSEAPI XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end); ! void XMLPARSEAPI XML_SetNotStandaloneHandler(XML_Parser parser, XML_NotStandaloneHandler handler); ! void XMLPARSEAPI XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler handler); --- 447,493 ---- default handler. */ ! XMLPARSEAPI void XML_SetDefaultHandlerExpand(XML_Parser parser, XML_DefaultHandler handler); ! XMLPARSEAPI void XML_SetDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end); ! XMLPARSEAPI void XML_SetStartDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start); ! XMLPARSEAPI void XML_SetEndDoctypeDeclHandler(XML_Parser parser, XML_EndDoctypeDeclHandler end); ! XMLPARSEAPI void XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler handler); ! XMLPARSEAPI void XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler handler); ! XMLPARSEAPI void XML_SetNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end); ! XMLPARSEAPI void XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start); ! XMLPARSEAPI void XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end); ! XMLPARSEAPI void XML_SetNotStandaloneHandler(XML_Parser parser, XML_NotStandaloneHandler handler); ! XMLPARSEAPI void XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler handler); *************** *** 491,498 **** as the first argument to the external entity ref handler instead of the parser object. */ ! void XMLPARSEAPI XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg); ! void XMLPARSEAPI XML_SetUnknownEncodingHandler(XML_Parser parser, XML_UnknownEncodingHandler handler, --- 496,503 ---- as the first argument to the external entity ref handler instead of the parser object. */ ! XMLPARSEAPI void XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg); ! XMLPARSEAPI void XML_SetUnknownEncodingHandler(XML_Parser parser, XML_UnknownEncodingHandler handler, *************** *** 502,506 **** processing instruction or character data. It causes the corresponding markup to be passed to the default handler. */ ! void XMLPARSEAPI XML_DefaultCurrent(XML_Parser parser); --- 507,511 ---- processing instruction or character data. It causes the corresponding markup to be passed to the default handler. */ ! XMLPARSEAPI void XML_DefaultCurrent(XML_Parser parser); *************** *** 516,524 **** */ ! void XMLPARSEAPI XML_SetReturnNSTriplet(XML_Parser parser, int do_nst); /* This value is passed as the userData argument to callbacks. */ ! void XMLPARSEAPI XML_SetUserData(XML_Parser parser, void *userData); --- 521,529 ---- */ ! XMLPARSEAPI void XML_SetReturnNSTriplet(XML_Parser parser, int do_nst); /* This value is passed as the userData argument to callbacks. */ ! XMLPARSEAPI void XML_SetUserData(XML_Parser parser, void *userData); *************** *** 530,534 **** or XML_ParseBuffer. */ ! int XMLPARSEAPI XML_SetEncoding(XML_Parser parser, const XML_Char *encoding); --- 535,539 ---- or XML_ParseBuffer. */ ! XMLPARSEAPI int XML_SetEncoding(XML_Parser parser, const XML_Char *encoding); *************** *** 547,554 **** Returns zero if out of memory, non-zero otherwise. */ ! int XMLPARSEAPI XML_SetBase(XML_Parser parser, const XML_Char *base); ! const XML_Char * XMLPARSEAPI XML_GetBase(XML_Parser parser); --- 552,559 ---- Returns zero if out of memory, non-zero otherwise. */ ! XMLPARSEAPI int XML_SetBase(XML_Parser parser, const XML_Char *base); ! XMLPARSEAPI const XML_Char * XML_GetBase(XML_Parser parser); *************** *** 559,563 **** XML_StartElementHandler. */ ! int XMLPARSEAPI XML_GetSpecifiedAttributeCount(XML_Parser parser); --- 564,568 ---- XML_StartElementHandler. */ ! XMLPARSEAPI int XML_GetSpecifiedAttributeCount(XML_Parser parser); *************** *** 567,571 **** into the atts array passed to the XML_StartElementHandler. */ ! int XMLPARSEAPI XML_GetIdAttributeIndex(XML_Parser parser); --- 572,576 ---- into the atts array passed to the XML_StartElementHandler. */ ! XMLPARSEAPI int XML_GetIdAttributeIndex(XML_Parser parser); *************** *** 573,583 **** The last call to XML_Parse must have isFinal true; len may be zero for this call (or any other). */ ! int XMLPARSEAPI XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); ! void * XMLPARSEAPI XML_GetBuffer(XML_Parser parser, int len); ! int XMLPARSEAPI XML_ParseBuffer(XML_Parser parser, int len, int isFinal); --- 578,588 ---- The last call to XML_Parse must have isFinal true; len may be zero for this call (or any other). */ ! XMLPARSEAPI int XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); ! XMLPARSEAPI void * XML_GetBuffer(XML_Parser parser, int len); ! XMLPARSEAPI int XML_ParseBuffer(XML_Parser parser, int len, int isFinal); *************** *** 597,601 **** 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, const XML_Char *context, --- 602,606 ---- from the parser argument. Returns 0 if out of memory. Otherwise returns a new XML_Parser object. */ ! XMLPARSEAPI XML_Parser XML_ExternalEntityParserCreate(XML_Parser parser, const XML_Char *context, *************** *** 627,631 **** entities is requested; otherwise it will return non-zero. */ ! int XMLPARSEAPI XML_SetParamEntityParsing(XML_Parser parser, enum XML_ParamEntityParsing parsing); --- 632,636 ---- entities is requested; otherwise it will return non-zero. */ ! XMLPARSEAPI int XML_SetParamEntityParsing(XML_Parser parser, enum XML_ParamEntityParsing parsing); *************** *** 661,665 **** returns information about the error. */ ! enum XML_Error XMLPARSEAPI XML_GetErrorCode(XML_Parser parser); --- 666,670 ---- returns information about the error. */ ! XMLPARSEAPI enum XML_Error XML_GetErrorCode(XML_Parser parser); *************** *** 679,683 **** Returns 0 if the event is in an internal entity. */ ! int XMLPARSEAPI XML_GetCurrentByteCount(XML_Parser parser); --- 684,688 ---- Returns 0 if the event is in an internal entity. */ ! XMLPARSEAPI int XML_GetCurrentByteCount(XML_Parser parser); *************** *** 692,696 **** the handler that makes the call. */ ! const char * XMLPARSEAPI XML_GetInputContext(XML_Parser parser, int *offset, --- 697,701 ---- the handler that makes the call. */ ! XMLPARSEAPI const char * XML_GetInputContext(XML_Parser parser, int *offset, *************** *** 703,715 **** /* Frees memory used by the parser. */ ! void XMLPARSEAPI XML_ParserFree(XML_Parser parser); /* Returns a string describing the error. */ ! const XML_LChar * XMLPARSEAPI XML_ErrorString(int code); /* Return a string containing the version number of this expat */ ! const XML_LChar * XMLPARSEAPI XML_ExpatVersion(void); --- 708,720 ---- /* Frees memory used by the parser. */ ! XMLPARSEAPI void XML_ParserFree(XML_Parser parser); /* Returns a string describing the error. */ ! XMLPARSEAPI const XML_LChar * XML_ErrorString(int code); /* Return a string containing the version number of this expat */ ! XMLPARSEAPI const XML_LChar * XML_ExpatVersion(void); *************** *** 723,727 **** number information for this version of expat */ ! XML_Expat_Version XMLPARSEAPI XML_ExpatVersionInfo(void); --- 728,732 ---- number information for this version of expat */ ! XMLPARSEAPI XML_Expat_Version XML_ExpatVersionInfo(void); From fdrake@users.sourceforge.net Tue Jul 24 17:03:54 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 09:03:54 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv15979 Modified Files: expat.h.in Log Message: Oops, remove a prototype for a feature that is not yet ready. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** expat.h.in 2001/07/24 16:00:52 1.5 --- expat.h.in 2001/07/24 16:03:51 1.6 *************** *** 331,339 **** const XML_Char *publicId); - typedef int (*XML_InternalEntityRefHandler)(XML_Parser parser, - const XML_Char *context, - const XML_Char *name, - const XML_Char *text); - /* This structure is filled in by the XML_UnknownEncodingHandler to provide information to the parser about encodings that are unknown --- 331,334 ---- From fdrake@users.sourceforge.net Tue Jul 24 17:50:39 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 09:50:39 -0700 Subject: [Expat-checkins] CVS: expat/lib .cvsignore,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv25734 Modified Files: .cvsignore Log Message: Tell CVS to ignore the Windows temporary files. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/lib/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** .cvsignore 2001/03/10 15:41:50 1.2 --- .cvsignore 2001/07/24 16:50:37 1.3 *************** *** 4,5 **** --- 4,10 ---- *.la expat.h + Debug + Release + expat.ncb + expat.opt + expat.plg From fdrake@users.sourceforge.net Tue Jul 24 17:52:56 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 09:52:56 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.dsw,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv26171 Added Files: expat.dsw Log Message: Add the MSVC workspace file. --- NEW FILE --- Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### Project: "expat"=.\expat.dsp - Package Owner=<4> Package=<5> {{{ }}} Package=<4> {{{ }}} ############################################################################### Global: Package=<5> {{{ }}} Package=<3> {{{ }}} ############################################################################### From fdrake@users.sourceforge.net Tue Jul 24 18:09:00 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 10:09:00 -0700 Subject: [Expat-checkins] CVS: expat README,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv30727 Modified Files: README Log Message: Bump the version number and make a few small changes (mostly editorial). Re-wrap lines to be a little shorter. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** README 2001/01/25 17:55:24 1.5 --- README 2001/07/24 17:08:58 1.6 *************** *** 1,40 **** ! Expat, Release 1.95.1 ! This is expat, the C library for parsing XML, written by James Clark. Expat ! is a stream oriented XML parser. This means that you register handlers with ! the parser prior to starting the parse. These handlers are called when ! the parser discovers the associated structures in the document being parsed. ! A start tag is an example of the kind of structures for which you may ! register handlers. ! ! Expat is free software. You may copy, distribute, and modify it under the ! terms of the License contained in the file, COPYING, distributed with this ! package. This license is the same as the MIT/X Consortium license. ! ! Versions of expat that have an odd minor version (the middle number in the ! release above), are development releases and should be considered as ! beta software. Releases with even minor version numbers are intended to be ! production grade software. ! To build expat, you first run the configuration shell script in the top ! level distribution directory: ./configure ! There are many options which you may provide to configure (which you can ! discover by running configure with the --help option.) But the one of most ! interest is the one that sets the installation directory. By default, ! the configure script will set things up to install libexpat into ! /usr/local/lib and expat.h into /usr/local/include. If, for example, you'd ! prefer to install into /home/me/mystuff/lib and /home/me/mystuff/include, ! you can tell configure about that with: ./configure --prefix=/home/me/mystuff ! After running the configure script, the "make" command will build things and ! "make install" will install things into their proper location. Note that ! you need to have write permission into the directories into which things ! will be installed. Note for Solaris users: The "ar" command is usually located in --- 1,41 ---- ! Expat, Release 1.95.2 ! This is expat, the C library for parsing XML, written by James Clark. ! Expat is a stream oriented XML parser. This means that you register ! handlers with the parser prior to starting the parse. These handlers ! are called when the parser discovers the associated structures in the ! document being parsed. A start tag is an example of the kind of ! structures for which you may register handlers. ! ! Expat is free software. You may copy, distribute, and modify it under ! the terms of the License contained in the file, COPYING, distributed ! with this package. This license is the same as the MIT/X Consortium ! license. ! ! Versions of expat that have an odd minor version (the middle number in ! the release above), are development releases and should be considered ! as beta software. Releases with even minor version numbers are ! intended to be production grade software. ! To build expat, you first run the configuration shell script in the ! top level distribution directory: ./configure ! There are many options which you may provide to configure (which you ! can discover by running configure with the --help option). But the ! one of most interest is the one that sets the installation directory. ! By default, the configure script will set things up to install ! libexpat into /usr/local/lib and expat.h into /usr/local/include. If, ! for example, you'd prefer to install into /home/me/mystuff/lib and ! /home/me/mystuff/include, you can tell configure about that with: ./configure --prefix=/home/me/mystuff ! After running the configure script, the "make" command will build ! things and "make install" will install things into their proper ! location. Note that you need to have write permission into the ! directories into which things will be installed. Note for Solaris users: The "ar" command is usually located in *************** *** 45,64 **** PATH=/usr/ccs/bin:$PATH make ! Alternatively, on Win32 systems with Microsoft's Developer's Studio installed, ! you can simply double-click on lib/expat.dsp from Windows Explorer and build ! and install in the usual way from with DevStudio. ! As a third alternative you may choose to download expat_win32bin which has ! a pre-compiled dll in it. ! A reference manual is available in the doc/reference.html in this distribution. ! The homepage for this project is http://expat.sourceforge.net. There are ! links there to connect you to the bug reports page. If you need to report ! a bug when you don't have access to a browser, you may also send a bug ! report by email to expat-bugs@lists.sourceforge.net. ! ! Discussion related to the direction of future expat development takes place ! on expat-discuss@lists.sourceforge.net. Archives of this list may be found ! at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss. --- 46,65 ---- PATH=/usr/ccs/bin:$PATH make ! Alternatively, on Win32 systems with Microsoft's Developer's Studio ! installed, you can simply double-click on lib/expat.dsw from Windows ! Explorer and build and install in the usual way from with DevStudio. ! Another alternative you may choose to download expat_win32bin which ! includes a pre-compiled DLL. ! A reference manual is available in the file doc/reference.html in this distribution. ! The homepage for this project is http://expat.sourceforge.net/. There ! are links there to connect you to the bug reports page. If you need ! to report a bug when you don't have access to a browser, you may also ! send a bug report by email to expat-bugs@lists.sourceforge.net. ! ! Discussion related to the direction of future expat development takes ! place on expat-discuss@lists.sourceforge.net. Archives of this list ! may be found at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss. From fdrake@users.sourceforge.net Tue Jul 24 20:51:37 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 12:51:37 -0700 Subject: [Expat-checkins] CVS: expat/conftools ac_c_bigendian_cross.m4,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/conftools In directory usw-pr-cvs1:/tmp/cvs-serv2665/conftools Added Files: ac_c_bigendian_cross.m4 Log Message: Adding cross-compile safe BIGENDIAN test for autoconf. Original source: http://cryp.to/autoconf-archive/Cross_Compilation/ac_c_bigendian_cross.html This is part of SF patch #431342. ***** Error reading new file: [Errno 2] No such file or directory: 'ac_c_bigendian_cross.m4' From fdrake@users.sourceforge.net Tue Jul 24 20:54:22 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 12:54:22 -0700 Subject: [Expat-checkins] CVS: expat configure.in,1.15,1.16 buildconf.sh,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv3278 Modified Files: configure.in buildconf.sh Log Message: Use the AC_C_BIGENDIAN_CROSS macro instead of the non-cross-compile-safe version normally provided with autoconf. I have not tested this in a cross-compilation environment, but it does not break things in my x86 environment. (If this breaks things for anyone, please file a bug report!) This closes SF patch #431342. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** configure.in 2001/07/21 03:37:11 1.15 --- configure.in 2001/07/24 19:54:20 1.16 *************** *** 70,74 **** dnl Checks for typedefs, structures, and compiler characteristics. ! AC_C_BIGENDIAN AC_C_CONST AC_TYPE_OFF_T --- 70,78 ---- dnl Checks for typedefs, structures, and compiler characteristics. ! ! dnl Note: Avoid using AC_C_BIGENDIAN because it does not ! dnl work in a cross compile. ! AC_C_BIGENDIAN_CROSS ! AC_C_CONST AC_TYPE_OFF_T Index: buildconf.sh =================================================================== RCS file: /cvsroot/expat/expat/buildconf.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** buildconf.sh 2001/03/10 15:41:49 1.1 --- buildconf.sh 2001/07/24 19:54:20 1.2 *************** *** 12,15 **** --- 12,19 ---- cat $ltfile >> aclocal.m4 + ltfile='conftools/ac_c_bigendian_cross.m4' + echo "Incorporating $ltfile into aclocal.m4 ..." + cat $ltfile >> aclocal.m4 + # # Create the libtool helper files From fdrake@users.sourceforge.net Tue Jul 24 21:03:30 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 13:03:30 -0700 Subject: [Expat-checkins] CVS: expat Makefile.in,1.8,1.9 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv5351 Modified Files: Makefile.in Log Message: Reduce the reliance on non-standard "tar" options. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.in 2001/03/10 15:41:49 1.8 --- Makefile.in 2001/07/24 20:03:28 1.9 *************** *** 138,142 **** $(DISTRIBUTION): distdir ! tar cfz $(DISTRIBUTION) $(DISTDIR) dist: $(DISTRIBUTION) --- 138,142 ---- $(DISTRIBUTION): distdir ! tar cf - $(DISTDIR) | gzip -9 >$(DISTRIBUTION) dist: $(DISTRIBUTION) From fdrake@users.sourceforge.net Tue Jul 24 22:41:07 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 14:41:07 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.dsp,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv29479 Modified Files: expat.dsp Log Message: Update the MSVC project. I don't understand all the changes, but it seems to work. Index: expat.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** expat.dsp 2000/12/27 19:37:37 1.3 --- expat.dsp 2001/07/24 21:41:05 1.4 *************** *** 43,47 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /Yu"stdafx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 43,48 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /FD /c ! # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 69,73 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 70,74 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FR /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 96,104 **** !IF "$(CFG)" == "expat - Win32 Release" ! # ADD CPP /D VERSION=\"expat_1.95.1\" !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! # ADD CPP /GX- /Od /D VERSION=\"expat_1.95.1\" !ENDIF --- 97,105 ---- !IF "$(CFG)" == "expat - Win32 Release" ! # ADD CPP /D VERSION=\"expat_1.95.2\" !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! # ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\" !ENDIF *************** *** 108,170 **** SOURCE=.\xmlrole.c ! ! !IF "$(CFG)" == "expat - Win32 Release" ! ! # ADD CPP /D VERSION=\"expat_1.95.1\" ! ! !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! ! # ADD CPP /D VERSION=\"expat_1.95.1\" ! ! !ENDIF ! # End Source File # Begin Source File SOURCE=.\xmltok.c ! ! !IF "$(CFG)" == "expat - Win32 Release" ! ! # ADD CPP /D VERSION=\"expat_1.95.1\" ! ! !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! ! # ADD CPP /D VERSION=\"expat_1.95.1\" ! ! !ENDIF ! # End Source File - # Begin Source File - - SOURCE=xmltok_impl.c - - !IF "$(CFG)" == "expat - Win32 Release" - - # ADD CPP /D VERSION=\"expat_1.95.1\" - - !ELSEIF "$(CFG)" == "expat - Win32 Debug" - - # PROP Exclude_From_Build 1 - # ADD CPP /D VERSION=\"expat_1.95.1\" - - !ENDIF - - # End Source File - # Begin Source File - - SOURCE=xmltok_ns.c - - !IF "$(CFG)" == "expat - Win32 Release" - - # ADD CPP /D VERSION=\"expat_1.95.1\" - - !ELSEIF "$(CFG)" == "expat - Win32 Debug" - - # PROP Exclude_From_Build 1 - # ADD CPP /D VERSION=\"expat_1.95.1\" - - !ENDIF - - # End Source File # End Group # Begin Group "Header Files" --- 109,119 ---- SOURCE=.\xmlrole.c ! # ADD CPP /D VERSION=\"expat_1.95.2\" # End Source File # Begin Source File SOURCE=.\xmltok.c ! # ADD CPP /D VERSION=\"expat_1.95.2\" # End Source File # End Group # Begin Group "Header Files" *************** *** 220,227 **** # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group - # Begin Source File - - SOURCE=.\ReadMe.txt - # End Source File # End Target # End Project --- 169,172 ---- From fdrake@users.sourceforge.net Wed Jul 25 04:05:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 20:05:24 -0700 Subject: [Expat-checkins] CVS: expat Makefile.in,1.9,1.10 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv23834 Modified Files: Makefile.in Log Message: Make sure all the makefiles have at least a dummy check target and reasonable distclean and maintainer-clean targets. This fixes the last part of SF bug #430942. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** Makefile.in 2001/07/24 20:03:28 1.9 --- Makefile.in 2001/07/25 03:05:21 1.10 *************** *** 137,140 **** --- 137,145 ---- done + check: $(SUBDIRS) + @echo + @echo This package does not yet have a regression test. + @echo + $(DISTRIBUTION): distdir tar cf - $(DISTDIR) | gzip -9 >$(DISTRIBUTION) From fdrake@users.sourceforge.net Wed Jul 25 04:05:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 20:05:24 -0700 Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.13,1.14 expat.h.in,1.6,1.7 xmlparse.c,1.14,1.15 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv23834/lib Modified Files: Makefile.in expat.h.in xmlparse.c Log Message: Make sure all the makefiles have at least a dummy check target and reasonable distclean and maintainer-clean targets. This fixes the last part of SF bug #430942. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/lib/Makefile.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** Makefile.in 2001/07/21 03:37:12 1.13 --- Makefile.in 2001/07/25 03:05:22 1.14 *************** *** 132,135 **** --- 132,140 ---- maintainer-clean: distclean + check: $(SUBDIRS) + @echo + @echo This package does not yet have a regression test. + @echo + install: $(LIBRARY) $(APIHEADER) $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** expat.h.in 2001/07/24 16:03:51 1.6 --- expat.h.in 2001/07/25 03:05:22 1.7 *************** *** 331,334 **** --- 331,339 ---- const XML_Char *publicId); + typedef int (*XML_InternalEntityRefHandler)(XML_Parser parser, + const XML_Char *context, + const XML_Char *name, + const XML_Char *text); + /* This structure is filled in by the XML_UnknownEncodingHandler to provide information to the parser about encodings that are unknown Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** xmlparse.c 2001/01/24 19:38:54 1.14 --- xmlparse.c 2001/07/25 03:05:22 1.15 *************** *** 372,375 **** --- 372,376 ---- XML_NotStandaloneHandler m_notStandaloneHandler; XML_ExternalEntityRefHandler m_externalEntityRefHandler; + XML_InternalEntityRefHandler m_internalEntityRefHandler; void *m_externalEntityRefHandlerArg; XML_UnknownEncodingHandler m_unknownEncodingHandler; *************** *** 454,457 **** --- 455,459 ---- #define externalEntityRefHandler (((Parser *)parser)->m_externalEntityRefHandler) #define externalEntityRefHandlerArg (((Parser *)parser)->m_externalEntityRefHandlerArg) + #define internalEntityRefHandler (((Parser *)parser)->m_internalEntityRefHandler) #define unknownEncodingHandler (((Parser *)parser)->m_unknownEncodingHandler) #define elementDeclHandler (((Parser *)parser)->m_elementDeclHandler) *************** *** 608,611 **** --- 610,614 ---- externalEntityRefHandler = 0; externalEntityRefHandlerArg = parser; + internalEntityRefHandler = 0; unknownEncodingHandler = 0; elementDeclHandler = 0; *************** *** 719,722 **** --- 722,726 ---- XML_NotStandaloneHandler oldNotStandaloneHandler = notStandaloneHandler; XML_ExternalEntityRefHandler oldExternalEntityRefHandler = externalEntityRefHandler; + XML_InternalEntityRefHandler oldInternalEntityRefHandler = internalEntityRefHandler; XML_UnknownEncodingHandler oldUnknownEncodingHandler = unknownEncodingHandler; XML_ElementDeclHandler oldElementDeclHandler = elementDeclHandler; *************** *** 1036,1039 **** --- 1040,1049 ---- else externalEntityRefHandlerArg = parser; + } + + void XML_SetInternalEntityRefHandler(XML_Parser parser, + XML_InternalEntityRefHandler handler) + { + internalEntityRefHandler = handler; } From fdrake@users.sourceforge.net Wed Jul 25 04:05:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 20:05:24 -0700 Subject: [Expat-checkins] CVS: expat/sample Makefile.in,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/sample In directory usw-pr-cvs1:/tmp/cvs-serv23834/sample Modified Files: Makefile.in Log Message: Make sure all the makefiles have at least a dummy check target and reasonable distclean and maintainer-clean targets. This fixes the last part of SF bug #430942. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/sample/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.in 2001/03/01 04:13:33 1.1 --- Makefile.in 2001/07/25 03:05:22 1.2 *************** *** 35,38 **** --- 35,48 ---- $(CC) -o elements elements.o $(LDFLAGS) $(LIBS) + check: $(SUBDIRS) + @echo + @echo This package does not yet have a regression test. + @echo + clean: rm -f elements core *.o + + distclean: clean + rm -r Makefile + + maintainer-clean: distclean From fdrake@users.sourceforge.net Wed Jul 25 04:05:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 20:05:24 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv23834/xmlwf Modified Files: Makefile.in Log Message: Make sure all the makefiles have at least a dummy check target and reasonable distclean and maintainer-clean targets. This fixes the last part of SF bug #430942. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.in 2001/03/01 04:28:27 1.3 --- Makefile.in 2001/07/25 03:05:22 1.4 *************** *** 37,40 **** --- 37,50 ---- $(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS) + check: $(SUBDIRS) + @echo + @echo This package does not yet have a regression test. + @echo + clean: rm -f xmlwf core *.o + + distclean: clean + rm -f Makefile + + maintainer-clean: distclean From fdrake@users.sourceforge.net Wed Jul 25 04:05:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 20:05:24 -0700 Subject: [Expat-checkins] CVS: expat/examples Makefile.in,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv23834/examples Modified Files: Makefile.in Log Message: Make sure all the makefiles have at least a dummy check target and reasonable distclean and maintainer-clean targets. This fixes the last part of SF bug #430942. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/examples/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.in 2001/03/01 04:28:27 1.2 --- Makefile.in 2001/07/25 03:05:22 1.3 *************** *** 37,40 **** --- 37,50 ---- $(CC) -o outline outline.o $(LDFLAGS) $(LIBS) + check: $(SUBDIRS) + @echo + @echo This package does not yet have a regression test. + @echo + clean: rm -f outline core *.o + + distclean: clean + rm -f Makefile + + maintainer-clean: distclean From fdrake@users.sourceforge.net Wed Jul 25 04:14:41 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 20:14:41 -0700 Subject: [Expat-checkins] CVS: expat README,1.6,1.7 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv25804 Modified Files: README Log Message: Added a comment about compiling for use with C++, including the use of the -fexceptions flag with GCC. This closes SF bug #419585. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** README 2001/07/24 17:08:58 1.6 --- README 2001/07/25 03:14:39 1.7 *************** *** 39,42 **** --- 39,49 ---- directories into which things will be installed. + When building for use with C++, you may need to add additional + compiler flags to support proper interaction with exceptions. This + can be done by setting the CFLAGS environment variable. For example, + when using GCC, you can use: + + CFLAGS=-fexceptions ./configure + Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to From fdrake@users.sourceforge.net Wed Jul 25 04:29:58 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Tue, 24 Jul 2001 20:29:58 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.7,1.8 xmlparse.c,1.15,1.16 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv28339 Modified Files: expat.h.in xmlparse.c Log Message: Revert unintended portion of a checkin; these files were not supposed to have been changed with the most recent Makefile changes. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** expat.h.in 2001/07/25 03:05:22 1.7 --- expat.h.in 2001/07/25 03:29:56 1.8 *************** *** 331,339 **** const XML_Char *publicId); - typedef int (*XML_InternalEntityRefHandler)(XML_Parser parser, - const XML_Char *context, - const XML_Char *name, - const XML_Char *text); - /* This structure is filled in by the XML_UnknownEncodingHandler to provide information to the parser about encodings that are unknown --- 331,334 ---- Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** xmlparse.c 2001/07/25 03:05:22 1.15 --- xmlparse.c 2001/07/25 03:29:56 1.16 *************** *** 372,376 **** XML_NotStandaloneHandler m_notStandaloneHandler; XML_ExternalEntityRefHandler m_externalEntityRefHandler; - XML_InternalEntityRefHandler m_internalEntityRefHandler; void *m_externalEntityRefHandlerArg; XML_UnknownEncodingHandler m_unknownEncodingHandler; --- 372,375 ---- *************** *** 722,726 **** XML_NotStandaloneHandler oldNotStandaloneHandler = notStandaloneHandler; XML_ExternalEntityRefHandler oldExternalEntityRefHandler = externalEntityRefHandler; - XML_InternalEntityRefHandler oldInternalEntityRefHandler = internalEntityRefHandler; XML_UnknownEncodingHandler oldUnknownEncodingHandler = unknownEncodingHandler; XML_ElementDeclHandler oldElementDeclHandler = elementDeclHandler; --- 721,724 ---- *************** *** 1040,1049 **** else externalEntityRefHandlerArg = parser; - } - - void XML_SetInternalEntityRefHandler(XML_Parser parser, - XML_InternalEntityRefHandler handler) - { - internalEntityRefHandler = handler; } --- 1038,1041 ---- From fdrake@users.sourceforge.net Wed Jul 25 14:52:23 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 06:52:23 -0700 Subject: [Expat-checkins] CVS: expat .cvsignore,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv15555 Modified Files: .cvsignore Log Message: Let's not ignore files that are generated too rarely to be a nuissance; we should remain aware of them. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** .cvsignore 2001/03/10 15:41:49 1.4 --- .cvsignore 2001/07/25 13:52:21 1.5 *************** *** 7,12 **** config.h.in config.h - expat-[0-9]*.[0-9]* - expat*.tar.gz libtool - *~ --- 7,9 ---- From fdrake@users.sourceforge.net Wed Jul 25 14:53:32 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 06:53:32 -0700 Subject: [Expat-checkins] CVS: CVSROOT syncmail,1.2,1.3 Message-ID: Update of /cvsroot/expat/CVSROOT In directory usw-pr-cvs1:/tmp/cvs-serv15861 Modified Files: syncmail Log Message: Update to syncmail 3.15; this bumps us up a couple of versions. Index: syncmail =================================================================== RCS file: /cvsroot/expat/CVSROOT/syncmail,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** syncmail 2000/09/07 03:25:11 1.2 --- syncmail 2001/07/25 13:53:30 1.3 *************** *** 11,19 **** set this up, create a loginfo entry that looks something like this: ! mymodule /path/to/syncmail %%s some-email-addr@your.domain ! In this example, whenever a checkin that matches `mymodule' is made, the ! syncmail script is invoked, which will generate the diff containing email, and ! send it to some-email-addr@your.domain. Note: This module used to also do repository synchronizations via --- 11,19 ---- set this up, create a loginfo entry that looks something like this: ! mymodule /path/to/this/script %%s some-email-addr@your.domain ! In this example, whenever a checkin that matches `mymodule' is made, this ! script is invoked, which will generate the diff containing email, and send it ! to some-email-addr@your.domain. Note: This module used to also do repository synchronizations via *************** *** 21,26 **** this is no longer necessary. The syncing functionality has been ripped out in the 3.0, which simplifies it considerably. Access the 2.x versions ! to refer to this functionality. Because of this, the script's name is ! misleading. It no longer makes sense to run this script from the command line. Doing so --- 21,25 ---- this is no longer necessary. The syncing functionality has been ripped out in the 3.0, which simplifies it considerably. Access the 2.x versions ! to refer to this functionality. Because of this, the script is misnamed. It no longer makes sense to run this script from the command line. Doing so *************** *** 29,33 **** Usage: ! syncmail [options] <%%S> email-addr [email-addr ...] Where options is: --- 28,32 ---- Usage: ! %(PROGRAM)s [options] <%%S> email-addr [email-addr ...] Where options is: *************** *** 41,44 **** --- 40,53 ---- Print this text. + --context=# + -C # + Include # lines of context around lines that differ (default: 2). + + -c + Produce a context diff (default). + + -u + Produce a unified diff (smaller, but harder to read). + <%%S> CVS %%s loginfo expansion. When invoked by CVS, this will be a single *************** *** 67,79 **** DIFF_TRUNCATE_IF_LARGER = 1000 ! def usage(errcode, msg=''): print __doc__ % globals() ! if msg: print msg ! sys.exit(errorcode) ! def calculate_diff(filespec): try: file, oldrev, newrev = string.split(filespec, ',') --- 76,92 ---- DIFF_TRUNCATE_IF_LARGER = 1000 + PROGRAM = sys.argv[0] + + ! def usage(code, msg=''): print __doc__ % globals() ! if msg: ! print msg ! sys.exit(code) ! def calculate_diff(filespec, contextlines): try: file, oldrev, newrev = string.split(filespec, ',') *************** *** 83,93 **** if oldrev == 'NONE': try: ! fp = open(file) lines = fp.readlines() fp.close() ! lines.insert(0, '--- NEW FILE ---\n') except IOError, e: lines = ['***** Error reading new file: ', ! str(e)] elif newrev == 'NONE': lines = ['--- %s DELETED ---\n' % file] --- 96,122 ---- if oldrev == 'NONE': try: ! if os.path.exists(file): ! fp = open(file) ! else: ! update_cmd = 'cvs -fn update -r %s -p %s' % (newrev, file) ! fp = os.popen(update_cmd) lines = fp.readlines() fp.close() ! # Is this a binary file? Let's look at the first few ! # lines to figure it out: ! binary = 0 ! for line in lines[:5]: ! for c in line: ! if c < ' ' or c > chr(127): ! binary = 1 ! break ! if binary: ! lines = [ ! "(This appears to be a binary file; contents omitted.)\n" ! ] ! lines.insert(0, '--- NEW FILE: %s ---\n' % file) except IOError, e: lines = ['***** Error reading new file: ', ! str(e), '\n***** file: ', file, ' cwd: ', os.getcwd()] elif newrev == 'NONE': lines = ['--- %s DELETED ---\n' % file] *************** *** 95,100 **** # This /has/ to happen in the background, otherwise we'll run into CVS # lock contention. What a crock. ! diffcmd = '/usr/bin/cvs -f diff -kk -C 2 -r %s -r %s %s' % ( ! oldrev, newrev, file) fp = os.popen(diffcmd) lines = fp.readlines() --- 124,133 ---- # This /has/ to happen in the background, otherwise we'll run into CVS # lock contention. What a crock. ! if contextlines > 0: ! difftype = "-C " + str(contextlines) ! else: ! difftype = "-u" ! diffcmd = "/usr/bin/cvs -f diff -kk %s --minimal -r %s -r %s '%s'" % ( ! difftype, oldrev, newrev, file) fp = os.popen(diffcmd) lines = fp.readlines() *************** *** 112,116 **** ! def blast_mail(mailcmd, filestodiff): # cannot wait for child process or that will cause parent to retain cvs # lock for too long. Urg! --- 145,149 ---- ! def blast_mail(mailcmd, filestodiff, contextlines): # cannot wait for child process or that will cause parent to retain cvs # lock for too long. Urg! *************** *** 124,128 **** # append the diffs if available for file in filestodiff: ! fp.write(calculate_diff(file)) fp.write('\n') fp.close() --- 157,161 ---- # append the diffs if available for file in filestodiff: ! fp.write(calculate_diff(file, contextlines)) fp.write('\n') fp.close() *************** *** 134,139 **** # scan args for options def main(): try: ! opts, args = getopt.getopt(sys.argv[1:], 'h', ['cvsroot=', 'help']) except getopt.error, msg: usage(1, msg) --- 167,174 ---- # scan args for options def main(): + contextlines = 2 try: ! opts, args = getopt.getopt(sys.argv[1:], 'hC:cu', ! ['context=', 'cvsroot=', 'help']) except getopt.error, msg: usage(1, msg) *************** *** 145,148 **** --- 180,190 ---- elif opt == '--cvsroot': os.environ['CVSROOT'] = arg + elif opt in ('-C', '--context'): + contextlines = int(arg) + elif opt == '-c': + if contextlines <= 0: + contextlines = 2 + elif opt == '-u': + contextlines = 0 # What follows is the specification containing the files that were *************** *** 169,179 **** if specs[-3:] == ['-', 'New', 'directory']: del specs[-3:] ! blast_mail(mailcmd, specs[1:]) if __name__ == '__main__': - print 'Running syncmail...' main() - print '...syncmail done.' sys.exit(0) --- 211,230 ---- if specs[-3:] == ['-', 'New', 'directory']: del specs[-3:] ! elif len(specs) > 2: ! L = specs[:2] ! for s in specs[2:]: ! prev = L[-1] ! if string.count(prev, ",") < 2: ! L[-1] = "%s %s" % (prev, s) ! else: ! L.append(s) ! specs = L ! print 'Generating notification message...' ! blast_mail(mailcmd, specs[1:], contextlines) ! print 'Generating notification message... done.' if __name__ == '__main__': main() sys.exit(0) From fdrake@users.sourceforge.net Wed Jul 25 15:33:30 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 07:33:30 -0700 Subject: [Expat-checkins] CVS: expat/examples .cvsignore,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv23980/examples Modified Files: .cvsignore Log Message: Ignore the generated executables. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/examples/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 2000/10/30 21:25:05 1.1 --- .cvsignore 2001/07/25 14:33:28 1.2 *************** *** 1 **** --- 1,2 ---- Makefile + outline From fdrake@users.sourceforge.net Wed Jul 25 15:33:30 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 07:33:30 -0700 Subject: [Expat-checkins] CVS: expat/sample .cvsignore,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/sample In directory usw-pr-cvs1:/tmp/cvs-serv23980/sample Modified Files: .cvsignore Log Message: Ignore the generated executables. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/sample/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 2001/03/01 04:13:33 1.1 --- .cvsignore 2001/07/25 14:33:28 1.2 *************** *** 1 **** --- 1,2 ---- Makefile + elements From fdrake@users.sourceforge.net Wed Jul 25 15:40:08 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 07:40:08 -0700 Subject: [Expat-checkins] CVS: expat/lib xmlparse.c,1.16,1.17 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv25527/lib Modified Files: xmlparse.c Log Message: Remove one more line that was not supposed to have gotten checked in (part of an unfinished feature). Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** xmlparse.c 2001/07/25 03:29:56 1.16 --- xmlparse.c 2001/07/25 14:40:06 1.17 *************** *** 609,613 **** externalEntityRefHandler = 0; externalEntityRefHandlerArg = parser; - internalEntityRefHandler = 0; unknownEncodingHandler = 0; elementDeclHandler = 0; --- 609,612 ---- From fdrake@users.sourceforge.net Wed Jul 25 15:59:13 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 07:59:13 -0700 Subject: [Expat-checkins] CVS: expat MANIFEST,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv29796 Modified Files: MANIFEST Log Message: Update to reflect the current build process. Index: MANIFEST =================================================================== RCS file: /cvsroot/expat/expat/MANIFEST,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MANIFEST 2001/03/13 17:27:15 1.3 --- MANIFEST 2001/07/25 14:59:11 1.4 *************** *** 4,11 **** --- 4,17 ---- Makefile.in README + config.h.in configure configure.in conftools/PrintPath + conftools/ac_c_bigendian_cross.m4 + conftools/config.guess + conftools/config.sub conftools/install-sh + conftools/ltconfig + conftools/ltmain.sh conftools/missing conftools/mkinstalldirs *************** *** 18,21 **** --- 24,28 ---- lib/asciitab.h lib/expat.dsp + lib/expat.h.in lib/iasciitab.h lib/latin1tab.h *************** *** 31,34 **** --- 38,44 ---- lib/xmltok_ns.c lib/winconfig.h + sample/Makefile.in + sample/build.bat + sample/elements.c xmlwf/Makefile.in xmlwf/codepage.c From fdrake@users.sourceforge.net Wed Jul 25 16:12:03 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 08:12:03 -0700 Subject: [Expat-checkins] CVS: expat Makefile.in,1.10,1.11 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv815 Modified Files: Makefile.in Log Message: Some minor simplifications, and descend into fewer subdirs on "make install". Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile.in 2001/07/25 03:05:21 1.10 --- Makefile.in 2001/07/25 15:12:00 1.11 *************** *** 78,81 **** --- 78,82 ---- SUBDIRS = lib examples sample xmlwf + INSTALLSUBDIRS = lib xmlwf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 CONFIG_HEADERS = config.h *************** *** 106,120 **** $(SUBDIRS): ! cd $@; $(MAKE) clean: ! @list='$(SUBDIRS)'; for dir in $$list; do \ ! cd $$dir; $(MAKE) clean; cd ..; \ done rm -f core *~ distclean: ! @list='$(SUBDIRS)'; for dir in $$list; do \ ! cd $$dir; $(MAKE) distclean; cd ..; \ done rm -f config.h config.status config.log config.cache libtool --- 107,121 ---- $(SUBDIRS): ! cd $@ && $(MAKE) clean: ! for dir in $(SUBDIRS); do \ ! (cd $$dir && $(MAKE) clean); \ done rm -f core *~ distclean: ! for dir in $(SUBDIRS); do \ ! (cd $$dir && $(MAKE) distclean); \ done rm -f config.h config.status config.log config.cache libtool *************** *** 134,138 **** mkdir $(DISTDIR); \ flist=`sed -e "s/[ ]:.*$$//" MANIFEST`; for file in $$flist; do \ ! cp -P $$file $(DISTDIR); \ done --- 135,139 ---- mkdir $(DISTDIR); \ flist=`sed -e "s/[ ]:.*$$//" MANIFEST`; for file in $$flist; do \ ! cp -P $$file $(DISTDIR); \ done *************** *** 148,158 **** install: ! @list='$(SUBDIRS)'; for dir in $$list; do \ ! cd $$dir; $(MAKE) install; cd ..; \ done uninstall: ! @list='$(SUBDIRS)'; for dir in $$list; do \ ! cd $$dir; $(MAKE) uninstall; cd ..; \ done --- 149,159 ---- install: ! for dir in $(INSTALLSUBDIRS); do \ ! (cd $$dir && $(MAKE) install); \ done uninstall: ! for dir in $(INSTALLSUBDIRS); do \ ! (cd $$dir && $(MAKE) uninstall); \ done From fdrake@users.sourceforge.net Wed Jul 25 16:13:40 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 08:13:40 -0700 Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.14,1.15 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv1180/lib Modified Files: Makefile.in Log Message: Remove the extra DESTDIR variable. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/lib/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.in 2001/07/25 03:05:22 1.14 --- Makefile.in 2001/07/25 15:13:38 1.15 *************** *** 43,48 **** subdir = lib - DESTDIR = - top_builddir = .. --- 43,46 ---- *************** *** 138,148 **** install: $(LIBRARY) $(APIHEADER) ! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) ! $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) ! $(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir) uninstall: ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY); ! rm -f $(DESTDIR)$(libdir)/$(APIHEADER) $(LIBRARY): $(LTOBJECTS) --- 136,146 ---- install: $(LIBRARY) $(APIHEADER) ! $(mkinstalldirs) $(libdir) $(includedir) ! $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY) ! $(INSTALL_DATA) $(APIHEADER) $(includedir) uninstall: ! $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY); ! rm -f $(libdir)/$(APIHEADER) $(LIBRARY): $(LTOBJECTS) From fdrake@users.sourceforge.net Wed Jul 25 16:23:11 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 08:23:11 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv3352/xmlwf Modified Files: Makefile.in Log Message: Add install and uninstall targets, along with all the relevant standard variables. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 2001/07/25 03:05:22 1.4 --- Makefile.in 2001/07/25 15:23:08 1.5 *************** *** 19,22 **** --- 19,24 ---- # + bindir = @bindir@ + LIBDIR= ../lib/.libs INCDIR= ../lib *************** *** 29,39 **** --- 31,56 ---- LIBS= -L$(LIBDIR) -lexpat + INSTALL = @INSTALL@ + INSTALL_PROGRAM = ${INSTALL} + LIBTOOL = @LIBTOOL@ + mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs + srcdir = @srcdir@ + top_builddir = .. top_srcdir = @top_srcdir@ VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ xmlwf: $(OBJS) $(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS) + + install: xmlwf + $(mkinstalldirs) $(bindir) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf $(bindir)/xmlwf + + uninstall: + $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf check: $(SUBDIRS) From fdrake@users.sourceforge.net Wed Jul 25 17:05:19 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 09:05:19 -0700 Subject: [Expat-checkins] CVS: expat/win32 - New directory Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv14435/win32 Log Message: Directory /cvsroot/expat/expat/win32 added to the repository From fdrake@users.sourceforge.net Wed Jul 25 17:06:59 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 09:06:59 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.dsw,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv14750 Added Files: expat.dsw Log Message: Move the workspace file for MSVC, and let it also build xmlwf. --- NEW FILE: expat.dsw --- (This appears to be a binary file; contents omitted.) From fdrake@users.sourceforge.net Wed Jul 25 17:10:11 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 09:10:11 -0700 Subject: [Expat-checkins] CVS: expat/win32 .cvsignore,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv15406/win32 Added Files: .cvsignore Log Message: Tell CVS to ignore the cruft files generated by MSVC and Source Insight. --- NEW FILE: .cvsignore --- (This appears to be a binary file; contents omitted.) From fdrake@users.sourceforge.net Wed Jul 25 17:13:39 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 09:13:39 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.dsw,1.1,NONE Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv16263/lib Removed Files: expat.dsw Log Message: Toss the old MSVC workspace. --- expat.dsw DELETED --- From fdrake@users.sourceforge.net Wed Jul 25 17:19:06 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 09:19:06 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf xmlwf.dsp,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv17521/xmlwf Modified Files: xmlwf.dsp Log Message: Update xmlwf project file. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** xmlwf.dsp 1998/11/25 08:31:50 1.2 --- xmlwf.dsp 2001/07/25 16:19:04 1.3 *************** *** 43,47 **** # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\xmlparse" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" --- 43,47 ---- # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\xmlparse" /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" *************** *** 67,71 **** # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\xmlparse" /I "..\xmlparse" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" --- 67,71 ---- # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" From fdrake@users.sourceforge.net Wed Jul 25 17:35:56 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 09:35:56 -0700 Subject: [Expat-checkins] CVS: expat README,1.7,1.8 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv21226 Modified Files: README Log Message: Update the windows comments to reflect the current status, including the added files in the next version of the expat_win32bin package. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** README 2001/07/25 03:14:39 1.7 --- README 2001/07/25 16:35:53 1.8 *************** *** 54,62 **** Alternatively, on Win32 systems with Microsoft's Developer's Studio ! installed, you can simply double-click on lib/expat.dsw from Windows Explorer and build and install in the usual way from with DevStudio. Another alternative you may choose to download expat_win32bin which ! includes a pre-compiled DLL. A reference manual is available in the file doc/reference.html in this --- 54,63 ---- Alternatively, on Win32 systems with Microsoft's Developer's Studio ! installed, you can simply double-click on win32/expat.dsw from Windows Explorer and build and install in the usual way from with DevStudio. Another alternative you may choose to download expat_win32bin which ! includes a pre-compiled DLL and LIB files for expat, and the xmlwf ! application as an EXE file. A reference manual is available in the file doc/reference.html in this From fdrake@users.sourceforge.net Wed Jul 25 17:36:59 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 09:36:59 -0700 Subject: [Expat-checkins] CVS: expat MANIFEST,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv21456 Modified Files: MANIFEST Log Message: Add the new MSVC workspace file to the list of distributed files. Index: MANIFEST =================================================================== RCS file: /cvsroot/expat/expat/MANIFEST,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MANIFEST 2001/07/25 14:59:11 1.4 --- MANIFEST 2001/07/25 16:36:57 1.5 *************** *** 41,44 **** --- 41,45 ---- sample/build.bat sample/elements.c + win32/expat.dsw xmlwf/Makefile.in xmlwf/codepage.c From fdrake@users.sourceforge.net Wed Jul 25 18:04:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:04:24 -0700 Subject: [Expat-checkins] CVS: expat/examples outline.c,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv28023/examples Modified Files: outline.c Log Message: Clean up a few compiler warnings in the sameple code. Index: outline.c =================================================================== RCS file: /cvsroot/expat/expat/examples/outline.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** outline.c 2000/09/18 16:26:21 1.1 --- outline.c 2001/07/25 17:04:22 1.2 *************** *** 31,35 **** int Depth; ! void start(void *data, const char *el, const char **attr) { int i; --- 31,35 ---- int Depth; ! static void start(void *data, const char *el, const char **attr) { int i; *************** *** 48,57 **** } /* End of start handler */ ! void end(void *data, const char *el) { Depth--; } /* End of end handler */ ! main(int argc, char **argv) { XML_Parser p = XML_ParserCreate(NULL); if (! p) { --- 48,58 ---- } /* End of start handler */ ! static void end(void *data, const char *el) { Depth--; } /* End of end handler */ ! int ! main(int argc, char *argv[]) { XML_Parser p = XML_ParserCreate(NULL); if (! p) { *************** *** 83,86 **** --- 84,88 ---- break; } + return 0; } /* End of main */ From fdrake@users.sourceforge.net Wed Jul 25 18:11:41 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:11:41 -0700 Subject: [Expat-checkins] CVS: expat/sample elements.c,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/sample In directory usw-pr-cvs1:/tmp/cvs-serv29648/sample Modified Files: elements.c Log Message: Kill a compiler warning & make private functions static. Index: elements.c =================================================================== RCS file: /cvsroot/expat/expat/sample/elements.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** elements.c 2001/03/01 04:18:28 1.4 --- elements.c 2001/07/25 17:11:39 1.5 *************** *** 7,11 **** #include "expat.h" ! void startElement(void *userData, const char *name, const char **atts) { int i; --- 7,12 ---- #include "expat.h" ! static void ! startElement(void *userData, const char *name, const char **atts) { int i; *************** *** 17,21 **** } ! void endElement(void *userData, const char *name) { int *depthPtr = userData; --- 18,23 ---- } ! static void ! endElement(void *userData, const char *name) { int *depthPtr = userData; *************** *** 23,27 **** } ! int main() { char buf[BUFSIZ]; --- 25,30 ---- } ! int ! main(int argc, char *argv[]) { char buf[BUFSIZ]; From fdrake@users.sourceforge.net Wed Jul 25 18:13:36 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:13:36 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf unixfilemap.c,1.6,1.7 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv30205/xmlwf Modified Files: unixfilemap.c Log Message: #include to pick up the close() prototype. Index: unixfilemap.c =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/unixfilemap.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** unixfilemap.c 2000/09/21 21:20:18 1.6 --- unixfilemap.c 2001/07/25 17:13:34 1.7 *************** *** 11,14 **** --- 11,15 ---- #include #include + #include #ifndef MAP_FILE From fdrake@users.sourceforge.net Wed Jul 25 18:16:06 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:16:06 -0700 Subject: [Expat-checkins] CVS: expat README,1.8,1.9 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv31233 Modified Files: README Log Message: Update comments on the Solaris build to be a little more careful -- or at least warn the user! Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** README 2001/07/25 16:35:53 1.8 --- README 2001/07/25 17:16:03 1.9 *************** *** 48,53 **** Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to ! add this to your path for the "make" command. If you're using ksh or ! bash, use this command to build: PATH=/usr/ccs/bin:$PATH make --- 48,54 ---- Note for Solaris users: The "ar" command is usually located in "/usr/ccs/bin", which is not in the default PATH. You will need to ! add this to your path for the "make" command, and probably also switch ! to GNU make (the "make" found in /usr/ccs/bin does not seem to work ! properly). If you're using ksh or bash, use this command to build: PATH=/usr/ccs/bin:$PATH make From fdrake@users.sourceforge.net Wed Jul 25 18:18:45 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:18:45 -0700 Subject: [Expat-checkins] CVS: expat/lib xmltok.c,1.6,1.7 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv32209 Modified Files: xmltok.c Log Message: Remove useless RCSId static from the code. Index: xmltok.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmltok.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xmltok.c 2001/02/16 18:12:49 1.6 --- xmltok.c 2001/07/25 17:18:43 1.7 *************** *** 4,10 **** */ - static char RCSId[] - = "$Header$"; - #ifdef COMPILED_FROM_DSP # include "winconfig.h" --- 4,7 ---- From fdrake@users.sourceforge.net Wed Jul 25 18:20:47 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:20:47 -0700 Subject: [Expat-checkins] CVS: expat/lib xmlparse.c,1.17,1.18 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv534 Modified Files: xmlparse.c Log Message: Removed useless RCSId static from the code. Added #include to pick up the memmove() prototype. Added parentheses in some conditions to suppress compiler warnings. Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** xmlparse.c 2001/07/25 14:40:06 1.17 --- xmlparse.c 2001/07/25 17:20:45 1.18 *************** *** 4,10 **** */ - static char RCSId[] - = "$Header$"; - #ifdef COMPILED_FROM_DSP # include "winconfig.h" --- 4,7 ---- *************** *** 27,30 **** --- 24,28 ---- #include + #include #ifdef XML_UNICODE *************** *** 2755,2759 **** if (attlistDeclHandler && declAttributeType) { if (*declAttributeType == '(' ! || *declAttributeType == 'N' && declAttributeType[1] == 'O') { /* Enumerated or Notation type */ if (! poolAppendChar(&tempPool, ')') --- 2753,2757 ---- if (attlistDeclHandler && declAttributeType) { if (*declAttributeType == '(' ! || (*declAttributeType == 'N' && declAttributeType[1] == 'O')) { /* Enumerated or Notation type */ if (! poolAppendChar(&tempPool, ')') *************** *** 2789,2793 **** if (attlistDeclHandler && declAttributeType) { if (*declAttributeType == '(' ! || *declAttributeType == 'N' && declAttributeType[1] == 'O') { /* Enumerated or Notation type */ if (! poolAppendChar(&tempPool, ')') --- 2787,2791 ---- if (attlistDeclHandler && declAttributeType) { if (*declAttributeType == '(' ! || (*declAttributeType == 'N' && declAttributeType[1] == 'O')) { /* Enumerated or Notation type */ if (! poolAppendChar(&tempPool, ')') From fdrake@users.sourceforge.net Wed Jul 25 18:22:50 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:22:50 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.8,1.9 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv1406 Modified Files: expat.h.in Log Message: Removed unusual use of "const" to avoid errors from a Sun compiler. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** expat.h.in 2001/07/25 03:29:56 1.8 --- expat.h.in 2001/07/25 17:22:48 1.9 *************** *** 66,70 **** enum XML_Content_Type type; enum XML_Content_Quant quant; ! const XML_Char * name; unsigned int numchildren; XML_Content * children; --- 66,70 ---- enum XML_Content_Type type; enum XML_Content_Quant quant; ! XML_Char * name; unsigned int numchildren; XML_Content * children; From fdrake@users.sourceforge.net Wed Jul 25 18:25:48 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:25:48 -0700 Subject: [Expat-checkins] CVS: expat configure.in,1.16,1.17 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv2504 Modified Files: configure.in Log Message: When using GCC, use stronger error-checking options. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** configure.in 2001/07/24 19:54:20 1.16 --- configure.in 2001/07/25 17:25:46 1.17 *************** *** 63,66 **** --- 63,70 ---- AC_PROG_INSTALL + if test "$GCC" = yes ; then + CFLAGS="$CFLAGS -Wall -Wstrict-prototypes" + fi + dnl Checks for libraries. From fdrake@users.sourceforge.net Wed Jul 25 18:29:48 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:29:48 -0700 Subject: [Expat-checkins] CVS: expat/win32 .cvsignore,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv3945/win32 Modified Files: .cvsignore Log Message: One more MSVC file to ignore... Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/win32/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 2001/07/25 16:10:08 1.1 --- .cvsignore 2001/07/25 17:29:46 1.2 *************** *** 4,7 **** --- 4,8 ---- expat.IMD expat.ncb + expat.opt expat.PFI expat.PO From fdrake@users.sourceforge.net Wed Jul 25 18:32:19 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:32:19 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.dsw,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv4823/win32 Modified Files: expat.dsw Log Message: Really add the xmlwf project this time. Index: expat.dsw =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** expat.dsw 2001/07/25 16:06:57 1.1 --- expat.dsw 2001/07/25 17:32:17 1.2 *************** *** 16,19 **** --- 16,34 ---- ############################################################################### + Project: "xmlwf"=..\xmlwf\xmlwf.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name expat + End Project Dependency + }}} + + ############################################################################### + Global: From fdrake@users.sourceforge.net Wed Jul 25 18:34:19 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:34:19 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf xmlwf.dsp,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv5253/xmlwf Modified Files: xmlwf.dsp Log Message: Remove #include directory that is no longer needed. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xmlwf.dsp 2001/07/25 16:19:04 1.3 --- xmlwf.dsp 2001/07/25 17:34:17 1.4 *************** *** 43,47 **** # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\xmlparse" /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" --- 43,47 ---- # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" From fdrake@users.sourceforge.net Wed Jul 25 18:51:42 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:51:42 -0700 Subject: [Expat-checkins] CVS: expat/examples Makefile.in,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv8760/examples Modified Files: Makefile.in Log Message: Make sure the configured compiler is used for all subdirectories. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/examples/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.in 2001/07/25 03:05:22 1.3 --- Makefile.in 2001/07/25 17:51:40 1.4 *************** *** 25,28 **** --- 25,29 ---- LDFLAGS = @LDFLAGS@ -static LIBS = -L$(LIBDIR) -lexpat + CC = @CC@ CFLAGS = @CFLAGS@ -I$(INCDIR) From fdrake@users.sourceforge.net Wed Jul 25 18:51:42 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:51:42 -0700 Subject: [Expat-checkins] CVS: expat/sample Makefile.in,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/sample In directory usw-pr-cvs1:/tmp/cvs-serv8760/sample Modified Files: Makefile.in Log Message: Make sure the configured compiler is used for all subdirectories. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/sample/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 2001/07/25 03:05:22 1.2 --- Makefile.in 2001/07/25 17:51:40 1.3 *************** *** 23,26 **** --- 23,27 ---- LDFLAGS = @LDFLAGS@ -static LIBS = -L$(LIBDIR) -lexpat + CC = @CC@ CFLAGS = @CFLAGS@ -I$(INCDIR) From fdrake@users.sourceforge.net Wed Jul 25 18:51:42 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 10:51:42 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv8760/xmlwf Modified Files: Makefile.in Log Message: Make sure the configured compiler is used for all subdirectories. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 2001/07/25 15:23:08 1.5 --- Makefile.in 2001/07/25 17:51:40 1.6 *************** *** 26,29 **** --- 26,30 ---- LDFLAGS= @LDFLAGS@ -static CFLAGS= @CFLAGS@ -I$(INCDIR) + CC = @CC@ FILEMAP_OBJ= @FILEMAP_OBJ@ From fdrake@users.sourceforge.net Wed Jul 25 19:08:07 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 11:08:07 -0700 Subject: [Expat-checkins] CVS: expat README,1.9,1.10 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv12980 Modified Files: README Log Message: Try to better explain the problems with Sun make -- perhaps someone with more knowledge of the Sun tools could help explain this? Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** README 2001/07/25 17:16:03 1.9 --- README 2001/07/25 18:08:05 1.10 *************** *** 50,54 **** add this to your path for the "make" command, and probably also switch to GNU make (the "make" found in /usr/ccs/bin does not seem to work ! properly). If you're using ksh or bash, use this command to build: PATH=/usr/ccs/bin:$PATH make --- 50,55 ---- add this to your path for the "make" command, and probably also switch to GNU make (the "make" found in /usr/ccs/bin does not seem to work ! properly -- appearantly it does not understand .PHONY directives). If ! you're using ksh or bash, use this command to build: PATH=/usr/ccs/bin:$PATH make From fdrake@users.sourceforge.net Wed Jul 25 19:10:17 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 11:10:17 -0700 Subject: [Expat-checkins] CVS: expat Changes,1.8,1.9 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv13668 Modified Files: Changes Log Message: Added preliminary changes for the 1.95.2 release. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Changes 2000/12/27 18:08:15 1.8 --- Changes 2001/07/25 18:10:15 1.9 *************** *** 1,2 **** --- 1,12 ---- + Release 1.95.2 + - Nore changes to make MSVC happy with the build; add a single + workspace to support both the library and xmlwf applicatiion. + - Added compile-time constants that can be used to determine the + Expat version + - Removed a lot of GNU-specific dependencies to aide portability + among the various Unix flavors. + - Fix the UTF-8 BOM bug. + - Cleaned up warning messages for several compilers. + - Added the -Wall, -Wstrict-prototypes options for GCC. Release 1.95.1 Sun Oct 22 15:11:36 EDT 2000 - Changes to get expat to build under Microsoft compiler *************** *** 32,34 **** the current parse position. - Added reference material ! - Packaged into a distribution that builds a sharable library \ No newline at end of file --- 42,44 ---- the current parse position. - Added reference material ! - Packaged into a distribution that builds a sharable library From fdrake@users.sourceforge.net Wed Jul 25 19:39:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 11:39:24 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf xmlwf.dsp,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv22962 Modified Files: xmlwf.dsp Log Message: Change some options to end up with more rational output dirs. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xmlwf.dsp 2001/07/25 17:34:17 1.4 --- xmlwf.dsp 2001/07/25 18:39:22 1.5 *************** *** 51,55 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"..\bin\xmlwf.exe" !ELSEIF "$(CFG)" == "xmlwf - Win32 Debug" --- 51,55 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release\xmlwf.exe" !ELSEIF "$(CFG)" == "xmlwf - Win32 Debug" *************** *** 75,79 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\dbgbin\xmlwf.exe" !ENDIF --- 75,79 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug\xmlwf.exe" !ENDIF From fdrake@users.sourceforge.net Wed Jul 25 21:14:15 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Wed, 25 Jul 2001 13:14:15 -0700 Subject: [Expat-checkins] CVS: expat expat.spec,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv10328 Modified Files: expat.spec Log Message: Update the RPM .spec file for 1.95.2. Index: expat.spec =================================================================== RCS file: /cvsroot/expat/expat/expat.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** expat.spec 2001/03/03 07:20:04 1.2 --- expat.spec 2001/07/25 20:14:13 1.3 *************** *** 24,28 **** %install - rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/bin --- 24,27 ---- *************** *** 39,42 **** --- 38,45 ---- %changelog + * Wed Jul 25 2001 Fred L. Drake, Jr. + [Release 1.95.2-1] + - Updated for the 1.95.2 release. + * Sun Feb 18 2001 Sean Reifschneider [Release 1.95.1-1tummy] From fdrake@users.sourceforge.net Thu Jul 26 19:28:19 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 11:28:19 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.iss,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv18623 Added Files: expat.iss Log Message: Installer-builder script for Inno Setup, contributed by Tim Peters. --- NEW FILE: expat.iss --- (This appears to be a binary file; contents omitted.) From fdrake@users.sourceforge.net Thu Jul 26 20:44:44 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 12:44:44 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.iss,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv3926/win32 Modified Files: expat.iss Log Message: Changes so that we can actually build an installer, and fix the URLs. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** expat.iss 2001/07/26 18:28:17 1.1 --- expat.iss 2001/07/26 19:44:42 1.2 *************** *** 1,6 **** ! ; Basic setup script for the Inno Setep installer builder. For more ! ; information on the free installer builder, see www.jrsoftware.org. ; ! ; This script was contributed by Tim Peters. [Setup] --- 1,6 ---- ! ; Basic setup script for the Inno Setep installer builder. For more ! ; information on the free installer builder, see www.jrsoftware.org. ; ! ; This script was contributed by Tim Peters. [Setup] *************** *** 11,18 **** AppCopyright=Copyright © 1998-2001 Thai Open Source Software Center and Clark Cooper DefaultDirName={sd}\Expat-1.95.2 ! AppPublisher=PythonLabs at Zope Corporation ! AppPublisherURL=http://www.python.org ! AppSupportURL=http://www.python.org ! AppUpdatesURL=http://www.python.org DisableStartupPrompt=yes --- 11,19 ---- AppCopyright=Copyright © 1998-2001 Thai Open Source Software Center and Clark Cooper DefaultDirName={sd}\Expat-1.95.2 ! AppPublisher=The Expat Developers ! AppPublisherURL=http://expat.sourceforge.net/ ! AppSupportURL=http://expat.sourceforge.net/ ! AppUpdatesURL=http://expat.sourceforge.net/ ! SourceDir=.. DisableStartupPrompt=yes *************** *** 22,31 **** [Files] ! Source: *.h; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: *.dll; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: *.lib; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: *.html; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: *.css; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: *.exe; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: COPYING; DestDir: "{app}"; DestName: COPYING.txt; CopyMode: alwaysoverwrite ! Source: README; DestDir: "{app}"; DestName: README.txt; CopyMode: alwaysoverwrite --- 23,36 ---- [Files] ! Source: lib\*.c; DestDir: "{app}\Source"; CopyMode: alwaysoverwrite ! Source: lib\*.h; DestDir: "{app}\Source"; CopyMode: alwaysoverwrite ! Source: lib\*.dsp; DestDir: "{app}\Source"; CopyMode: alwaysoverwrite ! Source: lib\Release\*.dll; DestDir: "{app}\Libs"; CopyMode: alwaysoverwrite ! Source: lib\Release\*.lib; DestDir: "{app}\Libs"; CopyMode: alwaysoverwrite ! Source: doc\*.html; DestDir: "{app}\Doc"; CopyMode: alwaysoverwrite ! Source: doc\*.css; DestDir: "{app}\Doc"; CopyMode: alwaysoverwrite ! Source: xmlwf\Release\*.exe; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: win32\MANIFEST.txt; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: COPYING; DestDir: "{app}"; CopyMode: alwaysoverwrite; DestName: COPYING.txt ! Source: README; DestDir: "{app}"; CopyMode: alwaysoverwrite; DestName: README.txt ! From fdrake@users.sourceforge.net Thu Jul 26 20:50:30 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 12:50:30 -0700 Subject: [Expat-checkins] CVS: expat/win32 MANIFEST.txt,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv5406 Added Files: MANIFEST.txt Log Message: Add an overview of where everything ends up when installed by the Windows installer. This will be installed at the top of the Windows installation. --- NEW FILE: MANIFEST.txt --- (This appears to be a binary file; contents omitted.) From fdrake@users.sourceforge.net Thu Jul 26 20:58:08 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 12:58:08 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.iss,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv7483/win32 Modified Files: expat.iss Log Message: Make the built installer land in an existing directory. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** expat.iss 2001/07/26 19:44:42 1.2 --- expat.iss 2001/07/26 19:58:06 1.3 *************** *** 15,20 **** AppSupportURL=http://expat.sourceforge.net/ AppUpdatesURL=http://expat.sourceforge.net/ - SourceDir=.. DisableStartupPrompt=yes AllowNoIcons=yes --- 15,22 ---- AppSupportURL=http://expat.sourceforge.net/ AppUpdatesURL=http://expat.sourceforge.net/ + CompressLevel=9 + SourceDir=.. + OutputDir=win32 DisableStartupPrompt=yes AllowNoIcons=yes From fdrake@users.sourceforge.net Thu Jul 26 21:31:17 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 13:31:17 -0700 Subject: [Expat-checkins] CVS: expat Makefile.in,1.11,1.12 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv15508 Modified Files: Makefile.in Log Message: Add xmlwf to the default build, since the install includes it. Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile.in 2001/07/25 15:12:00 1.11 --- Makefile.in 2001/07/26 20:31:15 1.12 *************** *** 85,88 **** --- 85,90 ---- DISTRIBUTION = $(DISTDIR).tar.gz + default: lib xmlwf + buildlib: lib From fdrake@users.sourceforge.net Thu Jul 26 21:32:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 13:32:24 -0700 Subject: [Expat-checkins] CVS: expat Changes,1.9,1.10 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv15749 Modified Files: Changes Log Message: Settle on a release date, and note that there is now a Windows installer. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Changes 2001/07/25 18:10:15 1.9 --- Changes 2001/07/26 20:32:22 1.10 *************** *** 1,5 **** ! Release 1.95.2 - Nore changes to make MSVC happy with the build; add a single workspace to support both the library and xmlwf applicatiion. - Added compile-time constants that can be used to determine the Expat version --- 1,7 ---- ! Release 1.95.2 Fri Jul 27 2001 - Nore changes to make MSVC happy with the build; add a single workspace to support both the library and xmlwf applicatiion. + - Added a Windows installer for Windows users; includes + xmlwf.exe. - Added compile-time constants that can be used to determine the Expat version From fdrake@users.sourceforge.net Thu Jul 26 21:48:09 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 13:48:09 -0700 Subject: [Expat-checkins] CVS: expat configure.in,1.17,1.18 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv19249 Modified Files: configure.in Log Message: More GCC flags, when we're using GCC: -Wmissing-prototypes, to tighten up the warnings, and -fexceptions, to make the generated code exception-safe when using it with C++ code. This closes SF bug #419585. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** configure.in 2001/07/25 17:25:46 1.17 --- configure.in 2001/07/26 20:48:06 1.18 *************** *** 64,68 **** if test "$GCC" = yes ; then ! CFLAGS="$CFLAGS -Wall -Wstrict-prototypes" fi --- 64,68 ---- if test "$GCC" = yes ; then ! CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions" fi From fdrake@users.sourceforge.net Thu Jul 26 22:54:45 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 14:54:45 -0700 Subject: [Expat-checkins] CVS: expat/examples elements.c,NONE,1.1 .cvsignore,1.2,1.3 Makefile.in,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv1138 Modified Files: .cvsignore Makefile.in Added Files: elements.c Log Message: Move the "elements" example code here from "sample", so we only have one directory of short sample code. --- NEW FILE: elements.c --- (This appears to be a binary file; contents omitted.) Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/examples/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 2001/07/25 14:33:28 1.2 --- .cvsignore 2001/07/26 21:54:43 1.3 *************** *** 1,2 **** --- 1,3 ---- Makefile + elements outline Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/examples/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.in 2001/07/25 17:51:40 1.4 --- Makefile.in 2001/07/26 21:54:43 1.5 *************** *** 33,40 **** ! all: outline outline: outline.o ! $(CC) -o outline outline.o $(LDFLAGS) $(LIBS) check: $(SUBDIRS) --- 33,43 ---- ! all: elements outline ! ! elements: elements.o ! $(CC) -o $@ $< $(LDFLAGS) $(LIBS) outline: outline.o ! $(CC) -o $@ $< $(LDFLAGS) $(LIBS) check: $(SUBDIRS) *************** *** 44,48 **** clean: ! rm -f outline core *.o distclean: clean --- 47,51 ---- clean: ! rm -f elements outline core *.o distclean: clean From fdrake@users.sourceforge.net Thu Jul 26 22:55:35 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 14:55:35 -0700 Subject: [Expat-checkins] CVS: expat/sample .cvsignore,1.2,NONE Makefile.in,1.3,NONE build.bat,1.2,NONE elements.c,1.5,NONE Message-ID: Update of /cvsroot/expat/expat/sample In directory usw-pr-cvs1:/tmp/cvs-serv1334 Removed Files: .cvsignore Makefile.in build.bat elements.c Log Message: All sample code is now located in the "examples" directory. --- .cvsignore DELETED --- --- Makefile.in DELETED --- --- build.bat DELETED --- --- elements.c DELETED --- From fdrake@users.sourceforge.net Thu Jul 26 22:57:59 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Thu, 26 Jul 2001 14:57:59 -0700 Subject: [Expat-checkins] CVS: expat configure.in,1.18,1.19 Makefile.in,1.12,1.13 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv1877 Modified Files: configure.in Makefile.in Log Message: Remove the sample directory; it is no longer used. Index: configure.in =================================================================== RCS file: /cvsroot/expat/expat/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** configure.in 2001/07/26 20:48:06 1.18 --- configure.in 2001/07/26 21:57:57 1.19 *************** *** 106,112 **** OUTPUT="$OUTPUT xmlwf/Makefile" fi - if test -d ${srcdir}/sample; then - OUTPUT="$OUTPUT sample/Makefile" - fi if test -d ${srcdir}/examples; then OUTPUT="$OUTPUT examples/Makefile" --- 106,109 ---- Index: Makefile.in =================================================================== RCS file: /cvsroot/expat/expat/Makefile.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile.in 2001/07/26 20:31:15 1.12 --- Makefile.in 2001/07/26 21:57:57 1.13 *************** *** 77,81 **** VERSION = @VERSION@ ! SUBDIRS = lib examples sample xmlwf INSTALLSUBDIRS = lib xmlwf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --- 77,81 ---- VERSION = @VERSION@ ! SUBDIRS = lib examples xmlwf INSTALLSUBDIRS = lib xmlwf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 *************** *** 122,126 **** done rm -f config.h config.status config.log config.cache libtool ! rm -f Makefile examples/Makefile xmlwf/Makefile sample/Makefile extraclean: distclean --- 122,126 ---- done rm -f config.h config.status config.log config.cache libtool ! rm -f Makefile examples/Makefile xmlwf/Makefile extraclean: distclean From fdrake@users.sourceforge.net Fri Jul 27 14:28:52 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 06:28:52 -0700 Subject: [Expat-checkins] CVS: expat MANIFEST,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv2409 Modified Files: MANIFEST Log Message: Simplify the Unix source release; do not include all the Windows project files and the like. The Windows installer will include all that. Index: MANIFEST =================================================================== RCS file: /cvsroot/expat/expat/MANIFEST,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MANIFEST 2001/07/25 16:36:57 1.5 --- MANIFEST 2001/07/27 13:28:49 1.6 *************** *** 19,27 **** doc/style.css examples/Makefile.in examples/outline.c lib/Makefile.in lib/ascii.h lib/asciitab.h - lib/expat.dsp lib/expat.h.in lib/iasciitab.h --- 19,27 ---- doc/style.css examples/Makefile.in + examples/elements.c examples/outline.c lib/Makefile.in lib/ascii.h lib/asciitab.h lib/expat.h.in lib/iasciitab.h *************** *** 38,45 **** lib/xmltok_ns.c lib/winconfig.h - sample/Makefile.in - sample/build.bat - sample/elements.c - win32/expat.dsw xmlwf/Makefile.in xmlwf/codepage.c --- 38,41 ---- *************** *** 60,63 **** xmlwf/xmlurl.h xmlwf/xmlwf.c - xmlwf/xmlwf.dsp xmlwf/xmlwin32url.cxx --- 56,58 ---- From fdrake@users.sourceforge.net Fri Jul 27 14:59:02 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 06:59:02 -0700 Subject: [Expat-checkins] CVS: expat/xmltok xmltok.c,1.57,1.58 Message-ID: Update of /cvsroot/expat/expat/xmltok In directory usw-pr-cvs1:/tmp/cvs-serv8202/xmltok Modified Files: xmltok.c Log Message: I'm not really sure why this version of the file is still here, but migrate the UTF-8 BOM fix here as well, so this does not get too far out of sync. Index: xmltok.c =================================================================== RCS file: /cvsroot/expat/expat/xmltok/xmltok.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** xmltok.c 2000/09/21 21:20:18 1.57 --- xmltok.c 2001/07/27 13:59:00 1.58 *************** *** 1490,1493 **** --- 1490,1494 ---- return XML_TOK_PARTIAL; if ((unsigned char)ptr[2] == 0xBF) { + *nextTokPtr = ptr + 3; *encPtr = encodingTable[UTF_8_ENC]; return XML_TOK_BOM; From fdrake@users.sourceforge.net Fri Jul 27 15:05:32 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:05:32 -0700 Subject: [Expat-checkins] CVS: expat/examples .cvsignore,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv9684/examples Modified Files: .cvsignore Log Message: Ignore some additional Windows/MSVC cruft. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/examples/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 2001/07/26 21:54:43 1.3 --- .cvsignore 2001/07/27 14:05:30 1.4 *************** *** 1,3 **** --- 1,7 ---- Makefile elements + elements.plg outline + outline.plg + Debug + Release From fdrake@users.sourceforge.net Fri Jul 27 15:08:19 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:08:19 -0700 Subject: [Expat-checkins] CVS: expat/examples elements.dsp,NONE,1.1 outline.dsp,NONE,1.1 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv10495 Added Files: elements.dsp outline.dsp Log Message: More project files for MSVC. --- NEW FILE: elements.dsp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: outline.dsp --- (This appears to be a binary file; contents omitted.) From fdrake@users.sourceforge.net Fri Jul 27 15:21:26 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:21:26 -0700 Subject: [Expat-checkins] CVS: expat/examples elements.dsp,1.1,1.2 outline.dsp,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/examples In directory usw-pr-cvs1:/tmp/cvs-serv13150 Modified Files: elements.dsp outline.dsp Log Message: Avoid creating extra output directories from MSVC. Index: elements.dsp =================================================================== RCS file: /cvsroot/expat/expat/examples/elements.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** elements.dsp 2001/07/27 14:08:17 1.1 --- elements.dsp 2001/07/27 14:21:23 1.2 *************** *** 51,55 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 odbccp32.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib expat.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\lib\Release" --- 51,55 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 odbccp32.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib expat.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\lib\Release" *************** *** 58,73 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "elements___Win32_Debug" ! # PROP BASE Intermediate_Dir "elements___Win32_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "elements___Win32_Debug" ! # PROP Intermediate_Dir "elements___Win32_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /X /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 58,72 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 76,80 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 odbccp32.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"Debug/elements.exe" /libpath:"..\lib\Debug" --- 75,79 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 odbccp32.lib expat.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"Debug/elements.exe" /libpath:"..\lib\Debug" Index: outline.dsp =================================================================== RCS file: /cvsroot/expat/expat/examples/outline.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** outline.dsp 2001/07/27 14:08:17 1.1 --- outline.dsp 2001/07/27 14:21:23 1.2 *************** *** 51,56 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386 !ELSEIF "$(CFG)" == "outline - Win32 Debug" --- 51,56 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386 !ELSEIF "$(CFG)" == "outline - Win32 Debug" *************** *** 58,73 **** # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "outline___Win32_Debug" ! # PROP BASE Intermediate_Dir "outline___Win32_Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "outline___Win32_Debug" ! # PROP Intermediate_Dir "outline___Win32_Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /X /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 58,72 ---- # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 76,81 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"Debug/outline.exe" !ENDIF --- 75,80 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"Debug/outline.exe" !ENDIF From fdrake@users.sourceforge.net Fri Jul 27 15:24:26 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:24:26 -0700 Subject: [Expat-checkins] CVS: CVSROOT syncmail,1.3,1.4 Message-ID: Update of /cvsroot/expat/CVSROOT In directory usw-pr-cvs1:/tmp/cvs-serv13809 Modified Files: syncmail Log Message: Try to be a little smarter about what gets called a binary file; all whitespace characters are allowed! Index: syncmail =================================================================== RCS file: /cvsroot/expat/CVSROOT/syncmail,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** syncmail 2001/07/25 13:53:30 1.3 --- syncmail 2001/07/27 14:24:24 1.4 *************** *** 79,82 **** --- 79,88 ---- + if hasattr(string, "ascii_whitespace"): + _whitespace = string.ascii_whitespace + else: + _whitespace = string.whitespace + + def usage(code, msg=''): *************** *** 109,112 **** --- 115,120 ---- for c in line: if c < ' ' or c > chr(127): + if c in _whitespace: + continue binary = 1 break From fdrake@users.sourceforge.net Fri Jul 27 15:39:44 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:39:44 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.dsw,1.2,NONE Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv20220/win32 Removed Files: expat.dsw Log Message: Move the MSVC workspace up one directory level so the generated Windows installer can be more reasonable. --- expat.dsw DELETED --- From fdrake@users.sourceforge.net Fri Jul 27 15:40:44 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:40:44 -0700 Subject: [Expat-checkins] CVS: expat/win32 .cvsignore,1.2,1.3 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv20728/win32 Modified Files: .cvsignore Log Message: No longer need to ignore MSVC turds in this directory. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/win32/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 2001/07/25 17:29:46 1.2 --- .cvsignore 2001/07/27 14:40:42 1.3 *************** *** 3,8 **** expat.IMB expat.IMD - expat.ncb - expat.opt expat.PFI expat.PO --- 3,6 ---- From fdrake@users.sourceforge.net Fri Jul 27 15:42:35 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:42:35 -0700 Subject: [Expat-checkins] CVS: expat .cvsignore,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv21560 Modified Files: .cvsignore Log Message: Now we need to ignore some MSVC turds here. Index: .cvsignore =================================================================== RCS file: /cvsroot/expat/expat/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** .cvsignore 2001/07/25 13:52:21 1.5 --- .cvsignore 2001/07/27 14:42:33 1.6 *************** *** 8,9 **** --- 8,11 ---- config.h libtool + expat.ncb + expat.opt From fdrake@users.sourceforge.net Fri Jul 27 15:46:08 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:46:08 -0700 Subject: [Expat-checkins] CVS: expat expat.dsw,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv23246 Added Files: expat.dsw Log Message: Adding back the MSVC workspace, adding in the sample projects as well. From fdrake@users.sourceforge.net Fri Jul 27 15:54:13 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:54:13 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.iss,1.3,1.4 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv26699/win32 Modified Files: expat.iss Log Message: Try to make the Windows installer a little more rational, and install all the sources a developer might want, not just the parser itself. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** expat.iss 2001/07/26 19:58:06 1.3 --- expat.iss 2001/07/27 14:54:11 1.4 *************** *** 9,13 **** AppVersion=1.95.2 AppVerName=expat 1.95.2 ! AppCopyright=Copyright © 1998-2001 Thai Open Source Software Center and Clark Cooper DefaultDirName={sd}\Expat-1.95.2 AppPublisher=The Expat Developers --- 9,13 ---- AppVersion=1.95.2 AppVerName=expat 1.95.2 ! AppCopyright=Copyright © 1998-2001 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers DefaultDirName={sd}\Expat-1.95.2 AppPublisher=The Expat Developers *************** *** 15,18 **** --- 15,20 ---- AppSupportURL=http://expat.sourceforge.net/ AppUpdatesURL=http://expat.sourceforge.net/ + UninstallDisplayName=Expat XML Parser (version 1.95.2) + UninstallFilesDir={app}\Uninstaller CompressLevel=9 *************** *** 25,38 **** [Files] ! Source: lib\*.c; DestDir: "{app}\Source"; CopyMode: alwaysoverwrite ! Source: lib\*.h; DestDir: "{app}\Source"; CopyMode: alwaysoverwrite ! Source: lib\*.dsp; DestDir: "{app}\Source"; CopyMode: alwaysoverwrite ! Source: lib\Release\*.dll; DestDir: "{app}\Libs"; CopyMode: alwaysoverwrite ! Source: lib\Release\*.lib; DestDir: "{app}\Libs"; CopyMode: alwaysoverwrite ! Source: doc\*.html; DestDir: "{app}\Doc"; CopyMode: alwaysoverwrite ! Source: doc\*.css; DestDir: "{app}\Doc"; CopyMode: alwaysoverwrite ! Source: xmlwf\Release\*.exe; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: win32\MANIFEST.txt; DestDir: "{app}"; CopyMode: alwaysoverwrite ! Source: COPYING; DestDir: "{app}"; CopyMode: alwaysoverwrite; DestName: COPYING.txt ! Source: README; DestDir: "{app}"; CopyMode: alwaysoverwrite; DestName: README.txt ! --- 27,45 ---- [Files] ! CopyMode: alwaysoverwrite; Source: xmlwf\Release\*.exe; DestDir: "{app}" ! CopyMode: alwaysoverwrite; Source: win32\MANIFEST.txt; DestDir: "{app}" ! CopyMode: alwaysoverwrite; Source: COPYING; DestDir: "{app}"; DestName: COPYING.txt ! CopyMode: alwaysoverwrite; Source: README; DestDir: "{app}"; DestName: README.txt ! CopyMode: alwaysoverwrite; Source: doc\*.html; DestDir: "{app}\Doc" ! CopyMode: alwaysoverwrite; Source: doc\*.css; DestDir: "{app}\Doc" ! CopyMode: alwaysoverwrite; Source: lib\Release\*.dll; DestDir: "{app}\Libs" ! CopyMode: alwaysoverwrite; Source: lib\Release\*.lib; DestDir: "{app}\Libs" ! CopyMode: alwaysoverwrite; Source: expat.dsw; DestDir: "{app}\Source" ! CopyMode: alwaysoverwrite; Source: lib\*.c; DestDir: "{app}\Source\lib" ! CopyMode: alwaysoverwrite; Source: lib\*.h; DestDir: "{app}\Source\lib" ! CopyMode: alwaysoverwrite; Source: lib\*.dsp; DestDir: "{app}\Source\lib" ! CopyMode: alwaysoverwrite; Source: examples\*.c; DestDir: "{app}\Source\examples" ! CopyMode: alwaysoverwrite; Source: examples\*.dsp; DestDir: "{app}\Source\examples" ! CopyMode: alwaysoverwrite; Source: xmlwf\*.c*; DestDir: "{app}\Source\xmlwf" ! CopyMode: alwaysoverwrite; Source: xmlwf\*.h; DestDir: "{app}\Source\xmlwf" ! CopyMode: alwaysoverwrite; Source: xmlwf\*.dsp; DestDir: "{app}\Source\xmlwf" From fdrake@users.sourceforge.net Fri Jul 27 15:56:33 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:56:33 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf xmlwf.dsp,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv27637/xmlwf Modified Files: xmlwf.dsp Log Message: Update the lib and xmlwf project files to be part of the larger workspace. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** xmlwf.dsp 2001/07/25 18:39:22 1.5 --- xmlwf.dsp 2001/07/27 14:56:31 1.6 *************** *** 67,71 **** # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" --- 67,72 ---- # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /FD /c ! # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" *************** *** 75,79 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug\xmlwf.exe" !ENDIF --- 76,80 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"Debug\xmlwf.exe" !ENDIF From fdrake@users.sourceforge.net Fri Jul 27 15:56:33 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 07:56:33 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.dsp,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv27637/lib Modified Files: expat.dsp Log Message: Update the lib and xmlwf project files to be part of the larger workspace. Index: expat.dsp =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** expat.dsp 2001/07/24 21:41:05 1.4 --- expat.dsp 2001/07/27 14:56:31 1.5 *************** *** 1,172 **** ! # Microsoft Developer Studio Project File - Name="expat" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! ! CFG=expat - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "expat.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "expat.mak" CFG="expat - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "expat - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "expat - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! MTL=midl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "expat - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /FD /c ! # SUBTRACT CPP /YX /Yc /Yu ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "NDEBUG" ! # ADD RSC /l 0x409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! ! !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FR /FD /GZ /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_DEBUG" ! # ADD RSC /l 0x409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! ! !ENDIF ! ! # Begin Target ! ! # Name "expat - Win32 Release" ! # Name "expat - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\xmlparse.c ! ! !IF "$(CFG)" == "expat - Win32 Release" ! ! # ADD CPP /D VERSION=\"expat_1.95.2\" ! ! !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! ! # ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\" ! ! !ENDIF ! ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmlrole.c ! # ADD CPP /D VERSION=\"expat_1.95.2\" ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmltok.c ! # ADD CPP /D VERSION=\"expat_1.95.2\" ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\ascii.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\asciitab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\config.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\expat.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\iasciitab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\latin1tab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\nametab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\utf8tab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmlrole.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmltok.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmltok_impl.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,172 ---- ! # Microsoft Developer Studio Project File - Name="expat" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 ! ! CFG=expat - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "expat.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "expat.mak" CFG="expat - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "expat - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE "expat - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! MTL=midl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "expat - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c ! # ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /D "COMPILED_FROM_DSP" /FD /c ! # SUBTRACT CPP /YX /Yc /Yu ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "NDEBUG" ! # ADD RSC /l 0x409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 ! ! !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /GZ /c ! # ADD CPP /nologo /MTd /W3 /GX /ZI /Od /D "_DEBUG" /D "COMPILED_FROM_DSP" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /FR /FD /GZ /c ! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_DEBUG" ! # ADD RSC /l 0x409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 ! ! !ENDIF ! ! # Begin Target ! ! # Name "expat - Win32 Release" ! # Name "expat - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\xmlparse.c ! ! !IF "$(CFG)" == "expat - Win32 Release" ! ! # ADD CPP /D VERSION=\"expat_1.95.2\" ! ! !ELSEIF "$(CFG)" == "expat - Win32 Debug" ! ! # ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\" ! ! !ENDIF ! ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmlrole.c ! # ADD CPP /D VERSION=\"expat_1.95.2\" ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmltok.c ! # ADD CPP /D VERSION=\"expat_1.95.2\" ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\ascii.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\asciitab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\config.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\expat.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\iasciitab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\latin1tab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\nametab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\utf8tab.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmlrole.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmltok.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\xmltok_impl.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project From fdrake@users.sourceforge.net Fri Jul 27 16:12:49 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 08:12:49 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf xmlwf.dsp,1.6,1.7 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv31263/xmlwf Modified Files: xmlwf.dsp Log Message: Don't use the program database in MSVC. The others got this right. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xmlwf.dsp 2001/07/27 14:56:31 1.6 --- xmlwf.dsp 2001/07/27 15:12:47 1.7 *************** *** 51,55 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"Release\xmlwf.exe" !ELSEIF "$(CFG)" == "xmlwf - Win32 Debug" --- 51,55 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"Release\xmlwf.exe" !ELSEIF "$(CFG)" == "xmlwf - Win32 Debug" From fdrake@users.sourceforge.net Fri Jul 27 16:22:37 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 08:22:37 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.iss,1.4,1.5 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv1097/win32 Modified Files: expat.iss Log Message: Add more information to the Welcome screen of the installer. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** expat.iss 2001/07/27 14:54:11 1.4 --- expat.iss 2001/07/27 15:22:35 1.5 *************** *** 44,45 **** --- 44,49 ---- CopyMode: alwaysoverwrite; Source: xmlwf\*.h; DestDir: "{app}\Source\xmlwf" CopyMode: alwaysoverwrite; Source: xmlwf\*.dsp; DestDir: "{app}\Source\xmlwf" + + [Messages] + WelcomeLabel1=Welcome to the Expat XML Parser Setup Wizard + WelcomeLabel2=This will install [name/ver] on your computer.%n%nExpat is an XML parser with a C-language API, and is primarily made available to allow developers to build applications which use XML using a portable API and fast implementation.%n%nIt is strongly recommended that you close all other applications you have running before continuing. This will help prevent any conflicts during the installation process. From fdrake@users.sourceforge.net Fri Jul 27 16:31:24 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 08:31:24 -0700 Subject: [Expat-checkins] CVS: expat/win32 expat.iss,1.5,1.6 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv3057/win32 Modified Files: expat.iss Log Message: Shorten the name of the directory we store the uninstaller in. Index: expat.iss =================================================================== RCS file: /cvsroot/expat/expat/win32/expat.iss,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** expat.iss 2001/07/27 15:22:35 1.5 --- expat.iss 2001/07/27 15:31:22 1.6 *************** *** 16,20 **** AppUpdatesURL=http://expat.sourceforge.net/ UninstallDisplayName=Expat XML Parser (version 1.95.2) ! UninstallFilesDir={app}\Uninstaller CompressLevel=9 --- 16,20 ---- AppUpdatesURL=http://expat.sourceforge.net/ UninstallDisplayName=Expat XML Parser (version 1.95.2) ! UninstallFilesDir={app}\Uninstall CompressLevel=9 From fdrake@users.sourceforge.net Fri Jul 27 17:30:59 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 09:30:59 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.9,1.10 xmlparse.c,1.18,1.19 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv15495 Modified Files: expat.h.in xmlparse.c Log Message: Make sure that XMLPARSEAPI specifies the calling convention when building under MSVC -- this is needed when using the pre-compiled DLL with projects built using a different calling convention. XMLPARSEAPI now takes the return type as a parameter and inserts annotations on both sides of the type to make sure the compiler is happy. A new macro, XMLCALLBACK, is used to perform similar annotation of the callback function types, which do not need the dllimport/dllexport annotations but do still need the __cdecl annotation. This closes SF bug #413653. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** expat.h.in 2001/07/25 17:22:48 1.9 --- expat.h.in 2001/07/27 16:30:56 1.10 *************** *** 11,17 **** #ifndef XMLPARSEAPI # if defined(__declspec) && !defined(__BEOS__) ! # define XMLPARSEAPI __declspec(dllimport) # else ! # define XMLPARSEAPI /* nothing */ # endif #endif /* not defined XMLPARSEAPI */ --- 11,19 ---- #ifndef XMLPARSEAPI # if defined(__declspec) && !defined(__BEOS__) ! # define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl ! # define XMLCALLBACK(type) type __cdecl # else ! # define XMLPARSEAPI(type) type ! # define XMLCALLBACK(type) type # endif #endif /* not defined XMLPARSEAPI */ *************** *** 77,85 **** */ ! typedef void (*XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); ! XMLPARSEAPI void XML_SetElementDeclHandler(XML_Parser parser, XML_ElementDeclHandler eldecl); --- 79,87 ---- */ ! typedef XMLCALLBACK(void) (*XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); ! XMLPARSEAPI(void) XML_SetElementDeclHandler(XML_Parser parser, XML_ElementDeclHandler eldecl); *************** *** 95,106 **** */ ! typedef void (*XML_AttlistDeclHandler) (void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); ! XMLPARSEAPI void XML_SetAttlistDeclHandler(XML_Parser parser, XML_AttlistDeclHandler attdecl); --- 97,108 ---- */ ! typedef XMLCALLBACK(void) (*XML_AttlistDeclHandler) (void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); ! XMLPARSEAPI(void) XML_SetAttlistDeclHandler(XML_Parser parser, XML_AttlistDeclHandler attdecl); *************** *** 115,124 **** */ ! typedef void (*XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); ! XMLPARSEAPI void XML_SetXmlDeclHandler(XML_Parser parser, XML_XmlDeclHandler xmldecl); --- 117,126 ---- */ ! typedef XMLCALLBACK(void) (*XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); ! XMLPARSEAPI(void) XML_SetXmlDeclHandler(XML_Parser parser, XML_XmlDeclHandler xmldecl); *************** *** 134,138 **** external protocol or null if there is none specified. */ ! XMLPARSEAPI XML_Parser XML_ParserCreate(const XML_Char *encoding); --- 136,140 ---- external protocol or null if there is none specified. */ ! XMLPARSEAPI(XML_Parser) XML_ParserCreate(const XML_Char *encoding); *************** *** 147,151 **** the name and prefix will be passed through without expansion. */ ! XMLPARSEAPI XML_Parser XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); --- 149,153 ---- the name and prefix will be passed through without expansion. */ ! XMLPARSEAPI(XML_Parser) XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); *************** *** 161,165 **** */ ! XMLPARSEAPI XML_Parser XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, --- 163,167 ---- */ ! XMLPARSEAPI(XML_Parser) XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, *************** *** 169,195 **** names and values are 0 terminated. */ ! typedef void (*XML_StartElementHandler)(void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef void (*XML_EndElementHandler)(void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef void (*XML_CharacterDataHandler)(void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef void (*XML_ProcessingInstructionHandler)(void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef void (*XML_CommentHandler)(void *userData, const XML_Char *data); ! typedef void (*XML_StartCdataSectionHandler)(void *userData); ! typedef void (*XML_EndCdataSectionHandler)(void *userData); /* This is called for any characters in the XML document for --- 171,197 ---- names and values are 0 terminated. */ ! typedef XMLCALLBACK(void) (*XML_StartElementHandler)(void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef XMLCALLBACK(void) (*XML_EndElementHandler)(void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef XMLCALLBACK(void) (*XML_CharacterDataHandler)(void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef XMLCALLBACK(void) (*XML_ProcessingInstructionHandler)(void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef XMLCALLBACK(void) (*XML_CommentHandler)(void *userData, const XML_Char *data); ! typedef XMLCALLBACK(void) (*XML_StartCdataSectionHandler)(void *userData); ! typedef XMLCALLBACK(void) (*XML_EndCdataSectionHandler)(void *userData); /* This is called for any characters in the XML document for *************** *** 206,226 **** multiple calls. */ ! typedef void (*XML_DefaultHandler)(void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef void (*XML_StartDoctypeDeclHandler)(void *userData, ! const XML_Char *doctypeName, ! const XML_Char *sysid, ! const XML_Char *pubid, ! int has_internal_subset ! ); /* This is called for the start of the DOCTYPE declaration when the closing > is encountered, but after processing any external subset. */ ! typedef void (*XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity --- 208,227 ---- multiple calls. */ ! typedef XMLCALLBACK(void) (*XML_DefaultHandler)(void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef XMLCALLBACK(void) (*XML_StartDoctypeDeclHandler)(void *userData, ! const XML_Char *doctypeName, ! const XML_Char *sysid, ! const XML_Char *pubid, ! int has_internal_subset); /* This is called for the start of the DOCTYPE declaration when the closing > is encountered, but after processing any external subset. */ ! typedef XMLCALLBACK(void) (*XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity *************** *** 240,254 **** */ ! typedef void (*XML_EntityDeclHandler) (void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); ! XMLPARSEAPI void XML_SetEntityDeclHandler(XML_Parser parser, XML_EntityDeclHandler handler); --- 241,255 ---- */ ! typedef XMLCALLBACK(void) (*XML_EntityDeclHandler) (void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); ! XMLPARSEAPI(void) XML_SetEntityDeclHandler(XML_Parser parser, XML_EntityDeclHandler handler); *************** *** 262,271 **** The other arguments may be. */ ! typedef void (*XML_UnparsedEntityDeclHandler)(void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. --- 263,272 ---- The other arguments may be. */ ! typedef XMLCALLBACK(void) (*XML_UnparsedEntityDeclHandler)(void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. *************** *** 273,281 **** The notationName will never be null. The other arguments can be. */ ! typedef void (*XML_NotationDeclHandler)(void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for --- 274,282 ---- The notationName will never be null. The other arguments can be. */ ! typedef XMLCALLBACK(void) (*XML_NotationDeclHandler)(void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for *************** *** 285,294 **** For an xmlns="" attribute, uri will be null. */ ! typedef void (*XML_StartNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef void (*XML_EndNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone (it has an --- 286,295 ---- For an xmlns="" attribute, uri will be null. */ ! typedef XMLCALLBACK(void) (*XML_StartNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef XMLCALLBACK(void) (*XML_EndNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone (it has an *************** *** 298,302 **** XML_ERROR_NOT_STANDALONE error. */ ! typedef int (*XML_NotStandaloneHandler)(void *userData); /* This is called for a reference to an external parsed general entity. --- 299,303 ---- XML_ERROR_NOT_STANDALONE error. */ ! typedef XMLCALLBACK(int) (*XML_NotStandaloneHandler)(void *userData); /* This is called for a reference to an external parsed general entity. *************** *** 325,333 **** userData. */ ! typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This structure is filled in by the XML_UnknownEncodingHandler --- 326,334 ---- userData. */ ! typedef XMLCALLBACK(int) (*XML_ExternalEntityRefHandler)(XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This structure is filled in by the XML_UnknownEncodingHandler *************** *** 365,372 **** 2. No character may require more than 4 bytes to encode. ! 3. All characters encoded must have Unicode scalar values <= 0xFFFF, ! (ie characters that would be encoded by surrogates in UTF-16 ! are not allowed). Note that this restriction doesn't apply to ! the built-in support for UTF-8 and UTF-16. 4. No Unicode character may be encoded by more than one distinct sequence --- 366,373 ---- 2. No character may require more than 4 bytes to encode. ! 3. All characters encoded must have Unicode scalar values <= 0xFFFF, (i.e., ! characters that would be encoded by surrogates in UTF-16 are not ! allowed). Note that this restriction doesn't apply to the built-in ! support for UTF-8 and UTF-16. 4. No Unicode character may be encoded by more than one distinct sequence *************** *** 391,430 **** then the parser will return an XML_UNKNOWN_ENCODING error. */ ! typedef int (*XML_UnknownEncodingHandler)(void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); ! XMLPARSEAPI void XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end); ! XMLPARSEAPI void XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler); ! XMLPARSEAPI void XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler); ! XMLPARSEAPI void XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler handler); ! XMLPARSEAPI void XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler handler); ! XMLPARSEAPI void XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler handler); ! XMLPARSEAPI void XML_SetCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end); ! XMLPARSEAPI void XML_SetStartCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start); ! XMLPARSEAPI void XML_SetEndCdataSectionHandler(XML_Parser parser, XML_EndCdataSectionHandler end); --- 392,431 ---- then the parser will return an XML_UNKNOWN_ENCODING error. */ ! typedef XMLCALLBACK(int) (*XML_UnknownEncodingHandler)(void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); ! XMLPARSEAPI(void) XML_SetElementHandler(XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end); ! XMLPARSEAPI(void) XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler); ! XMLPARSEAPI(void) XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler); ! XMLPARSEAPI(void) XML_SetCharacterDataHandler(XML_Parser parser, XML_CharacterDataHandler handler); ! XMLPARSEAPI(void) XML_SetProcessingInstructionHandler(XML_Parser parser, XML_ProcessingInstructionHandler handler); ! XMLPARSEAPI(void) XML_SetCommentHandler(XML_Parser parser, XML_CommentHandler handler); ! XMLPARSEAPI(void) XML_SetCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end); ! XMLPARSEAPI(void) XML_SetStartCdataSectionHandler(XML_Parser parser, XML_StartCdataSectionHandler start); ! XMLPARSEAPI(void) XML_SetEndCdataSectionHandler(XML_Parser parser, XML_EndCdataSectionHandler end); *************** *** 434,438 **** handler. */ ! XMLPARSEAPI void XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler handler); --- 435,439 ---- handler. */ ! XMLPARSEAPI(void) XML_SetDefaultHandler(XML_Parser parser, XML_DefaultHandler handler); *************** *** 442,488 **** default handler. */ ! XMLPARSEAPI void XML_SetDefaultHandlerExpand(XML_Parser parser, XML_DefaultHandler handler); ! XMLPARSEAPI void XML_SetDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end); ! XMLPARSEAPI void XML_SetStartDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start); ! XMLPARSEAPI void XML_SetEndDoctypeDeclHandler(XML_Parser parser, XML_EndDoctypeDeclHandler end); ! XMLPARSEAPI void XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler handler); ! XMLPARSEAPI void XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler handler); ! XMLPARSEAPI void XML_SetNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end); ! XMLPARSEAPI void XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start); ! XMLPARSEAPI void XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end); ! XMLPARSEAPI void XML_SetNotStandaloneHandler(XML_Parser parser, XML_NotStandaloneHandler handler); ! XMLPARSEAPI void XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler handler); --- 443,489 ---- default handler. */ ! XMLPARSEAPI(void) XML_SetDefaultHandlerExpand(XML_Parser parser, XML_DefaultHandler handler); ! XMLPARSEAPI(void) XML_SetDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end); ! XMLPARSEAPI(void) XML_SetStartDoctypeDeclHandler(XML_Parser parser, XML_StartDoctypeDeclHandler start); ! XMLPARSEAPI(void) XML_SetEndDoctypeDeclHandler(XML_Parser parser, XML_EndDoctypeDeclHandler end); ! XMLPARSEAPI(void) XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_UnparsedEntityDeclHandler handler); ! XMLPARSEAPI(void) XML_SetNotationDeclHandler(XML_Parser parser, XML_NotationDeclHandler handler); ! XMLPARSEAPI(void) XML_SetNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end); ! XMLPARSEAPI(void) XML_SetStartNamespaceDeclHandler(XML_Parser parser, XML_StartNamespaceDeclHandler start); ! XMLPARSEAPI(void) XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler end); ! XMLPARSEAPI(void) XML_SetNotStandaloneHandler(XML_Parser parser, XML_NotStandaloneHandler handler); ! XMLPARSEAPI(void) XML_SetExternalEntityRefHandler(XML_Parser parser, XML_ExternalEntityRefHandler handler); *************** *** 491,498 **** as the first argument to the external entity ref handler instead of the parser object. */ ! XMLPARSEAPI void XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg); ! XMLPARSEAPI void XML_SetUnknownEncodingHandler(XML_Parser parser, XML_UnknownEncodingHandler handler, --- 492,499 ---- as the first argument to the external entity ref handler instead of the parser object. */ ! XMLPARSEAPI(void) XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg); ! XMLPARSEAPI(void) XML_SetUnknownEncodingHandler(XML_Parser parser, XML_UnknownEncodingHandler handler, *************** *** 502,506 **** processing instruction or character data. It causes the corresponding markup to be passed to the default handler. */ ! XMLPARSEAPI void XML_DefaultCurrent(XML_Parser parser); --- 503,507 ---- processing instruction or character data. It causes the corresponding markup to be passed to the default handler. */ ! XMLPARSEAPI(void) XML_DefaultCurrent(XML_Parser parser); *************** *** 516,524 **** */ ! XMLPARSEAPI void XML_SetReturnNSTriplet(XML_Parser parser, int do_nst); /* This value is passed as the userData argument to callbacks. */ ! XMLPARSEAPI void XML_SetUserData(XML_Parser parser, void *userData); --- 517,525 ---- */ ! XMLPARSEAPI(void) XML_SetReturnNSTriplet(XML_Parser parser, int do_nst); /* This value is passed as the userData argument to callbacks. */ ! XMLPARSEAPI(void) XML_SetUserData(XML_Parser parser, void *userData); *************** *** 530,534 **** or XML_ParseBuffer. */ ! XMLPARSEAPI int XML_SetEncoding(XML_Parser parser, const XML_Char *encoding); --- 531,535 ---- or XML_ParseBuffer. */ ! XMLPARSEAPI(int) XML_SetEncoding(XML_Parser parser, const XML_Char *encoding); *************** *** 537,541 **** The userData will still be accessible using XML_GetUserData. */ ! void XMLPARSEAPI XML_UseParserAsHandlerArg(XML_Parser parser); --- 538,542 ---- The userData will still be accessible using XML_GetUserData. */ ! XMLPARSEAPI(void) XML_UseParserAsHandlerArg(XML_Parser parser); *************** *** 547,554 **** Returns zero if out of memory, non-zero otherwise. */ ! XMLPARSEAPI int XML_SetBase(XML_Parser parser, const XML_Char *base); ! XMLPARSEAPI const XML_Char * XML_GetBase(XML_Parser parser); --- 548,555 ---- Returns zero if out of memory, non-zero otherwise. */ ! XMLPARSEAPI(int) XML_SetBase(XML_Parser parser, const XML_Char *base); ! XMLPARSEAPI(const XML_Char *) XML_GetBase(XML_Parser parser); *************** *** 559,563 **** XML_StartElementHandler. */ ! XMLPARSEAPI int XML_GetSpecifiedAttributeCount(XML_Parser parser); --- 560,564 ---- XML_StartElementHandler. */ ! XMLPARSEAPI(int) XML_GetSpecifiedAttributeCount(XML_Parser parser); *************** *** 567,571 **** into the atts array passed to the XML_StartElementHandler. */ ! XMLPARSEAPI int XML_GetIdAttributeIndex(XML_Parser parser); --- 568,572 ---- into the atts array passed to the XML_StartElementHandler. */ ! XMLPARSEAPI(int) XML_GetIdAttributeIndex(XML_Parser parser); *************** *** 573,583 **** The last call to XML_Parse must have isFinal true; len may be zero for this call (or any other). */ ! XMLPARSEAPI int XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); ! XMLPARSEAPI void * XML_GetBuffer(XML_Parser parser, int len); ! XMLPARSEAPI int XML_ParseBuffer(XML_Parser parser, int len, int isFinal); --- 574,584 ---- The last call to XML_Parse must have isFinal true; len may be zero for this call (or any other). */ ! XMLPARSEAPI(int) XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); ! XMLPARSEAPI(void *) XML_GetBuffer(XML_Parser parser, int len); ! XMLPARSEAPI(int) XML_ParseBuffer(XML_Parser parser, int len, int isFinal); *************** *** 597,601 **** from the parser argument. Returns 0 if out of memory. Otherwise returns a new XML_Parser object. */ ! XMLPARSEAPI XML_Parser XML_ExternalEntityParserCreate(XML_Parser parser, const XML_Char *context, --- 598,602 ---- from the parser argument. Returns 0 if out of memory. Otherwise returns a new XML_Parser object. */ ! XMLPARSEAPI(XML_Parser) XML_ExternalEntityParserCreate(XML_Parser parser, const XML_Char *context, *************** *** 627,631 **** entities is requested; otherwise it will return non-zero. */ ! XMLPARSEAPI int XML_SetParamEntityParsing(XML_Parser parser, enum XML_ParamEntityParsing parsing); --- 628,632 ---- entities is requested; otherwise it will return non-zero. */ ! XMLPARSEAPI(int) XML_SetParamEntityParsing(XML_Parser parser, enum XML_ParamEntityParsing parsing); *************** *** 661,665 **** returns information about the error. */ ! XMLPARSEAPI enum XML_Error XML_GetErrorCode(XML_Parser parser); --- 662,666 ---- returns information about the error. */ ! XMLPARSEAPI(enum XML_Error) XML_GetErrorCode(XML_Parser parser); *************** *** 672,683 **** of the sequence of characters that generated the event. */ ! int XMLPARSEAPI XML_GetCurrentLineNumber(XML_Parser parser); ! int XMLPARSEAPI XML_GetCurrentColumnNumber(XML_Parser parser); ! long XMLPARSEAPI XML_GetCurrentByteIndex(XML_Parser parser); /* Return the number of bytes in the current event. Returns 0 if the event is in an internal entity. */ ! XMLPARSEAPI int XML_GetCurrentByteCount(XML_Parser parser); --- 673,684 ---- of the sequence of characters that generated the event. */ ! XMLPARSEAPI(int) XML_GetCurrentLineNumber(XML_Parser parser); ! XMLPARSEAPI(int) XML_GetCurrentColumnNumber(XML_Parser parser); ! XMLPARSEAPI(long) XML_GetCurrentByteIndex(XML_Parser parser); /* Return the number of bytes in the current event. Returns 0 if the event is in an internal entity. */ ! XMLPARSEAPI(int) XML_GetCurrentByteCount(XML_Parser parser); *************** *** 692,696 **** the handler that makes the call. */ ! XMLPARSEAPI const char * XML_GetInputContext(XML_Parser parser, int *offset, --- 693,697 ---- the handler that makes the call. */ ! XMLPARSEAPI(const char *) XML_GetInputContext(XML_Parser parser, int *offset, *************** *** 703,715 **** /* Frees memory used by the parser. */ ! XMLPARSEAPI void XML_ParserFree(XML_Parser parser); /* Returns a string describing the error. */ ! XMLPARSEAPI const XML_LChar * XML_ErrorString(int code); /* Return a string containing the version number of this expat */ ! XMLPARSEAPI const XML_LChar * XML_ExpatVersion(void); --- 704,716 ---- /* Frees memory used by the parser. */ ! XMLPARSEAPI(void) XML_ParserFree(XML_Parser parser); /* Returns a string describing the error. */ ! XMLPARSEAPI(const XML_LChar *) XML_ErrorString(int code); /* Return a string containing the version number of this expat */ ! XMLPARSEAPI(const XML_LChar *) XML_ExpatVersion(void); *************** *** 723,727 **** number information for this version of expat */ ! XMLPARSEAPI XML_Expat_Version XML_ExpatVersionInfo(void); --- 724,728 ---- number information for this version of expat */ ! XMLPARSEAPI(XML_Expat_Version) XML_ExpatVersionInfo(void); Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** xmlparse.c 2001/07/25 17:20:45 1.18 --- xmlparse.c 2001/07/27 16:30:56 1.19 *************** *** 6,17 **** #ifdef COMPILED_FROM_DSP # include "winconfig.h" ! # define XMLPARSEAPI __declspec(dllexport) # include "expat.h" # undef XMLPARSEAPI #else #include #ifdef __declspec ! # define XMLPARSEAPI __declspec(dllexport) #endif --- 6,20 ---- #ifdef COMPILED_FROM_DSP # include "winconfig.h" ! # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl ! # define XMLCALLBACK(type) type __cdecl # include "expat.h" # undef XMLPARSEAPI + # undef XMLCALLBACK #else #include #ifdef __declspec ! # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl ! # define XMLCALLBACK(type) type __cdecl #endif *************** *** 20,23 **** --- 23,27 ---- #ifdef __declspec # undef XMLPARSEAPI + # undef XMLCALLBACK #endif #endif /* ndef COMPILED_FROM_DSP */ From fdrake@users.sourceforge.net Fri Jul 27 18:03:03 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 10:03:03 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.10,1.11 xmlparse.c,1.19,1.20 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv22971 Modified Files: expat.h.in xmlparse.c Log Message: Try again. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** expat.h.in 2001/07/27 16:30:56 1.10 --- expat.h.in 2001/07/27 17:03:01 1.11 *************** *** 12,19 **** # if defined(__declspec) && !defined(__BEOS__) # define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl ! # define XMLCALLBACK(type) type __cdecl # else # define XMLPARSEAPI(type) type ! # define XMLCALLBACK(type) type # endif #endif /* not defined XMLPARSEAPI */ --- 12,19 ---- # if defined(__declspec) && !defined(__BEOS__) # define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl ! # define XMLCALLBACK(type,name) type (* __cdecl name) # else # define XMLPARSEAPI(type) type ! # define XMLCALLBACK(type,name) type (* name) # endif #endif /* not defined XMLPARSEAPI */ *************** *** 79,85 **** */ ! typedef XMLCALLBACK(void) (*XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); XMLPARSEAPI(void) --- 79,85 ---- */ ! typedef XMLCALLBACK(void, XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); XMLPARSEAPI(void) *************** *** 97,106 **** */ ! typedef XMLCALLBACK(void) (*XML_AttlistDeclHandler) (void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); XMLPARSEAPI(void) --- 97,106 ---- */ ! typedef XMLCALLBACK(void, XML_AttlistDeclHandler) (void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); XMLPARSEAPI(void) *************** *** 117,124 **** */ ! typedef XMLCALLBACK(void) (*XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); XMLPARSEAPI(void) --- 117,124 ---- */ ! typedef XMLCALLBACK(void, XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); XMLPARSEAPI(void) *************** *** 171,197 **** names and values are 0 terminated. */ ! typedef XMLCALLBACK(void) (*XML_StartElementHandler)(void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef XMLCALLBACK(void) (*XML_EndElementHandler)(void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef XMLCALLBACK(void) (*XML_CharacterDataHandler)(void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef XMLCALLBACK(void) (*XML_ProcessingInstructionHandler)(void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef XMLCALLBACK(void) (*XML_CommentHandler)(void *userData, const XML_Char *data); ! typedef XMLCALLBACK(void) (*XML_StartCdataSectionHandler)(void *userData); ! typedef XMLCALLBACK(void) (*XML_EndCdataSectionHandler)(void *userData); /* This is called for any characters in the XML document for --- 171,197 ---- names and values are 0 terminated. */ ! typedef XMLCALLBACK(void, XML_StartElementHandler)(void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef XMLCALLBACK(void, XML_EndElementHandler)(void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef XMLCALLBACK(void, XML_CharacterDataHandler)(void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef XMLCALLBACK(void, XML_ProcessingInstructionHandler)(void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef XMLCALLBACK(void, XML_CommentHandler)(void *userData, const XML_Char *data); ! typedef XMLCALLBACK(void, XML_StartCdataSectionHandler)(void *userData); ! typedef XMLCALLBACK(void, XML_EndCdataSectionHandler)(void *userData); /* This is called for any characters in the XML document for *************** *** 208,227 **** multiple calls. */ ! typedef XMLCALLBACK(void) (*XML_DefaultHandler)(void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef XMLCALLBACK(void) (*XML_StartDoctypeDeclHandler)(void *userData, ! const XML_Char *doctypeName, ! const XML_Char *sysid, ! const XML_Char *pubid, ! int has_internal_subset); /* This is called for the start of the DOCTYPE declaration when the closing > is encountered, but after processing any external subset. */ ! typedef XMLCALLBACK(void) (*XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity --- 208,227 ---- multiple calls. */ ! typedef XMLCALLBACK(void, XML_DefaultHandler)(void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef XMLCALLBACK(void, XML_StartDoctypeDeclHandler)(void *userData, ! const XML_Char *doctypeName, ! const XML_Char *sysid, ! const XML_Char *pubid, ! int has_internal_subset); /* This is called for the start of the DOCTYPE declaration when the closing > is encountered, but after processing any external subset. */ ! typedef XMLCALLBACK(void, XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity *************** *** 241,253 **** */ ! typedef XMLCALLBACK(void) (*XML_EntityDeclHandler) (void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); XMLPARSEAPI(void) --- 241,253 ---- */ ! typedef XMLCALLBACK(void, XML_EntityDeclHandler) (void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); XMLPARSEAPI(void) *************** *** 263,272 **** The other arguments may be. */ ! typedef XMLCALLBACK(void) (*XML_UnparsedEntityDeclHandler)(void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. --- 263,272 ---- The other arguments may be. */ ! typedef XMLCALLBACK(void, XML_UnparsedEntityDeclHandler)(void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. *************** *** 274,282 **** The notationName will never be null. The other arguments can be. */ ! typedef XMLCALLBACK(void) (*XML_NotationDeclHandler)(void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for --- 274,282 ---- The notationName will never be null. The other arguments can be. */ ! typedef XMLCALLBACK(void, XML_NotationDeclHandler)(void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for *************** *** 286,295 **** For an xmlns="" attribute, uri will be null. */ ! typedef XMLCALLBACK(void) (*XML_StartNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef XMLCALLBACK(void) (*XML_EndNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone (it has an --- 286,295 ---- For an xmlns="" attribute, uri will be null. */ ! typedef XMLCALLBACK(void, XML_StartNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef XMLCALLBACK(void, XML_EndNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone (it has an *************** *** 299,303 **** XML_ERROR_NOT_STANDALONE error. */ ! typedef XMLCALLBACK(int) (*XML_NotStandaloneHandler)(void *userData); /* This is called for a reference to an external parsed general entity. --- 299,303 ---- XML_ERROR_NOT_STANDALONE error. */ ! typedef XMLCALLBACK(int, XML_NotStandaloneHandler)(void *userData); /* This is called for a reference to an external parsed general entity. *************** *** 326,334 **** userData. */ ! typedef XMLCALLBACK(int) (*XML_ExternalEntityRefHandler)(XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This structure is filled in by the XML_UnknownEncodingHandler --- 326,334 ---- userData. */ ! typedef XMLCALLBACK(int, XML_ExternalEntityRefHandler)(XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This structure is filled in by the XML_UnknownEncodingHandler *************** *** 392,398 **** then the parser will return an XML_UNKNOWN_ENCODING error. */ ! typedef XMLCALLBACK(int) (*XML_UnknownEncodingHandler)(void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); XMLPARSEAPI(void) --- 392,398 ---- then the parser will return an XML_UNKNOWN_ENCODING error. */ ! typedef XMLCALLBACK(int, XML_UnknownEncodingHandler)(void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); XMLPARSEAPI(void) Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** xmlparse.c 2001/07/27 16:30:56 1.19 --- xmlparse.c 2001/07/27 17:03:01 1.20 *************** *** 7,11 **** # include "winconfig.h" # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl ! # define XMLCALLBACK(type) type __cdecl # include "expat.h" # undef XMLPARSEAPI --- 7,11 ---- # include "winconfig.h" # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl ! # define XMLCALLBACK(type,name) type (* __cdecl name) # include "expat.h" # undef XMLPARSEAPI *************** *** 16,20 **** #ifdef __declspec # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl ! # define XMLCALLBACK(type) type __cdecl #endif --- 16,20 ---- #ifdef __declspec # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl ! # define XMLCALLBACK(type,name) type (* __cdecl name) #endif From fdrake@users.sourceforge.net Fri Jul 27 18:17:46 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 10:17:46 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.11,1.12 xmlparse.c,1.20,1.21 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv26222 Modified Files: expat.h.in xmlparse.c Log Message: Remove all traces of the XMLCALLBACK macro -- there appears to be no way to add __cdecl to a typedef of a function type that MSVC does not complain about. Callback implementations may need to add explicit __cdecl annotations in sources not compiled with the C calling convention as the default. Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** expat.h.in 2001/07/27 17:03:01 1.11 --- expat.h.in 2001/07/27 17:17:44 1.12 *************** *** 12,19 **** # if defined(__declspec) && !defined(__BEOS__) # define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl - # define XMLCALLBACK(type,name) type (* __cdecl name) # else # define XMLPARSEAPI(type) type - # define XMLCALLBACK(type,name) type (* name) # endif #endif /* not defined XMLPARSEAPI */ --- 12,17 ---- *************** *** 79,85 **** */ ! typedef XMLCALLBACK(void, XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); XMLPARSEAPI(void) --- 77,83 ---- */ ! typedef void (*XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); XMLPARSEAPI(void) *************** *** 97,106 **** */ ! typedef XMLCALLBACK(void, XML_AttlistDeclHandler) (void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); XMLPARSEAPI(void) --- 95,104 ---- */ ! typedef void (*XML_AttlistDeclHandler) (void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); XMLPARSEAPI(void) *************** *** 117,124 **** */ ! typedef XMLCALLBACK(void, XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); XMLPARSEAPI(void) --- 115,122 ---- */ ! typedef void (*XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); XMLPARSEAPI(void) *************** *** 171,197 **** names and values are 0 terminated. */ ! typedef XMLCALLBACK(void, XML_StartElementHandler)(void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef XMLCALLBACK(void, XML_EndElementHandler)(void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef XMLCALLBACK(void, XML_CharacterDataHandler)(void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef XMLCALLBACK(void, XML_ProcessingInstructionHandler)(void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef XMLCALLBACK(void, XML_CommentHandler)(void *userData, const XML_Char *data); ! typedef XMLCALLBACK(void, XML_StartCdataSectionHandler)(void *userData); ! typedef XMLCALLBACK(void, XML_EndCdataSectionHandler)(void *userData); /* This is called for any characters in the XML document for --- 169,195 ---- names and values are 0 terminated. */ ! typedef void (*XML_StartElementHandler)(void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef void (*XML_EndElementHandler)(void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef void (*XML_CharacterDataHandler)(void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef void (*XML_ProcessingInstructionHandler)(void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef void (*XML_CommentHandler)(void *userData, const XML_Char *data); ! typedef void (*XML_StartCdataSectionHandler)(void *userData); ! typedef void (*XML_EndCdataSectionHandler)(void *userData); /* This is called for any characters in the XML document for *************** *** 208,227 **** multiple calls. */ ! typedef XMLCALLBACK(void, XML_DefaultHandler)(void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef XMLCALLBACK(void, XML_StartDoctypeDeclHandler)(void *userData, ! const XML_Char *doctypeName, ! const XML_Char *sysid, ! const XML_Char *pubid, ! int has_internal_subset); /* This is called for the start of the DOCTYPE declaration when the closing > is encountered, but after processing any external subset. */ ! typedef XMLCALLBACK(void, XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity --- 206,225 ---- multiple calls. */ ! typedef void (*XML_DefaultHandler)(void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef void (*XML_StartDoctypeDeclHandler)(void *userData, ! const XML_Char *doctypeName, ! const XML_Char *sysid, ! const XML_Char *pubid, ! int has_internal_subset); /* This is called for the start of the DOCTYPE declaration when the closing > is encountered, but after processing any external subset. */ ! typedef void (*XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity *************** *** 241,253 **** */ ! typedef XMLCALLBACK(void, XML_EntityDeclHandler) (void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); XMLPARSEAPI(void) --- 239,251 ---- */ ! typedef void (*XML_EntityDeclHandler) (void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); XMLPARSEAPI(void) *************** *** 263,272 **** The other arguments may be. */ ! typedef XMLCALLBACK(void, XML_UnparsedEntityDeclHandler)(void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. --- 261,270 ---- The other arguments may be. */ ! typedef void (*XML_UnparsedEntityDeclHandler)(void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. *************** *** 274,282 **** The notationName will never be null. The other arguments can be. */ ! typedef XMLCALLBACK(void, XML_NotationDeclHandler)(void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for --- 272,280 ---- The notationName will never be null. The other arguments can be. */ ! typedef void (*XML_NotationDeclHandler)(void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for *************** *** 286,295 **** For an xmlns="" attribute, uri will be null. */ ! typedef XMLCALLBACK(void, XML_StartNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef XMLCALLBACK(void, XML_EndNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone (it has an --- 284,293 ---- For an xmlns="" attribute, uri will be null. */ ! typedef void (*XML_StartNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef void (*XML_EndNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone (it has an *************** *** 299,303 **** XML_ERROR_NOT_STANDALONE error. */ ! typedef XMLCALLBACK(int, XML_NotStandaloneHandler)(void *userData); /* This is called for a reference to an external parsed general entity. --- 297,301 ---- XML_ERROR_NOT_STANDALONE error. */ ! typedef int (*XML_NotStandaloneHandler)(void *userData); /* This is called for a reference to an external parsed general entity. *************** *** 326,334 **** userData. */ ! typedef XMLCALLBACK(int, XML_ExternalEntityRefHandler)(XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This structure is filled in by the XML_UnknownEncodingHandler --- 324,332 ---- userData. */ ! typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This structure is filled in by the XML_UnknownEncodingHandler *************** *** 392,398 **** then the parser will return an XML_UNKNOWN_ENCODING error. */ ! typedef XMLCALLBACK(int, XML_UnknownEncodingHandler)(void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); XMLPARSEAPI(void) --- 390,396 ---- then the parser will return an XML_UNKNOWN_ENCODING error. */ ! typedef int (*XML_UnknownEncodingHandler)(void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); XMLPARSEAPI(void) Index: xmlparse.c =================================================================== RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** xmlparse.c 2001/07/27 17:03:01 1.20 --- xmlparse.c 2001/07/27 17:17:44 1.21 *************** *** 7,14 **** # include "winconfig.h" # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl - # define XMLCALLBACK(type,name) type (* __cdecl name) # include "expat.h" # undef XMLPARSEAPI - # undef XMLCALLBACK #else #include --- 7,12 ---- *************** *** 16,20 **** #ifdef __declspec # define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl - # define XMLCALLBACK(type,name) type (* __cdecl name) #endif --- 14,17 ---- *************** *** 23,27 **** #ifdef __declspec # undef XMLPARSEAPI - # undef XMLCALLBACK #endif #endif /* ndef COMPILED_FROM_DSP */ --- 20,23 ---- From fdrake@users.sourceforge.net Fri Jul 27 21:26:25 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 13:26:25 -0700 Subject: [Expat-checkins] CVS: expat/xmlwf xmlwf.dsp,1.7,1.8 Message-ID: Update of /cvsroot/expat/expat/xmlwf In directory usw-pr-cvs1:/tmp/cvs-serv3599/xmlwf Modified Files: xmlwf.dsp Log Message: Remove some bogus preprocessor definitions. Index: xmlwf.dsp =================================================================== RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xmlwf.dsp 2001/07/27 15:12:47 1.7 --- xmlwf.dsp 2001/07/27 20:26:23 1.8 *************** *** 43,47 **** # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" --- 43,47 ---- # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\lib" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" *************** *** 67,71 **** # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D XMLTOKAPI=__declspec(dllimport) /D XMLPARSEAPI=__declspec(dllimport) /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" --- 67,71 ---- # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c ! # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" From fdrake@users.sourceforge.net Fri Jul 27 21:34:54 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 13:34:54 -0700 Subject: [Expat-checkins] CVS: expat README,1.10,1.11 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv5096 Modified Files: README Log Message: Suggest that Windows users get the installer; it will do things that make more sense than the Unix sources. Index: README =================================================================== RCS file: /cvsroot/expat/expat/README,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** README 2001/07/25 18:08:05 1.10 --- README 2001/07/27 20:34:52 1.11 *************** *** 2,14 **** Expat, Release 1.95.2 ! This is expat, the C library for parsing XML, written by James Clark. ! Expat is a stream oriented XML parser. This means that you register ! handlers with the parser prior to starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. Expat is free software. You may copy, distribute, and modify it under ! the terms of the License contained in the file, COPYING, distributed with this package. This license is the same as the MIT/X Consortium license. --- 2,18 ---- Expat, Release 1.95.2 ! This is expat, a C library for parsing XML, written by James Clark. ! Expat is a stream-oriented XML parser. This means that you register ! handlers with the parser before starting the parse. These handlers are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register handlers. + Windows users should use the expat_win32bin package, which includes + both precompiled libraries and executalbes, and source code for + developers. + Expat is free software. You may copy, distribute, and modify it under ! the terms of the License contained in the file COPYING distributed with this package. This license is the same as the MIT/X Consortium license. *************** *** 28,34 **** one of most interest is the one that sets the installation directory. By default, the configure script will set things up to install ! libexpat into /usr/local/lib and expat.h into /usr/local/include. If, ! for example, you'd prefer to install into /home/me/mystuff/lib and ! /home/me/mystuff/include, you can tell configure about that with: ./configure --prefix=/home/me/mystuff --- 32,39 ---- one of most interest is the one that sets the installation directory. By default, the configure script will set things up to install ! libexpat into /usr/local/lib, expat.h into /usr/local/include, and ! xmlwf into /usr/local/bin. If, for example, you'd prefer to install ! into /home/me/mystuff/lib, /home/me/mystuff/include, and ! /home/me/mystuff/bin, you can tell configure about that with: ./configure --prefix=/home/me/mystuff *************** *** 54,65 **** PATH=/usr/ccs/bin:$PATH make - - Alternatively, on Win32 systems with Microsoft's Developer's Studio - installed, you can simply double-click on win32/expat.dsw from Windows - Explorer and build and install in the usual way from with DevStudio. - - Another alternative you may choose to download expat_win32bin which - includes a pre-compiled DLL and LIB files for expat, and the xmlwf - application as an EXE file. A reference manual is available in the file doc/reference.html in this --- 59,62 ---- From fdrake@users.sourceforge.net Fri Jul 27 21:35:42 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 13:35:42 -0700 Subject: [Expat-checkins] CVS: expat/win32 MANIFEST.txt,1.1,1.2 Message-ID: Update of /cvsroot/expat/expat/win32 In directory usw-pr-cvs1:/tmp/cvs-serv5320/win32 Modified Files: MANIFEST.txt Log Message: Update to match the latest version of the installer. Index: MANIFEST.txt =================================================================== RCS file: /cvsroot/expat/expat/win32/MANIFEST.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MANIFEST.txt 2001/07/26 19:50:28 1.1 --- MANIFEST.txt 2001/07/27 20:35:39 1.2 *************** *** 4,21 **** Some of these directories contain components of interest to all Expat users, and some contain material of interest to developers who wish to ! use Expat in their applications. ! Directory Contents ! ------------------------------------------------------------- ! Expat-\ The XML well-formedness checker, ! some general information files, ! and the uninstaller. ! Expat-\Doc\ API documentation for developers. ! Expat-\Libs\ Pre-compiled libraries for ! developers. ! Expat-\Source\ Source code, which may interest some ! developers, including a project file ! for Microsft Visual C++. --- 4,24 ---- Some of these directories contain components of interest to all Expat users, and some contain material of interest to developers who wish to ! use Expat in their applications. In the list below, is the ! directory you specified to the installer. ! Directory Contents ! ------------------------------------------------------------------ ! \ The XML well-formedness checker and some general ! information files. ! \Doc\ API documentation for developers. ! \Libs\ Pre-compiled libraries for developers. ! \Source\ Source code, which may interest some developers, ! including a workspace for Microsft Visual C++. ! The source code includes the parser, the well- ! formedness checker, and a couple of small sample ! applications. ! ! \Unistall\ The uninstaller and its data files. From fdrake@users.sourceforge.net Sat Jul 28 04:29:57 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Fri, 27 Jul 2001 20:29:57 -0700 Subject: [Expat-checkins] CVS: expat Changes,1.10,1.11 Message-ID: Update of /cvsroot/expat/expat In directory usw-pr-cvs1:/tmp/cvs-serv2711 Modified Files: Changes Log Message: Fix a couple of stupid typos that I should have caught before release. Index: Changes =================================================================== RCS file: /cvsroot/expat/expat/Changes,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Changes 2001/07/26 20:32:22 1.10 --- Changes 2001/07/28 03:29:55 1.11 *************** *** 1,5 **** Release 1.95.2 Fri Jul 27 2001 ! - Nore changes to make MSVC happy with the build; add a single ! workspace to support both the library and xmlwf applicatiion. - Added a Windows installer for Windows users; includes xmlwf.exe. --- 1,5 ---- Release 1.95.2 Fri Jul 27 2001 ! - More changes to make MSVC happy with the build; add a single ! workspace to support both the library and xmlwf application. - Added a Windows installer for Windows users; includes xmlwf.exe. From fdrake@users.sourceforge.net Mon Jul 30 20:01:49 2001 From: fdrake@users.sourceforge.net (Fred L. Drake) Date: Mon, 30 Jul 2001 12:01:49 -0700 Subject: [Expat-checkins] CVS: expat/lib expat.h.in,1.12,1.13 Message-ID: Update of /cvsroot/expat/expat/lib In directory usw-pr-cvs1:/tmp/cvs-serv9939/lib Modified Files: expat.h.in Log Message: Switch to testing that _MSC_EXTENSIONS is defined, not __declspec. (We can probably remove the exception for __BEOS__ now, but I cannot test that.) Index: expat.h.in =================================================================== RCS file: /cvsroot/expat/expat/lib/expat.h.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** expat.h.in 2001/07/27 17:17:44 1.12 --- expat.h.in 2001/07/30 19:01:47 1.13 *************** *** 10,14 **** #ifndef XMLPARSEAPI ! # if defined(__declspec) && !defined(__BEOS__) # define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl # else --- 10,14 ---- #ifndef XMLPARSEAPI ! # if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) # define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl # else