Index: Makefile.in =================================================================== --- Makefile.in (.../vendor/expat/1.95.7) (revision 1005660) +++ Makefile.in (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -44,20 +44,30 @@ APIHEADER = $(srcdir)/lib/expat.h LIBRARY = libexpat.la +CC = @CC@ +LIBTOOL = @LIBTOOL@ -default: buildlib xmlwf/xmlwf +INCLUDES = -I$(srcdir)/lib -I. +LDFLAGS = @LDFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H +VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@ -buildlib: $(LIBRARY) +### autoconf this? +LTFLAGS = --silent -all: $(LIBRARY) xmlwf/xmlwf examples/elements examples/outline +COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES) +LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) +LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@ +LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@ +LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo + +all: $(LIBRARY) + clean: cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs - cd xmlwf && rm -f xmlwf *.o *.lo && rm -rf .libs _libs - cd examples && rm -f elements outline *.o *.lo && rm -rf .libs _libs - cd tests && rm -rf .libs runtests runtests.o chardata.o rm -rf .libs libexpat.la - rm -f examples/core tests/core xmlwf/core clobber: clean @@ -72,94 +82,24 @@ check: tests/runtests tests/runtests -install: xmlwf/xmlwf installlib - $(mkinstalldirs) $(bindir) $(mandir) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf - $(INSTALL_DATA) $(MANFILE) $(mandir) +install: installlib installlib: $(LIBRARY) $(APIHEADER) $(mkinstalldirs) $(libdir) $(includedir) $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY) $(INSTALL_DATA) $(APIHEADER) $(includedir) -uninstall: uninstalllib - $(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf - rm -f $(mandir)/xmlwf.1 - -uninstalllib: - $(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY) - rm -f $(includedir)/$(APIHEADER) - -# for VPATH builds (invoked by configure) -mkdir-init: - @for d in lib xmlwf examples tests ; do \ - (mkdir $$d 2> /dev/null || test 1) ; \ - done - -CC = @CC@ -LIBTOOL = @LIBTOOL@ - -INCLUDES = -I$(srcdir)/lib -I. -LDFLAGS = @LDFLAGS@ -CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H -VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@ - -### autoconf this? -LTFLAGS = --silent - -COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES) -LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@ -LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@ - -LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo $(LIBRARY): $(LIB_OBJS) $(LINK_LIB) $(LIB_OBJS) lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \ $(top_builddir)/expat_config.h lib/internal.h -lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \ - $(top_builddir)/expat_config.h lib/internal.h - lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \ lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \ lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \ $(top_builddir)/expat_config.h - -XMLWF_OBJS = xmlwf/xmlwf.o xmlwf/xmlfile.o xmlwf/codepage.o xmlwf/@FILEMAP@.o -xmlwf/xmlwf.o: xmlwf/xmlwf.c -xmlwf/xmlfile.o: xmlwf/xmlfile.c -xmlwf/codepage.o: xmlwf/codepage.c -xmlwf/@FILEMAP@.o: xmlwf/@FILEMAP@.c -xmlwf/xmlwf: $(XMLWF_OBJS) $(LIBRARY) - $(LINK_EXE) $(XMLWF_OBJS) $(LIBRARY) - -examples/elements.o: examples/elements.c -examples/elements: examples/elements.o $(LIBRARY) - $(LINK_EXE) $< $(LIBRARY) - -examples/outline.o: examples/outline.c -examples/outline: examples/outline.o $(LIBRARY) - $(LINK_EXE) $< $(LIBRARY) - -tests/chardata.o: tests/chardata.c tests/chardata.h -tests/runtests.o: tests/runtests.c tests/chardata.h -tests/runtests: tests/runtests.o tests/chardata.o $(LIBRARY) - $(LINK_EXE) $^ -lcheck - -tests/xmlts.zip: - wget --output-document=tests/xmlts.zip \ - http://www.w3.org/XML/Test/xmlts20020606.zip - -tests/XML-Test-Suite: tests/xmlts.zip - cd tests && unzip -q xmlts.zip - -run-xmltest: xmlwf/xmlwf tests/XML-Test-Suite - tests/xmltest.sh - .SUFFIXES: .c .lo .o .c.o: Property changes on: Makefile.in ___________________________________________________________________ Name: svn:eol-style + native Property changes on: win32/MANIFEST.txt ___________________________________________________________________ Name: svn:eol-style + native Property changes on: win32/expat.iss ___________________________________________________________________ Name: svn:eol-style + native Index: configure.in =================================================================== --- configure.in (.../vendor/expat/1.95.7) (revision 1005660) +++ configure.in (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -13,26 +13,14 @@ dnl Ensure that Expat is configured with autoconf 2.52 or newer AC_PREREQ(2.52) -dnl Get the version number of Expat, using m4's esyscmd() command to run -dnl the command at m4-generation time. This allows us to create an m4 -dnl symbol holding the correct version number. AC_INIT() requires the -dnl version number at m4-time, rather than when ./configure is run, so -dnl all this must happen as part of m4, not as part of the shell code -dnl contained in ./configure. -dnl -dnl NOTE: esyscmd() is a GNU M4 extension. Thus, we wrap it in an appropriate -dnl test. I believe this test will work, but I don't have a place with non- -dnl GNU M4 to test it right now. -define([expat_version], ifdef([__gnu__], - [esyscmd(conftools/get-version.sh lib/expat.h)], - [1.95.x])) -AC_INIT(expat, expat_version, expat-bugs@mail.libexpat.org) -undefine([expat_version]) +dnl ### apr-util hack: just hard-code the version here, as is done in expat.h. +AC_INIT(expat, 1.95.7, expat-bugs@mail.libexpat.org) + AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) +AC_CONFIG_MACRO_DIR(conftools) - dnl dnl Increment LIBREVISION if source code has changed at all dnl @@ -50,11 +38,21 @@ AC_CONFIG_HEADER(expat_config.h) -sinclude(conftools/libtool.m4) sinclude(conftools/ac_c_bigendian_cross.m4) +AC_CANONICAL_SYSTEM + +case "$host_os" in +*os2*) + # Use a custom made libtool replacement + echo Using aplibtool + LIBTOOL="$srcdir/../../../apr/build/aplibtool" + ;; +*) AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL + ;; +esac AC_SUBST(LIBCURRENT) AC_SUBST(LIBREVISION) @@ -64,45 +62,21 @@ AC_PROG_CC AC_PROG_INSTALL -if test "$GCC" = yes ; then - dnl - dnl Be careful about adding the -fexceptions option; some versions of - dnl GCC don't support it and it causes extra warnings that are only - dnl distracting; avoid. - dnl - OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes" - CFLAGS="$OLDCFLAGS -fexceptions" - AC_MSG_CHECKING(whether gcc accepts -fexceptions) - AC_TRY_COMPILE(,(void)1, - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS") -fi - dnl Checks for header files. AC_HEADER_STDC 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 - +dnl check for endianness +if test "$cross_compiling" = "no"; then + AC_C_BIGENDIAN +else + AC_DEFINE(AP_UNKNOWN_BYTE_ORDER,1, + [byte order is unknown due to cross-compilation]) +fi AC_C_CONST AC_TYPE_SIZE_T AC_CHECK_FUNCS(memmove bcopy) -dnl Only needed for xmlwf: -AC_CHECK_HEADERS(fcntl.h unistd.h) -AC_TYPE_OFF_T -AC_FUNC_MMAP - -if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then - FILEMAP=unixfilemap -else - FILEMAP=readfilemap -fi -AC_SUBST(FILEMAP) - dnl Only needed for regression tests: AC_CHECK_HEADERS(check.h) @@ -120,5 +94,6 @@ abs_srcdir="`cd $srcdir && pwd`" abs_builddir="`pwd`" if test "$abs_srcdir" != "$abs_builddir"; then - make mkdir-init + mkdir lib fi + Property changes on: configure.in ___________________________________________________________________ Name: svn:eol-style + native Index: conftools/expat.m4 =================================================================== --- conftools/expat.m4 (.../vendor/expat/1.95.7) (revision 1005660) +++ conftools/expat.m4 (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -1,43 +0,0 @@ -dnl Check if --with-expat[=PREFIX] is specified and -dnl Expat >= 1.95.0 is installed in the system. -dnl If yes, substitute EXPAT_CFLAGS, EXPAT_LIBS with regard to -dnl the specified PREFIX and set with_expat to PREFIX, or 'yes' if PREFIX -dnl has not been specified. Also HAVE_LIBEXPAT, HAVE_EXPAT_H are defined. -dnl If --with-expat has not been specified, set with_expat to 'no'. -dnl In addition, an Automake conditional EXPAT_INSTALLED is set accordingly. -dnl This is necessary to adapt a whole lot of packages that have expat -dnl bundled as a static library. -AC_DEFUN(AM_WITH_EXPAT, -[ AC_ARG_WITH(expat, - [ --with-expat=PREFIX Use system Expat library], - , with_expat=no) - - AM_CONDITIONAL(EXPAT_INSTALLED, test $with_expat != no) - - EXPAT_CFLAGS= - EXPAT_LIBS= - if test $with_expat != no; then - if test $with_expat != yes; then - EXPAT_CFLAGS="-I$with_expat/include" - EXPAT_LIBS="-L$with_expat/lib" - fi - AC_CHECK_LIB(expat, XML_ParserCreate, - [ EXPAT_LIBS="$EXPAT_LIBS -lexpat" - expat_found=yes ], - [ expat_found=no ], - "$EXPAT_LIBS") - if test $expat_found = no; then - AC_MSG_ERROR([Could not find the Expat library]) - fi - expat_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $EXPAT_CFLAGS" - AC_CHECK_HEADERS(expat.h, , expat_found=no) - if test $expat_found = no; then - AC_MSG_ERROR([Could not find expat.h]) - fi - CFLAGS="$expat_save_CFLAGS" - fi - - AC_SUBST(EXPAT_CFLAGS) - AC_SUBST(EXPAT_LIBS) -]) Index: conftools/mkinstalldirs =================================================================== --- conftools/mkinstalldirs (.../vendor/expat/1.95.7) (revision 1005660) +++ conftools/mkinstalldirs (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2000/09/18 16:26:21 coopercc Exp $ +# $Id$ errstatus=0 Property changes on: conftools/mkinstalldirs ___________________________________________________________________ Name: svn:eol-style + native Name: svn:executable - + * Name: svn:keywords + Id Index: conftools/PrintPath =================================================================== --- conftools/PrintPath (.../vendor/expat/1.95.7) (revision 1005660) +++ conftools/PrintPath (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -14,7 +14,7 @@ # (with kudos to Kernighan/Pike) # # This script falls under the Apache License. -# See http://www.apache.org/licenses/LICENSE +# See http://www.apache.org/docs/LICENSE ## # Some "constants" Property changes on: conftools/PrintPath ___________________________________________________________________ Name: svn:eol-style + native Name: svn:executable - + * Index: lib/xmltok_impl.c =================================================================== --- lib/xmltok_impl.c (.../vendor/expat/1.95.7) (revision 1005660) +++ lib/xmltok_impl.c (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -1741,7 +1741,7 @@ const char *end, POSITION *pos) { - while (ptr != end) { + while (ptr < end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ Property changes on: lib/xmltok_impl.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/xmltok_impl.h ___________________________________________________________________ Name: svn:eol-style + native Index: lib/xml.dsp =================================================================== --- lib/xml.dsp (.../vendor/expat/1.95.7) (revision 0) +++ lib/xml.dsp (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,214 @@ +# Microsoft Developer Studio Project File - Name="xml" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=xml - Win32 Release +!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 "xml.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 "xml.mak" CFG="xml - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "xml - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "LibR" +# PROP BASE Intermediate_Dir "LibR" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "LibR" +# PROP Intermediate_Dir "LibR" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"LibR\xml.lib" + +!ELSEIF "$(CFG)" == "xml - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "LibD" +# PROP BASE Intermediate_Dir "LibD" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "LibD" +# PROP Intermediate_Dir "LibD" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"LibD\xml.lib" + +!ELSEIF "$(CFG)" == "xml - x64 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "x64\LibR" +# PROP BASE Intermediate_Dir "x64\LibR" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "x64\LibR" +# PROP Intermediate_Dir "x64\LibR" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"x64\LibR\xml.lib" + +!ELSEIF "$(CFG)" == "xml - x64 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "x64\LibD" +# PROP BASE Intermediate_Dir "x64\LibD" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "x64\LibD" +# PROP Intermediate_Dir "x64\LibD" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c +# ADD BASE RSC /l 0x409 +# ADD RSC /l 0x409 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"x64\LibD\xml.lib" + +!ENDIF + +# Begin Target + +# Name "xml - Win32 Release" +# Name "xml - Win32 Debug" +# Name "xml - x64 Release" +# Name "xml - x64 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\xmlparse.c +# End Source File +# Begin Source File + +SOURCE=.\xmlrole.c +# End Source File +# Begin Source File + +SOURCE=.\xmltok.c +# End Source File +# Begin Source File + +SOURCE=xmltok_impl.c +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + +SOURCE=xmltok_ns.c +# PROP Exclude_From_Build 1 +# 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=.\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=.\winconfig.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 Source File + +SOURCE=.\ReadMe.txt +# End Source File +# End Target +# End Project Property changes on: lib/xml.dsp ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/nametab.h ___________________________________________________________________ Name: svn:eol-style + native Index: lib/map_osd_ebcdic_df04_1.h =================================================================== --- lib/map_osd_ebcdic_df04_1.h (.../vendor/expat/1.95.7) (revision 0) +++ lib/map_osd_ebcdic_df04_1.h (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,18 @@ +static unsigned char ebcdic[] = { +/* 00 */ 0x00 ,0x01 ,0x02 ,0x03 ,0x85 ,0x09 ,0x86 ,0x7f ,0x87 ,0x8d ,0x8e ,0x0b ,0x0c ,0x0d ,0x0e ,0x0f , +/* 10 */ 0x10 ,0x11 ,0x12 ,0x13 ,0x8f ,0x0a ,0x08 ,0x97 ,0x18 ,0x19 ,0x9c ,0x9d ,0x1c ,0x1d ,0x1e ,0x1f , +/* 20 */ 0x80 ,0x81 ,0x82 ,0x83 ,0x84 ,0x92 ,0x17 ,0x1b ,0x88 ,0x89 ,0x8a ,0x8b ,0x8c ,0x05 ,0x06 ,0x07 , +/* 30 */ 0x90 ,0x91 ,0x16 ,0x93 ,0x94 ,0x95 ,0x96 ,0x04 ,0x98 ,0x99 ,0x9a ,0x9b ,0x14 ,0x15 ,0x9e ,0x1a , +/* 40 */ 0x20 ,0xa0 ,0xe2 ,0xe4 ,0xe0 ,0xe1 ,0xe3 ,0xe5 ,0xe7 ,0xf1 ,0x60 ,0x2e ,0x3c ,0x28 ,0x2b ,0x7c , +/* 50 */ 0x26 ,0xe9 ,0xea ,0xeb ,0xe8 ,0xed ,0xee ,0xef ,0xec ,0xdf ,0x21 ,0x24 ,0x2a ,0x29 ,0x3b ,0x9f , +/* 60 */ 0x2d ,0x2f ,0xc2 ,0xc4 ,0xc0 ,0xc1 ,0xc3 ,0xc5 ,0xc7 ,0xd1 ,0x5e ,0x2c ,0x25 ,0x5f ,0x3e ,0x3f , +/* 70 */ 0xf8 ,0xc9 ,0xca ,0xcb ,0xc8 ,0xcd ,0xce ,0xcf ,0xcc ,0xa8 ,0x3a ,0x23 ,0x40 ,0x27 ,0x3d ,0x22 , +/* 80 */ 0xd8 ,0x61 ,0x62 ,0x63 ,0x64 ,0x65 ,0x66 ,0x67 ,0x68 ,0x69 ,0xab ,0xbb ,0xf0 ,0xfd ,0xfe ,0xb1 , +/* 90 */ 0xb0 ,0x6a ,0x6b ,0x6c ,0x6d ,0x6e ,0x6f ,0x70 ,0x71 ,0x72 ,0xaa ,0xba ,0xe6 ,0xb8 ,0xc6 ,0xa4 , +/* a0 */ 0xb5 ,0xaf ,0x73 ,0x74 ,0x75 ,0x76 ,0x77 ,0x78 ,0x79 ,0x7a ,0xa1 ,0xbf ,0xd0 ,0xdd ,0xde ,0xae , +/* b0 */ 0xa2 ,0xa3 ,0xa5 ,0xb7 ,0xa9 ,0xa7 ,0xb6 ,0xbc ,0xbd ,0xbe ,0xac ,0x5b ,0x5c ,0x5d ,0xb4 ,0xd7 , +/* c0 */ 0xf9 ,0x41 ,0x42 ,0x43 ,0x44 ,0x45 ,0x46 ,0x47 ,0x48 ,0x49 ,0xad ,0xf4 ,0xf6 ,0xf2 ,0xf3 ,0xf5 , +/* d0 */ 0xa6 ,0x4a ,0x4b ,0x4c ,0x4d ,0x4e ,0x4f ,0x50 ,0x51 ,0x52 ,0xb9 ,0xfb ,0xfc ,0xdb ,0xfa ,0xff , +/* e0 */ 0xd9 ,0xf7 ,0x53 ,0x54 ,0x55 ,0x56 ,0x57 ,0x58 ,0x59 ,0x5a ,0xb2 ,0xd4 ,0xd6 ,0xd2 ,0xd3 ,0xd5 , +/* f0 */ 0x30 ,0x31 ,0x32 ,0x33 ,0x34 ,0x35 ,0x36 ,0x37 ,0x38 ,0x39 ,0xb3 ,0x7b ,0xdc ,0x7d ,0xda ,0x7e +}; Property changes on: lib/map_osd_ebcdic_df04_1.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/xmltok_ns.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/xmltok.c ___________________________________________________________________ Name: svn:eol-style + native Index: lib/expat_config.hnw =================================================================== --- lib/expat_config.hnw (.../vendor/expat/1.95.7) (revision 0) +++ lib/expat_config.hnw (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,25 @@ +/*================================================================ +** Copyright 2000, Clark Cooper +** All rights reserved. +** +** This is free software. You are permitted to copy, distribute, or modify +** it under the terms of the MIT/X license (contained in the COPYING file +** with this distribution.) +** +** +*/ + +#ifndef EXPAT_CONFIG_HNW +#define EXPAT_CONFIG_HNW + +#include +#include + +#define HAVE_MEMMOVE + +#define XML_NS 1 +#define XML_DTD 1 +#define XML_BYTE_ORDER 12 +#define XML_CONTEXT_BYTES 1024 + +#endif /* ndef EXPAT_CONFIG_HNW */ Property changes on: lib/expat_config.hnw ___________________________________________________________________ Name: svn:eol-style + native Index: lib/osd_ebcdic_df04_1.h =================================================================== --- lib/osd_ebcdic_df04_1.h (.../vendor/expat/1.95.7) (revision 0) +++ lib/osd_ebcdic_df04_1.h (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,81 @@ +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* Table for the OSD_EBCDIC_DF04_1 encoding */ + +/* 00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 04 */ BT_OTHER, BT_S, BT_OTHER, BT_OTHER, +/* 08 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_NONXML, +/* 0c */ BT_NONXML, BT_CR, BT_NONXML, BT_NONXML, +/* 10 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 14 */ BT_OTHER, BT_LF, BT_NONXML, BT_OTHER, +/* 18 */ BT_NONXML, BT_NONXML, BT_OTHER, BT_OTHER, +/* 1c */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 20 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER, +/* 24 */ BT_OTHER, BT_OTHER, BT_NONXML, BT_NONXML, +/* 28 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER, +/* 2c */ BT_OTHER, BT_NONXML, BT_NONXML, BT_NONXML, +/* 30 */ BT_OTHER, BT_OTHER, BT_NONXML, BT_OTHER, +/* 34 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_NONXML, +/* 38 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER, +/* 3c */ BT_NONXML, BT_NONXML, BT_OTHER, BT_NONXML, +/* 40 */ BT_S, BT_OTHER, BT_NMSTRT, BT_NMSTRT, +/* 44 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 48 */ BT_NMSTRT, BT_NMSTRT, BT_OTHER, BT_NAME, +/* 4c */ BT_LT, BT_LPAR, BT_PLUS, BT_VERBAR, +/* 50 */ BT_AMP, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 54 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 58 */ BT_NMSTRT, BT_NMSTRT, BT_EXCL, BT_OTHER, +/* 5c */ BT_AST, BT_RPAR, BT_SEMI, BT_OTHER, +/* 60 */ BT_MINUS, BT_SOL, BT_NMSTRT, BT_NMSTRT, +/* 64 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 68 */ BT_NMSTRT, BT_NMSTRT, BT_OTHER, BT_COMMA, +/* 6c */ BT_PERCNT, BT_NMSTRT, BT_GT, BT_QUEST, +/* 70 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 74 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 78 */ BT_NMSTRT, BT_OTHER, BT_COLON, BT_NUM, +/* 7c */ BT_OTHER, BT_APOS, BT_EQUALS, BT_QUOT, +/* 80 */ BT_NMSTRT, BT_HEX, BT_HEX, BT_HEX, +/* 84 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT, +/* 88 */ BT_NMSTRT, BT_NMSTRT, BT_OTHER, BT_OTHER, +/* 8c */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER, +/* 90 */ BT_OTHER, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 94 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 98 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 9c */ BT_NMSTRT, BT_OTHER, BT_NMSTRT, BT_OTHER, +/* a0 */ BT_NMSTRT, BT_OTHER, BT_NMSTRT, BT_NMSTRT, +/* a4 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* a8 */ BT_NMSTRT, BT_NMSTRT, BT_OTHER, BT_OTHER, +/* ac */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER, +/* b0 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_NAME, +/* b4 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER, +/* b8 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_LSQB, +/* bc */ BT_OTHER, BT_RSQB, BT_OTHER, BT_OTHER, +/* c0 */ BT_NMSTRT, BT_HEX, BT_HEX, BT_HEX, +/* c4 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT, +/* c8 */ BT_NMSTRT, BT_NMSTRT, BT_OTHER, BT_NMSTRT, +/* cc */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* d0 */ BT_OTHER, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* d4 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* d8 */ BT_NMSTRT, BT_NMSTRT, BT_OTHER, BT_NMSTRT, +/* dc */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* e0 */ BT_NMSTRT, BT_OTHER, BT_NMSTRT, BT_NMSTRT, +/* e4 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* e8 */ BT_NMSTRT, BT_NMSTRT, BT_OTHER, BT_NMSTRT, +/* ec */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* f0 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT, +/* f4 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT, +/* f8 */ BT_DIGIT, BT_DIGIT, BT_OTHER, BT_OTHER, +/* fc */ BT_NMSTRT, BT_OTHER, BT_NMSTRT, BT_OTHER, Property changes on: lib/osd_ebcdic_df04_1.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/internal.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/xmlrole.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/utf8tab.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/xmltok.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/asciitab.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/latin1tab.h ___________________________________________________________________ Name: svn:eol-style + native Index: lib/expat.dsp =================================================================== --- lib/expat.dsp (.../vendor/expat/1.95.7) (revision 0) +++ lib/expat.dsp (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,239 @@ +# 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 /EHsc /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "EXPAT_EXPORTS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MT /W3 /EHsc /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 +# 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 +# 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 +# Begin Special Build Tool +TargetPath=.\Release\expat.dll +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +# End Special Build Tool + +!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 /EHsc /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 /EHsc /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 +# 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 /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 /pdbtype:sept +# Begin Special Build Tool +TargetPath=.\Debug\expat.dll +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +# End Special Build Tool + +!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 /EHsc- /Od /D VERSION=\"expat_1.95.2\" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\xmlrole.c + +!IF "$(CFG)" == "expat - Win32 Release" + +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ELSEIF "$(CFG)" == "expat - Win32 Debug" + +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\xmltok.c + +!IF "$(CFG)" == "expat - Win32 Release" + +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ELSEIF "$(CFG)" == "expat - Win32 Debug" + +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=xmltok_impl.c + +!IF "$(CFG)" == "expat - Win32 Release" + +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ELSEIF "$(CFG)" == "expat - Win32 Debug" + +# PROP Exclude_From_Build 1 +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=xmltok_ns.c + +!IF "$(CFG)" == "expat - Win32 Release" + +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ELSEIF "$(CFG)" == "expat - Win32 Debug" + +# PROP Exclude_From_Build 1 +# ADD CPP /D VERSION=\"expat_1.95.2\" + +!ENDIF + +# 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 +# Begin Source File + +SOURCE=.\ReadMe.txt +# End Source File +# End Target +# End Project Property changes on: lib/expat.dsp ___________________________________________________________________ Name: svn:eol-style + native Index: lib/xml.mak =================================================================== --- lib/xml.mak (.../vendor/expat/1.95.7) (revision 0) +++ lib/xml.mak (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,350 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on xml.dsp +!IF "$(CFG)" == "" +CFG=xml - Win32 Release +!MESSAGE No configuration specified. Defaulting to xml - Win32 Release. +!ENDIF + +!IF "$(CFG)" != "xml - Win32 Release" && "$(CFG)" != "xml - Win32 Debug" && "$(CFG)" != "xml - x64 Release" && "$(CFG)" != "xml - x64 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!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 "xml.mak" CFG="xml - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xml - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "xml - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "xml - x64 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "xml - x64 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +!IF "$(CFG)" == "xml - Win32 Release" + +OUTDIR=.\LibR +INTDIR=.\LibR +# Begin Custom Macros +OutDir=.\LibR +# End Custom Macros + +ALL : "$(OUTDIR)\xml.lib" + + +CLEAN : + -@erase "$(INTDIR)\xml.idb" + -@erase "$(INTDIR)\xml.pdb" + -@erase "$(INTDIR)\xmlparse.obj" + -@erase "$(INTDIR)\xmlrole.obj" + -@erase "$(INTDIR)\xmltok.obj" + -@erase "$(OUTDIR)\xml.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" +LIB32_OBJS= \ + "$(INTDIR)\xmlparse.obj" \ + "$(INTDIR)\xmlrole.obj" \ + "$(INTDIR)\xmltok.obj" + +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ELSEIF "$(CFG)" == "xml - Win32 Debug" + +OUTDIR=.\LibD +INTDIR=.\LibD +# Begin Custom Macros +OutDir=.\LibD +# End Custom Macros + +ALL : "$(OUTDIR)\xml.lib" + + +CLEAN : + -@erase "$(INTDIR)\xml.idb" + -@erase "$(INTDIR)\xml.pdb" + -@erase "$(INTDIR)\xmlparse.obj" + -@erase "$(INTDIR)\xmlrole.obj" + -@erase "$(INTDIR)\xmltok.obj" + -@erase "$(OUTDIR)\xml.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" +LIB32_OBJS= \ + "$(INTDIR)\xmlparse.obj" \ + "$(INTDIR)\xmlrole.obj" \ + "$(INTDIR)\xmltok.obj" + +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ELSEIF "$(CFG)" == "xml - x64 Release" + +OUTDIR=.\x64\LibR +INTDIR=.\x64\LibR +# Begin Custom Macros +OutDir=.\x64\LibR +# End Custom Macros + +ALL : "$(OUTDIR)\xml.lib" + + +CLEAN : + -@erase "$(INTDIR)\xml.idb" + -@erase "$(INTDIR)\xml.pdb" + -@erase "$(INTDIR)\xmlparse.obj" + -@erase "$(INTDIR)\xmlrole.obj" + -@erase "$(INTDIR)\xmltok.obj" + -@erase "$(OUTDIR)\xml.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" +LIB32_OBJS= \ + "$(INTDIR)\xmlparse.obj" \ + "$(INTDIR)\xmlrole.obj" \ + "$(INTDIR)\xmltok.obj" + +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ELSEIF "$(CFG)" == "xml - x64 Debug" + +OUTDIR=.\x64\LibD +INTDIR=.\x64\LibD +# Begin Custom Macros +OutDir=.\x64\LibD +# End Custom Macros + +ALL : "$(OUTDIR)\xml.lib" + + +CLEAN : + -@erase "$(INTDIR)\xml.idb" + -@erase "$(INTDIR)\xml.pdb" + -@erase "$(INTDIR)\xmlparse.obj" + -@erase "$(INTDIR)\xmlrole.obj" + -@erase "$(INTDIR)\xmltok.obj" + -@erase "$(OUTDIR)\xml.lib" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +CPP=cl.exe +CPP_PROJ=/nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +RSC=rc.exe +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\xml.bsc" +BSC32_SBRS= \ + +LIB32=link.exe -lib +LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib" +LIB32_OBJS= \ + "$(INTDIR)\xmlparse.obj" \ + "$(INTDIR)\xmlrole.obj" \ + "$(INTDIR)\xmltok.obj" + +"$(OUTDIR)\xml.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) + $(LIB32) @<< + $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) +<< + +!ENDIF + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("xml.dep") +!INCLUDE "xml.dep" +!ELSE +!MESSAGE Warning: cannot find "xml.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug" || "$(CFG)" == "xml - x64 Release" || "$(CFG)" == "xml - x64 Debug" +SOURCE=.\xmlparse.c + +"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\xmlrole.c + +"$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=.\xmltok.c + +"$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)" + + +SOURCE=xmltok_impl.c +SOURCE=xmltok_ns.c + +!ENDIF + Property changes on: lib/xml.mak ___________________________________________________________________ Name: svn:eol-style + native Index: lib/xml.dep =================================================================== --- lib/xml.dep (.../vendor/expat/1.95.7) (revision 0) +++ lib/xml.dep (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,32 @@ +# Microsoft Developer Studio Generated Dependency File, included by xml.mak + +.\xmlparse.c : \ + ".\expat.h"\ + ".\internal.h"\ + ".\winconfig.h"\ + ".\xmlrole.h"\ + ".\xmltok.h"\ + + +.\xmlrole.c : \ + ".\ascii.h"\ + ".\internal.h"\ + ".\winconfig.h"\ + ".\xmlrole.h"\ + ".\xmltok.h"\ + + +.\xmltok.c : \ + ".\ascii.h"\ + ".\asciitab.h"\ + ".\iasciitab.h"\ + ".\internal.h"\ + ".\latin1tab.h"\ + ".\nametab.h"\ + ".\utf8tab.h"\ + ".\winconfig.h"\ + ".\xmltok.h"\ + ".\xmltok_impl.c"\ + ".\xmltok_impl.h"\ + ".\xmltok_ns.c"\ + Property changes on: lib/xml.dep ___________________________________________________________________ Name: svn:eol-style + native Index: lib/expat.h =================================================================== --- lib/expat.h (.../vendor/expat/1.95.7) (revision 1005660) +++ lib/expat.h (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -45,7 +45,7 @@ #ifndef XMLCALL #if defined(XML_USE_MSC_EXTENSIONS) #define XMLCALL __cdecl -#elif defined(__GNUC__) +#elif defined(__GNUC__) && defined(__i386) #define XMLCALL __attribute__((cdecl)) #else /* For any platform which uses this definition and supports more than Property changes on: lib/expat.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/xmlrole.h ___________________________________________________________________ Name: svn:eol-style + native Index: lib/winconfig.h =================================================================== --- lib/winconfig.h (.../vendor/expat/1.95.7) (revision 1005660) +++ lib/winconfig.h (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -1,30 +1,30 @@ -/*================================================================ -** Copyright 2000, Clark Cooper -** All rights reserved. -** -** This is free software. You are permitted to copy, distribute, or modify -** it under the terms of the MIT/X license (contained in the COPYING file -** with this distribution.) -*/ - -#ifndef WINCONFIG_H -#define WINCONFIG_H - -#define WIN32_LEAN_AND_MEAN -#include -#undef WIN32_LEAN_AND_MEAN - -#include -#include - -#define XML_NS 1 -#define XML_DTD 1 -#define XML_CONTEXT_BYTES 1024 - -/* we will assume all Windows platforms are little endian */ -#define BYTEORDER 1234 - -/* Windows has memmove() available. */ -#define HAVE_MEMMOVE - -#endif /* ndef WINCONFIG_H */ +/*================================================================ +** Copyright 2000, Clark Cooper +** All rights reserved. +** +** This is free software. You are permitted to copy, distribute, or modify +** it under the terms of the MIT/X license (contained in the COPYING file +** with this distribution.) +*/ + +#ifndef WINCONFIG_H +#define WINCONFIG_H + +#define WIN32_LEAN_AND_MEAN +#include +#undef WIN32_LEAN_AND_MEAN + +#include +#include + +#define XML_NS 1 +#define XML_DTD 1 +#define XML_CONTEXT_BYTES 1024 + +/* we will assume all Windows platforms are little endian */ +#define BYTEORDER 1234 + +/* Windows has memmove() available. */ +#define HAVE_MEMMOVE + +#endif /* ndef WINCONFIG_H */ Property changes on: lib/winconfig.h ___________________________________________________________________ Name: svn:eol-style + native Index: lib/xmlparse.c =================================================================== --- lib/xmlparse.c (.../vendor/expat/1.95.7) (revision 1005660) +++ lib/xmlparse.c (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -3361,6 +3361,9 @@ return XML_ERROR_UNCLOSED_TOKEN; case XML_TOK_PARTIAL_CHAR: return XML_ERROR_PARTIAL_CHAR; + case -XML_TOK_PROLOG_S: + tok = -tok; + break; case XML_TOK_NONE: #ifdef XML_DTD if (enc != encoding) Property changes on: lib/xmlparse.c ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/iasciitab.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib/ascii.h ___________________________________________________________________ Name: svn:eol-style + native Property changes on: lib ___________________________________________________________________ Name: svn:ignore + Makefile .deps .libs expat.h *.lo *.la config.h LibD LibR *.plg *.dep *.mak BuildLog.htm *.stc *.stt *.sto *.vcproj *.vcproj.* Property changes on: COPYING ___________________________________________________________________ Name: svn:eol-style + native Property changes on: README ___________________________________________________________________ Name: svn:eol-style + native Index: buildconf.sh =================================================================== --- buildconf.sh (.../vendor/expat/1.95.7) (revision 0) +++ buildconf.sh (.../branches/1.3.x/xml/expat) (revision 1005660) @@ -0,0 +1,78 @@ +#! /bin/sh + +# +# Find libtoolize. Prefer 1.x versions. +# +libtoolize=`conftools/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` +if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +fi + +# +# Create the libtool helper files +# +# Note: we copy (rather than link) the files. +# +# Note: This bundled version of expat will not always replace the +# files since we have a special config.guess/config.sub that we +# want to ensure is used. +echo "Copying libtool helper files ..." + +# Remove any m4 cache and libtool files so one can switch between +# autoconf and libtool versions by simply rerunning the buildconf script. +# +m4files='lt~obsolete.m4 ltversion.m4 ltoptions.m4 argz.m4 ltsugar.m4 libtool.m4' + +(cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files) +rm -rf autom4te*.cache aclocal.m4 + +$libtoolize --copy --automake + +# +# find libtool.m4 +# +if [ ! -f libtool.m4 ]; then + ltpath=`dirname $libtoolize` + ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} + if [ -f $ltfile ]; then + echo "libtool.m4 found at $ltfile" + cp $ltfile conftools/libtool.m4 + else + echo "libtool.m4 not found - aborting!" + exit 1 + fi +fi + +# +# Build aclocal.m4 from libtool's m4 files +# +echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4 +echo "dnl edits here will be lost" >> aclocal.m4 + +for m4file in $m4files +do + m4file=conftools/$m4file + if [ -f $m4file ]; then + echo "Incorporating $m4file into aclocal.m4 ..." + cat $m4file >> aclocal.m4 + rm -f $m4file + fi +done + +cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling" + +# +# Generate the autoconf header template (config.h.in) and ./configure +# +echo "Creating config.h.in ..." +${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" + +echo "Creating configure ..." +### do some work to toss config.cache? +${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" + +# Remove autoconf caches +rm -rf autom4te*.cache aclocal.m4 + +exit 0 Property changes on: buildconf.sh ___________________________________________________________________ Name: svn:eol-style + native Name: svn:executable + * Property changes on: . ___________________________________________________________________ Name: svn:mergeinfo + /apr/apr/trunk/xml/expat:781403,784592,789965,794508 /apr/apr-util/branches/1.3.x/xml/expat:692751 /apr/apr-util/branches/1.5.x/xml/expat:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975 /apr/apr-util/trunk/xml/expat:692751,731225,743986,744009,745771,747612,747623,747630,781403 /apr/apr-util/vendor/expat/1.95.7:1002560-1002564 /apr/apr-util/vendor/expat/current:1002513-1002559 Name: svn:ignore + Makefile aclocal.m4 configure libtool config.h.in config.h config.log config.status autom4te.cache expat_config.h*