the profiling usually don't work, disabled rebuilt Daniel
* libxml.spec.in: the profiling usually don't work, disabled
* doc/*: rebuilt
Daniel
diff --git a/ChangeLog b/ChangeLog
index ffa7c72..7acd7c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 26 00:51:58 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+ * libxml.spec.in: the profiling usually don't work, disabled
+ * doc/*: rebuilt
+
Thu Aug 25 23:47:55 CEST 2005 Daniel Veillard <daniel@veillard.com>
* configure.in: trying to fix the first part of #310033 by
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index b17f320..7cdd7f2 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -27,6 +27,7 @@
</p><h2><a name="HTMLparser" id="HTMLparser">Module HTMLparser</a>:</h2><p><a href="html/libxml-HTMLparser.html#HTML_DEPRECATED">HTML_DEPRECATED</a><br />
<a href="html/libxml-HTMLparser.html#HTML_INVALID">HTML_INVALID</a><br />
<a href="html/libxml-HTMLparser.html#HTML_NA">HTML_NA</a><br />
+<a href="html/libxml-HTMLparser.html#HTML_PARSE_COMPACT">HTML_PARSE_COMPACT</a><br />
<a href="html/libxml-HTMLparser.html#HTML_PARSE_NOBLANKS">HTML_PARSE_NOBLANKS</a><br />
<a href="html/libxml-HTMLparser.html#HTML_PARSE_NOERROR">HTML_PARSE_NOERROR</a><br />
<a href="html/libxml-HTMLparser.html#HTML_PARSE_NONET">HTML_PARSE_NONET</a><br />
@@ -593,6 +594,7 @@
<a href="html/libxml-parser.html#XML_PARSER_START">XML_PARSER_START</a><br />
<a href="html/libxml-parser.html#XML_PARSER_START_TAG">XML_PARSER_START_TAG</a><br />
<a href="html/libxml-parser.html#XML_PARSER_SYSTEM_LITERAL">XML_PARSER_SYSTEM_LITERAL</a><br />
+<a href="html/libxml-parser.html#XML_PARSE_COMPACT">XML_PARSE_COMPACT</a><br />
<a href="html/libxml-parser.html#XML_PARSE_DOM">XML_PARSE_DOM</a><br />
<a href="html/libxml-parser.html#XML_PARSE_DTDATTR">XML_PARSE_DTDATTR</a><br />
<a href="html/libxml-parser.html#XML_PARSE_DTDLOAD">XML_PARSE_DTDLOAD</a><br />
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index 820b6f0..7abb56c 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -25,6 +25,7 @@
<a href="html/libxml-HTMLtree.html#HTML_ENTITY_REF_NODE">HTML_ENTITY_REF_NODE</a><br />
<a href="html/libxml-HTMLparser.html#HTML_INVALID">HTML_INVALID</a><br />
<a href="html/libxml-HTMLparser.html#HTML_NA">HTML_NA</a><br />
+<a href="html/libxml-HTMLparser.html#HTML_PARSE_COMPACT">HTML_PARSE_COMPACT</a><br />
<a href="html/libxml-HTMLparser.html#HTML_PARSE_NOBLANKS">HTML_PARSE_NOBLANKS</a><br />
<a href="html/libxml-HTMLparser.html#HTML_PARSE_NOERROR">HTML_PARSE_NOERROR</a><br />
<a href="html/libxml-HTMLparser.html#HTML_PARSE_NONET">HTML_PARSE_NONET</a><br />
@@ -556,6 +557,7 @@
<a href="html/libxml-xmlreader.html#XML_PARSER_SUBST_ENTITIES">XML_PARSER_SUBST_ENTITIES</a><br />
<a href="html/libxml-parser.html#XML_PARSER_SYSTEM_LITERAL">XML_PARSER_SYSTEM_LITERAL</a><br />
<a href="html/libxml-xmlreader.html#XML_PARSER_VALIDATE">XML_PARSER_VALIDATE</a><br />
+<a href="html/libxml-parser.html#XML_PARSE_COMPACT">XML_PARSE_COMPACT</a><br />
<a href="html/libxml-parser.html#XML_PARSE_DOM">XML_PARSE_DOM</a><br />
<a href="html/libxml-parser.html#XML_PARSE_DTDATTR">XML_PARSE_DTDATTR</a><br />
<a href="html/libxml-parser.html#XML_PARSE_DTDLOAD">XML_PARSE_DTDLOAD</a><br />
diff --git a/doc/html/libxml-HTMLparser.html b/doc/html/libxml-HTMLparser.html
index 161540a..8043542 100644
--- a/doc/html/libxml-HTMLparser.html
+++ b/doc/html/libxml-HTMLparser.html
@@ -92,6 +92,7 @@
<a name="HTML_PARSE_PEDANTIC" id="HTML_PARSE_PEDANTIC">HTML_PARSE_PEDANTIC</a> = 128 : pedantic error reporting
<a name="HTML_PARSE_NOBLANKS" id="HTML_PARSE_NOBLANKS">HTML_PARSE_NOBLANKS</a> = 256 : remove blank nodes
<a name="HTML_PARSE_NONET" id="HTML_PARSE_NONET">HTML_PARSE_NONET</a> = 2048 : Forbid network access
+ <a name="HTML_PARSE_COMPACT" id="HTML_PARSE_COMPACT">HTML_PARSE_COMPACT</a> = 65536 : compact small text nodes
}
</pre><h3>Enum <a name="htmlStatus" id="htmlStatus">htmlStatus</a></h3><pre class="programlisting">Enum htmlStatus {
<a name="HTML_NA" id="HTML_NA">HTML_NA</a> = 0 : something we don't check at all
diff --git a/doc/html/libxml-parser.html b/doc/html/libxml-parser.html
index ba4ed33..5cc8e84 100644
--- a/doc/html/libxml-parser.html
+++ b/doc/html/libxml-parser.html
@@ -245,6 +245,7 @@
<a name="XML_PARSE_NSCLEAN" id="XML_PARSE_NSCLEAN">XML_PARSE_NSCLEAN</a> = 8192 : remove redundant namespaces declarations
<a name="XML_PARSE_NOCDATA" id="XML_PARSE_NOCDATA">XML_PARSE_NOCDATA</a> = 16384 : merge CDATA as text nodes
<a name="XML_PARSE_NOXINCNODE" id="XML_PARSE_NOXINCNODE">XML_PARSE_NOXINCNODE</a> = 32768 : do not generate XINCLUDE START/END nodes
+ <a name="XML_PARSE_COMPACT" id="XML_PARSE_COMPACT">XML_PARSE_COMPACT</a> = 65536 : compact small text nodes
}
</pre><h3><a name="xmlSAXHandlerV1" id="xmlSAXHandlerV1">Structure xmlSAXHandlerV1</a></h3><pre class="programlisting">Structure xmlSAXHandlerV1<br />struct _xmlSAXHandlerV1 {
<a href="libxml-parser.html#internalSubsetSAXFunc">internalSubsetSAXFunc</a> internalSubset
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 9a48431..74135d5 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -35,9 +35,10 @@
<exports symbol='HTML_INVALID' type='enum'/>
<exports symbol='HTML_PARSE_NONET' type='enum'/>
<exports symbol='HTML_NA' type='enum'/>
+ <exports symbol='HTML_PARSE_COMPACT' type='enum'/>
<exports symbol='HTML_VALID' type='enum'/>
- <exports symbol='HTML_PARSE_NOBLANKS' type='enum'/>
<exports symbol='HTML_PARSE_NOERROR' type='enum'/>
+ <exports symbol='HTML_PARSE_NOBLANKS' type='enum'/>
<exports symbol='HTML_DEPRECATED' type='enum'/>
<exports symbol='HTML_PARSE_PEDANTIC' type='enum'/>
<exports symbol='HTML_PARSE_RECOVER' type='enum'/>
@@ -693,6 +694,7 @@
<exports symbol='XML_PARSE_NOERROR' type='enum'/>
<exports symbol='XML_PARSE_NSCLEAN' type='enum'/>
<exports symbol='XML_PARSE_NOCDATA' type='enum'/>
+ <exports symbol='XML_PARSE_COMPACT' type='enum'/>
<exports symbol='XML_PARSE_SAX1' type='enum'/>
<exports symbol='XML_PARSER_DTD' type='enum'/>
<exports symbol='XML_PARSER_MISC' type='enum'/>
@@ -4442,9 +4444,10 @@
<enum name='HTML_DEPRECATED' file='HTMLparser' value='2' type='htmlStatus'/>
<enum name='HTML_INVALID' file='HTMLparser' value='1' type='htmlStatus'/>
<enum name='HTML_NA' file='HTMLparser' value='0' type='htmlStatus' info='something we don't check at all'/>
+ <enum name='HTML_PARSE_COMPACT' file='HTMLparser' value='65536' type='htmlParserOption' info=' compact small text nodes'/>
<enum name='HTML_PARSE_NOBLANKS' file='HTMLparser' value='256' type='htmlParserOption' info='remove blank nodes'/>
<enum name='HTML_PARSE_NOERROR' file='HTMLparser' value='32' type='htmlParserOption' info='suppress error reports'/>
- <enum name='HTML_PARSE_NONET' file='HTMLparser' value='2048' type='htmlParserOption' info=' Forbid network access'/>
+ <enum name='HTML_PARSE_NONET' file='HTMLparser' value='2048' type='htmlParserOption' info='Forbid network access'/>
<enum name='HTML_PARSE_NOWARNING' file='HTMLparser' value='64' type='htmlParserOption' info='suppress warning reports'/>
<enum name='HTML_PARSE_PEDANTIC' file='HTMLparser' value='128' type='htmlParserOption' info='pedantic error reporting'/>
<enum name='HTML_PARSE_RECOVER' file='HTMLparser' value='1' type='htmlParserOption' info='Relaxed parsing'/>
@@ -4880,6 +4883,7 @@
<enum name='XML_PARSER_SUBST_ENTITIES' file='xmlreader' value='4' type='xmlParserProperties'/>
<enum name='XML_PARSER_SYSTEM_LITERAL' file='parser' value='13' type='xmlParserInputState' info='within a SYSTEM value'/>
<enum name='XML_PARSER_VALIDATE' file='xmlreader' value='3' type='xmlParserProperties'/>
+ <enum name='XML_PARSE_COMPACT' file='parser' value='65536' type='xmlParserOption' info=' compact small text nodes'/>
<enum name='XML_PARSE_DOM' file='parser' value='1' type='xmlParserMode'/>
<enum name='XML_PARSE_DTDATTR' file='parser' value='8' type='xmlParserOption' info='default DTD attributes'/>
<enum name='XML_PARSE_DTDLOAD' file='parser' value='4' type='xmlParserOption' info='load the external subset'/>
@@ -4891,7 +4895,7 @@
<enum name='XML_PARSE_NOERROR' file='parser' value='32' type='xmlParserOption' info='suppress error reports'/>
<enum name='XML_PARSE_NONET' file='parser' value='2048' type='xmlParserOption' info='Forbid network access'/>
<enum name='XML_PARSE_NOWARNING' file='parser' value='64' type='xmlParserOption' info='suppress warning reports'/>
- <enum name='XML_PARSE_NOXINCNODE' file='parser' value='32768' type='xmlParserOption' info=' do not generate XINCLUDE START/END nodes'/>
+ <enum name='XML_PARSE_NOXINCNODE' file='parser' value='32768' type='xmlParserOption' info='do not generate XINCLUDE START/END nodes'/>
<enum name='XML_PARSE_NSCLEAN' file='parser' value='8192' type='xmlParserOption' info='remove redundant namespaces declarations'/>
<enum name='XML_PARSE_PEDANTIC' file='parser' value='128' type='xmlParserOption' info='pedantic error reporting'/>
<enum name='XML_PARSE_PUSH_DOM' file='parser' value='3' type='xmlParserMode'/>
diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml
index 098744f..88ac06c 100644
--- a/doc/libxml2-refs.xml
+++ b/doc/libxml2-refs.xml
@@ -19,6 +19,7 @@
<reference name='HTML_ENTITY_REF_NODE' href='html/libxml-HTMLtree.html#HTML_ENTITY_REF_NODE'/>
<reference name='HTML_INVALID' href='html/libxml-HTMLparser.html#HTML_INVALID'/>
<reference name='HTML_NA' href='html/libxml-HTMLparser.html#HTML_NA'/>
+ <reference name='HTML_PARSE_COMPACT' href='html/libxml-HTMLparser.html#HTML_PARSE_COMPACT'/>
<reference name='HTML_PARSE_NOBLANKS' href='html/libxml-HTMLparser.html#HTML_PARSE_NOBLANKS'/>
<reference name='HTML_PARSE_NOERROR' href='html/libxml-HTMLparser.html#HTML_PARSE_NOERROR'/>
<reference name='HTML_PARSE_NONET' href='html/libxml-HTMLparser.html#HTML_PARSE_NONET'/>
@@ -550,6 +551,7 @@
<reference name='XML_PARSER_SUBST_ENTITIES' href='html/libxml-xmlreader.html#XML_PARSER_SUBST_ENTITIES'/>
<reference name='XML_PARSER_SYSTEM_LITERAL' href='html/libxml-parser.html#XML_PARSER_SYSTEM_LITERAL'/>
<reference name='XML_PARSER_VALIDATE' href='html/libxml-xmlreader.html#XML_PARSER_VALIDATE'/>
+ <reference name='XML_PARSE_COMPACT' href='html/libxml-parser.html#XML_PARSE_COMPACT'/>
<reference name='XML_PARSE_DOM' href='html/libxml-parser.html#XML_PARSE_DOM'/>
<reference name='XML_PARSE_DTDATTR' href='html/libxml-parser.html#XML_PARSE_DTDATTR'/>
<reference name='XML_PARSE_DTDLOAD' href='html/libxml-parser.html#XML_PARSE_DTDLOAD'/>
@@ -3442,6 +3444,7 @@
<ref name='HTML_ENTITY_REF_NODE'/>
<ref name='HTML_INVALID'/>
<ref name='HTML_NA'/>
+ <ref name='HTML_PARSE_COMPACT'/>
<ref name='HTML_PARSE_NOBLANKS'/>
<ref name='HTML_PARSE_NOERROR'/>
<ref name='HTML_PARSE_NONET'/>
@@ -3987,6 +3990,7 @@
<ref name='XML_PARSER_SUBST_ENTITIES'/>
<ref name='XML_PARSER_SYSTEM_LITERAL'/>
<ref name='XML_PARSER_VALIDATE'/>
+ <ref name='XML_PARSE_COMPACT'/>
<ref name='XML_PARSE_DOM'/>
<ref name='XML_PARSE_DTDATTR'/>
<ref name='XML_PARSE_DTDLOAD'/>
@@ -10317,6 +10321,7 @@
<ref name='HTML_DEPRECATED'/>
<ref name='HTML_INVALID'/>
<ref name='HTML_NA'/>
+ <ref name='HTML_PARSE_COMPACT'/>
<ref name='HTML_PARSE_NOBLANKS'/>
<ref name='HTML_PARSE_NOERROR'/>
<ref name='HTML_PARSE_NONET'/>
@@ -10915,6 +10920,7 @@
<ref name='XML_PARSER_START'/>
<ref name='XML_PARSER_START_TAG'/>
<ref name='XML_PARSER_SYSTEM_LITERAL'/>
+ <ref name='XML_PARSE_COMPACT'/>
<ref name='XML_PARSE_DOM'/>
<ref name='XML_PARSE_DTDATTR'/>
<ref name='XML_PARSE_DTDLOAD'/>
diff --git a/libxml.spec.in b/libxml.spec.in
index 91972bd..6b5a22c 100644
--- a/libxml.spec.in
+++ b/libxml.spec.in
@@ -64,31 +64,34 @@
# try to use compiler profiling, based on Arjan van de Ven <arjanv@redhat.com>
# initial test spec. This really doesn't work okay for most tests done.
#
-GCC_VERSION=`gcc --version | grep "^gcc" | awk '{ print $3 }' | sed 's+\([0-9]\)\.\([0-9]\)\..*+\1\2+'`
-if [ $GCC_VERSION -ge 34 ]
-then
- PROF_GEN='-fprofile-generate'
- PROF_USE='-fprofile-use'
-fi
-
-if [ "$PROF_GEN" != "" ]
-then
- # First generate a profiling version
- CFLAGS="${RPM_OPT_FLAGS} ${PROF_GEN}" %configure
- make
- # Run a few sampling
- make dba100000.xml
- ./xmllint --noout dba100000.xml
- ./xmllint --stream dba100000.xml
- ./xmllint --noout --valid test/valid/REC-xml-19980210.xml
- ./xmllint --stream --valid test/valid/REC-xml-19980210.xml
- # Then generate code based on profile
- CFLAGS="${RPM_OPT_FLAGS} ${PROF_USE}" %configure
- make
-else
- %configure
- make
-fi
+# Well except it's just broken most of the time.
+#GCC_VERSION=`gcc --version | grep "^gcc" | awk '{ print $3 }' | sed 's+\([0-9]\)\.\([0-9]\)\..*+\1\2+'`
+#if [ $GCC_VERSION -ge 34 ]
+#then
+# PROF_GEN='-fprofile-generate'
+# PROF_USE='-fprofile-use'
+#fi
+#
+#if [ "$PROF_GEN" != "" ]
+#then
+# # First generate a profiling version
+# CFLAGS="${RPM_OPT_FLAGS} ${PROF_GEN}" %configure
+# make
+# # Run a few sampling
+# make dba100000.xml
+# ./xmllint --noout dba100000.xml
+# ./xmllint --stream dba100000.xml
+# ./xmllint --noout --valid test/valid/REC-xml-19980210.xml
+# ./xmllint --stream --valid test/valid/REC-xml-19980210.xml
+# # Then generate code based on profile
+# CFLAGS="${RPM_OPT_FLAGS} ${PROF_USE}" %configure
+# make
+#else
+# %configure
+# make
+#fi
+%configure
+make
gzip -9 ChangeLog
%install