Load /tmp/tmp.zfIyNk/libxml2-2.6.20 intoupstream/2.6.20

packages/libxml2/branches/upstream/current.

5 files changed, 58 insertions, 37 deletions

diff --git a/win32/.cvsignore b/win32/.cvsignore
index 1cca812..1f8e034 100644
--- a/win32/.cvsignore
+++ b/win32/.cvsignore
@@ -3,4 +3,5 @@ config.*
 depends.*
 int.*
 bin.*
-
+*.win32
+*.win32.zip
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb
index 2f32d94..6603d2a 100644
--- a/win32/Makefile.bcb
+++ b/win32/Makefile.bcb
@@ -214,7 +214,9 @@ UTILS = $(BINDIR)\xmllint.exe\
 	$(BINDIR)\testSAX.exe\
 	$(BINDIR)\testSchemas.exe\
 	$(BINDIR)\testURI.exe\
-	$(BINDIR)\testXPath.exe
+	$(BINDIR)\testXPath.exe\
+	$(BINDIR)\runtest.exe\

+	$(BINDIR)\runsuite.exe
 
 
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
@@ -244,7 +246,7 @@ distclean : clean
 
 rebuild : clean all
 
-install : all
+install-libs : all
 	if not exist "$(INCPREFIX)\libxml" mkdir "$(INCPREFIX)\libxml"
 	if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)"
 	if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)"
@@ -254,14 +256,10 @@ install : all
 	copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)"
 	copy $(BINDIR)\*.exe "$(BINPREFIX)"
 
-install-bindist : all
-	if not exist "$(INCPREFIX)\libxml" mkdir "$(INCPREFIX)\libxml"
-	if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)"
-	if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)"
-	copy $(XML_SRCDIR)\include\libxml\*.h "$(INCPREFIX)\libxml"
-	copy $(BINDIR)\$(XML_SO) "$(SOPREFIX)"
-	copy $(BINDIR)\$(XML_A) "$(LIBPREFIX)"
-	copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)"
+install : install-libs
+	copy $(BINDIR)\*.exe "$(BINPREFIX)"
+
+install-dist : install-libs
 	copy $(BINDIR)\xml*.exe "$(BINPREFIX)"
 
 # This is a target for me, to make a binary distribution. Not for the public use,
@@ -269,7 +267,7 @@ install-bindist : all
 BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION)
 BDPREFIX = $(XML_BASENAME)-$(BDVERSION).win32
 bindist : all
-	$(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-bindist
+	$(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-dist
 	cscript //NoLogo configure.js genreadme $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
 
 
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index a96c228..61d15ab 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -136,7 +136,7 @@ XML_OBJS = $(XML_INTDIR)/c14n.o\
 	$(XML_INTDIR)/xmlmemory.o\
 	$(XML_INTDIR)/xmlreader.o\
 	$(XML_INTDIR)/xmlregexp.o\
-	$(XML_INTDIR)\xmlmodule.o\
+	$(XML_INTDIR)/xmlmodule.o\
 	$(XML_INTDIR)/xmlsave.o\
 	$(XML_INTDIR)/xmlschemas.o\
 	$(XML_INTDIR)/xmlschemastypes.o\
@@ -182,7 +182,7 @@ XML_OBJS_A = $(XML_INTDIR_A)/c14n.o\
 	$(XML_INTDIR_A)/xmlmemory.o\
 	$(XML_INTDIR_A)/xmlreader.o\
 	$(XML_INTDIR_A)/xmlregexp.o\
-	$(XML_INTDIR_A)\xmlmodule.o\
+	$(XML_INTDIR_A)/xmlmodule.o\
 	$(XML_INTDIR_A)/xmlsave.o\
 	$(XML_INTDIR_A)/xmlschemas.o\
 	$(XML_INTDIR_A)/xmlschemastypes.o\
@@ -208,7 +208,9 @@ UTILS = $(BINDIR)/xmllint.exe\
 	$(BINDIR)/testSAX.exe\
 	$(BINDIR)/testSchemas.exe\
 	$(BINDIR)/testURI.exe\
-	$(BINDIR)/testXPath.exe
+	$(BINDIR)/testXPath.exe\
+	$(BINDIR)/runtest.exe\

+	$(BINDIR)/runsuite.exe
 ifeq ($(WITH_THREADS),yes)
 UTILS += $(BINDIR)/testThreadsWin32.exe
 endif
@@ -243,7 +245,7 @@ distclean : clean
 
 rebuild : clean all
 
-install : all
+install-libs : all
 	cmd.exe /C if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
 	cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX)
 	cmd.exe /C if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
@@ -251,16 +253,12 @@ install : all
 	cmd.exe /C copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
 	cmd.exe /C copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
 	cmd.exe /C copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
+	cmd.exe /C copy $(BINDIR)\xml*.exe $(BINPREFIX)
+
+install : install-libs
 	cmd.exe /C copy $(BINDIR)\*.exe $(BINPREFIX)
 
-install-bindist : all
-	cmd.exe /C if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
-	cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX)
-	cmd.exe /C if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
-	cmd.exe /C copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml
-	cmd.exe /C copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
-	cmd.exe /C copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
-	cmd.exe /C copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
+install-dist : install-libs
 	cmd.exe /C copy $(BINDIR)\xml*.exe $(BINPREFIX)
 
 # This is a target for me, to make a binary distribution. Not for the public use,
@@ -268,7 +266,7 @@ install-bindist : all
 BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION)
 BDPREFIX = $(XML_BASENAME)-$(BDVERSION).win32
 bindist : all
-	$(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install-bindist
+	$(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install-dist
 	cscript //NoLogo configure.js genreadme $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
 
 
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index be10cf9..3d11576 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -193,7 +193,10 @@ UTILS = $(BINDIR)\xmllint.exe\
 	$(BINDIR)\testSAX.exe\
 	$(BINDIR)\testSchemas.exe\
 	$(BINDIR)\testURI.exe\
-	$(BINDIR)\testXPath.exe
+	$(BINDIR)\testXPath.exe\
+	$(BINDIR)\runtest.exe\
+	$(BINDIR)\runsuite.exe
+	
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
 UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe
 !else if "$(WITH_THREADS)" == "posix"
@@ -220,7 +223,7 @@ distclean : clean
 
 rebuild : clean all
 
-install : all
+install-libs : all
 	if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
 	if not exist $(BINPREFIX) mkdir $(BINPREFIX)
 	if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
@@ -229,26 +232,21 @@ install : all
 	copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
 	copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
 	copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
+
+install : install-libs 
 	copy $(BINDIR)\*.exe $(BINPREFIX)
 	-copy $(BINDIR)\*.pdb $(BINPREFIX)
 
-install-bindist : all
-	if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\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 $(BINDIR)\$(XML_SO) $(SOPREFIX)
-	copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
-	copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
+install-dist : install-libs 
 	copy $(BINDIR)\xml*.exe $(BINPREFIX)
+	-copy $(BINDIR)\xml*.pdb $(BINPREFIX)
 
 # This is a target for me, to make a binary distribution. Not for the public use,
 # keep your hands off :-)
 BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION)
 BDPREFIX = $(XML_BASENAME)-$(BDVERSION).win32
 bindist : all
-	$(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-bindist
+	$(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-dist
 	cscript //NoLogo configure.js genreadme $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
 
 
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 09f9bb5..a0eb545 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -699,6 +699,11 @@ xmlCtxtResetLastError
 xmlCtxtResetPush
 xmlCtxtUseOptions
 xmlCurrentChar
+xmlDOMWrapAdoptNode
+xmlDOMWrapFreeCtxt
+xmlDOMWrapNewCtxt
+xmlDOMWrapReconcileNamespaces
+xmlDOMWrapRemoveNode
 #ifdef LIBXML_DEBUG_ENABLED
 xmlDebugCheckDocument
 #endif
@@ -1557,6 +1562,9 @@ xmlSchemaGetBuiltInType
 xmlSchemaGetCanonValue
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaGetCanonValueWhtsp
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaGetFacetValueAsULong
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -1593,6 +1601,9 @@ xmlSchemaNewNOTATIONValue
 xmlSchemaNewParserCtxt
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaNewQNameValue
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaNewStringValue
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -1629,6 +1640,9 @@ xmlSchemaValidateFacet
 xmlSchemaValidateFacetWhtsp
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValidateFile
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaValidateLengthFacet
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
@@ -1647,6 +1661,18 @@ xmlSchemaValidatePredefinedType
 xmlSchemaValidateStream
 #endif
 #ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValueAppend
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValueGetAsBoolean
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValueGetAsString
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
+xmlSchemaValueGetNext
+#endif
+#ifdef LIBXML_SCHEMAS_ENABLED
 xmlSchemaWhiteSpaceReplace
 #endif
 xmlSearchNs