Upgrade to libxml 2.9.2 and libxslt 1.1.28

third_party/libxml/src/win32/Makefile.msvc

 # Makefile for libxml2, specific for Windows, MSVC and NMAKE.
 #
 # Take a look at the beginning and modify the variables to suit your 
 # environment. Having done that, you can do a
 #
 # nmake [all]     to build the libxml and the accompanying utilities.
 # nmake clean     to remove all compiler output files and return to a
 #                 clean state.
 # nmake rebuild   to rebuild everything from scratch. This basically does
 #                 a 'nmake clean' and then a 'nmake all'.
@@ skipping 18 matching lines @@
 
 # Place where we let the compiler put its output.
 BINDIR = bin.msvc
 XML_INTDIR = int.msvc
 XML_INTDIR_A = int.a.msvc
 XML_INTDIR_A_DLL = int.a.dll.msvc
 UTILS_INTDIR = int.utils.msvc
 
 # The preprocessor and its options.
 CPP = cl.exe /EP
-CPPFLAGS = /nologo /I$(XML_SRCDIR)\include
+CPPFLAGS = /nologo /I$(XML_SRCDIR)\include /D "NOLIBTOOL" 
 !if "$(WITH_THREADS)" != "no"
 CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
 !endif
 
 # The compiler and its options.
 CC = cl.exe
-CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W1 $(CRUNTIME)
+CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME)
 CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
 !if "$(WITH_THREADS)" != "no"
 CFLAGS = $(CFLAGS) /D "_REENTRANT"
 !endif
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls"
 CFLAGS = $(CFLAGS) /D "HAVE_WIN32_THREADS" /D "HAVE_COMPILER_TLS"
 !else if "$(WITH_THREADS)" == "native"
 CFLAGS = $(CFLAGS) /D "HAVE_WIN32_THREADS"
 !else if "$(WITH_THREADS)" == "posix"
 CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H"
 !endif
 !if "$(WITH_ZLIB)" == "1"
 CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H"
 !endif
+!if "$(WITH_LZMA)" == "1"
+CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H"
+!endif
 CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
 # The linker and its options.
 LD = link.exe
 LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
 LIBS =
 !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
 LIBS = $(LIBS) wsock32.lib ws2_32.lib
 !endif 
 !if "$(WITH_ICONV)" == "1"
 LIBS = $(LIBS) iconv.lib
 !endif 
 !if "$(WITH_ICU)" == "1"
 LIBS = $(LIBS) icu.lib
 !endif
 !if "$(WITH_ZLIB)" == "1"
-LIBS = $(LIBS) zdll.lib
+# could be named differently zdll or zlib
+# LIBS = $(LIBS) zdll.lib
+LIBS = $(LIBS) zlib.lib
+!endif
+!if "$(WITH_LZMA)" == "1"
+LIBS = $(LIBS) liblzma.lib
 !endif
 !if "$(WITH_THREADS)" == "posix"
 LIBS = $(LIBS) pthreadVC.lib
 !endif
 !if "$(WITH_MODULES)" == "1"
 LIBS = $(LIBS) kernel32.lib
 !endif
 
 # The archiver and its options.
 AR = lib.exe
 ARFLAGS = /nologo
 
 # Optimisation and debug symbols.
 !if "$(DEBUG)" == "1"
 CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
 LDFLAGS = $(LDFLAGS) /DEBUG
 !else
 CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
+# commented out as this break VC10 c.f. 634846
+# LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
+LDFLAGS = $(LDFLAGS)
 !endif
 
 # Libxml object files.
-XML_OBJS = $(XML_INTDIR)\c14n.obj\
+XML_OBJS = $(XML_INTDIR)\buf.obj\
+        $(XML_INTDIR)\c14n.obj\
         $(XML_INTDIR)\catalog.obj\
         $(XML_INTDIR)\chvalid.obj\
         $(XML_INTDIR)\debugXML.obj\
         $(XML_INTDIR)\dict.obj\
         $(XML_INTDIR)\DOCBparser.obj\
         $(XML_INTDIR)\encoding.obj\
         $(XML_INTDIR)\entities.obj\
         $(XML_INTDIR)\error.obj\
         $(XML_INTDIR)\globals.obj\
         $(XML_INTDIR)\hash.obj\
@@ skipping 24 matching lines @@
         $(XML_INTDIR)\xmlsave.obj\
         $(XML_INTDIR)\xmlschemas.obj\
         $(XML_INTDIR)\xmlschemastypes.obj\
         $(XML_INTDIR)\xmlunicode.obj\
         $(XML_INTDIR)\xmlwriter.obj\
         $(XML_INTDIR)\xpath.obj\
         $(XML_INTDIR)\xpointer.obj\
         $(XML_INTDIR)\xmlstring.obj
 
 # Static libxml object files.
-XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\
+XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\
+        $(XML_INTDIR_A)\c14n.obj\
         $(XML_INTDIR_A)\catalog.obj\
         $(XML_INTDIR_A)\chvalid.obj\
         $(XML_INTDIR_A)\debugXML.obj\
         $(XML_INTDIR_A)\dict.obj\
         $(XML_INTDIR_A)\DOCBparser.obj\
         $(XML_INTDIR_A)\encoding.obj\
         $(XML_INTDIR_A)\entities.obj\
         $(XML_INTDIR_A)\error.obj\
         $(XML_INTDIR_A)\globals.obj\
         $(XML_INTDIR_A)\hash.obj\
@@ skipping 24 matching lines @@
         $(XML_INTDIR_A)\xmlsave.obj\
         $(XML_INTDIR_A)\xmlschemas.obj\
         $(XML_INTDIR_A)\xmlschemastypes.obj\
         $(XML_INTDIR_A)\xmlunicode.obj\
         $(XML_INTDIR_A)\xmlwriter.obj\
         $(XML_INTDIR_A)\xpath.obj\
         $(XML_INTDIR_A)\xpointer.obj\
         $(XML_INTDIR_A)\xmlstring.obj
 
 # Static libxml object files.
-XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\c14n.obj\
+XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\buf.obj\
+        $(XML_INTDIR_A_DLL)\c14n.obj\
         $(XML_INTDIR_A_DLL)\catalog.obj\
         $(XML_INTDIR_A_DLL)\chvalid.obj\
         $(XML_INTDIR_A_DLL)\debugXML.obj\
         $(XML_INTDIR_A_DLL)\dict.obj\
         $(XML_INTDIR_A_DLL)\DOCBparser.obj\
         $(XML_INTDIR_A_DLL)\encoding.obj\
         $(XML_INTDIR_A_DLL)\entities.obj\
         $(XML_INTDIR_A_DLL)\error.obj\
         $(XML_INTDIR_A_DLL)\globals.obj\
         $(XML_INTDIR_A_DLL)\hash.obj\
@@ skipping 40 matching lines @@
         $(BINDIR)\testReader.exe\
         $(BINDIR)\testRelax.exe\
         $(BINDIR)\testRegexp.exe\
         $(BINDIR)\testModule.exe\
         $(BINDIR)\testSAX.exe\
         $(BINDIR)\testSchemas.exe\
         $(BINDIR)\testURI.exe\
         $(BINDIR)\testXPath.exe\
         $(BINDIR)\runtest.exe\
         $(BINDIR)\runsuite.exe\
-        $(BINDIR)\testapi.exe
+        $(BINDIR)\testapi.exe\
+        $(BINDIR)\testlimits.exe\
+        $(BINDIR)\testrecurse.exe
         
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
 UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe
 !else if "$(WITH_THREADS)" == "posix"
 UTILS = $(UTILS) $(BINDIR)\testThreads.exe
 !endif
 
 !if "$(VCMANIFEST)" == "1"
 _VC_MANIFEST_EMBED_EXE= if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;1
 _VC_MANIFEST_EMBED_DLL= if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
@@ skipping 19 matching lines @@
         if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR)
         if exist $(BINDIR) rmdir /S /Q $(BINDIR)
 
 distclean : clean
         if exist config.* del config.*
         if exist Makefile del Makefile
 
 rebuild : clean all
 
 install-libs : all
-        if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
+        if not exist $(INCPREFIX)\libxml2 mkdir $(INCPREFIX)\libxml2
+        if not exist $(INCPREFIX)\libxml2\libxml mkdir $(INCPREFIX)\libxml2\libxml
         if not exist $(BINPREFIX) mkdir $(BINPREFIX)
         if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
         if not exist $(SOPREFIX) mkdir $(SOPREFIX)
-        copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml
+        copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml2\libxml
         copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
         copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
         copy $(BINDIR)\$(XML_A_DLL) $(LIBPREFIX)
         copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
 
 install : install-libs 
         copy $(BINDIR)\*.exe $(BINPREFIX)
         -copy $(BINDIR)\*.pdb $(BINPREFIX)
 
 install-dist : install-libs 
@@ skipping 87 matching lines @@
 !endif
 
 # Builds xmllint and friends. Uses the implicit rule for commands.
 $(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxml libxmla libxmladll
 
 # Source dependences should be autogenerated somehow here, but how to
 # do it? I have no clue.
 
 # TESTS
 
-tests :  XPathtests
+tests : checktests XPathtests
+
+checktests : $(UTILS)
+        cd .. && win32\$(BINDIR)\runtest.exe
+        cd .. && win32\$(BINDIR)\testrecurse.exe
+        cd .. && win32\$(BINDIR)\testapi.exe
+        cd .. && win32\$(BINDIR)\testchar.exe
+        cd .. && win32\$(BINDIR)\testdict.exe
+        cd .. && win32\$(BINDIR)\runxmlconf.exe
 
 XPathtests : $(BINDIR)\testXPath.exe
         @echo. 2> .memdump
         @echo ## XPath regression tests
         @-$(BINDIR)\testXPath.exe | find /C "support not compiled in" 1>nul
         @if %ERRORLEVEL% NEQ 0 @( \
                 echo Skipping debug not compiled in\
                 @exit 0 \
         )
         @for %%I in ($(XML_SRCDIR)\test\XPath\expr\*.*) do @( \
@@ skipping 41 matching lines @@
                         fc result.%%~nxI result2.%%~nxI & \
                         del result.%%~nxI result2.%%~nxI\
                 ) \
         )