[cppunit] 12/38: Import Debian changes 1.10.2-7
Rene Engelhard
rene at moszumanska.debian.org
Sun May 14 10:57:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch experimental
in repository cppunit.
commit a49d1707b97a4fa74aa6f0f26efd6b5ca3538c4a
Author: Steve M. Robbins <smr at debian.org>
Date: Sat Jan 28 02:08:36 2006 -0500
Import Debian changes 1.10.2-7
cppunit (1.10.2-7) unstable; urgency=low
* Apply sourceforge patch [997006] to enable non-standalone XML output.
Closes: #348727.
---
debian/changelog | 7 +++
debian/cppunit-1.10.2-nostandalone.patch | 100 +++++++++++++++++++++++++++++++
include/cppunit/XmlOutputter.h | 10 ++++
include/cppunit/tools/XmlDocument.h | 4 ++
src/cppunit/XmlDocument.cpp | 21 ++++++-
src/cppunit/XmlOutputter.cpp | 7 +++
6 files changed, 148 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index dbf2382..1261c14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cppunit (1.10.2-7) unstable; urgency=low
+
+ * Apply sourceforge patch [997006] to enable non-standalone XML output.
+ Closes: #348727.
+
+ -- Steve M. Robbins <smr at debian.org> Sat, 28 Jan 2006 02:08:36 -0500
+
cppunit (1.10.2-6) unstable; urgency=low
* Apply Roger Leigh's patch to generate a pkconfig file. Closes:
diff --git a/debian/cppunit-1.10.2-nostandalone.patch b/debian/cppunit-1.10.2-nostandalone.patch
new file mode 100644
index 0000000..0286c71
--- /dev/null
+++ b/debian/cppunit-1.10.2-nostandalone.patch
@@ -0,0 +1,100 @@
+diff -Naur cppunit-1.10.2/include/cppunit/XmlOutputter.h cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h
+--- cppunit-1.10.2/include/cppunit/XmlOutputter.h 2002-09-17 01:31:29.000000000 +0700
++++ cppunit-1.10.2-nostandalone/include/cppunit/XmlOutputter.h 2004-07-24 15:44:00.816814688 +0700
+@@ -94,6 +94,16 @@
+ virtual void addSuccessfulTests( FailedTests &failedTests,
+ XmlElement *rootNode );
+
++ /*! \brief set the output document as standalone or not.
++ *
++ * For the output document, specify wether it's a standalone XML
++ * document, or not.
++ *
++ * \param standalone if true, the output will be specified as standalone.
++ * if false, it will be not.
++ */
++ virtual void setStandalone(bool standalone);
++
+ /*! \brief Adds the statics element to the root node.
+ *
+ * Creates a new element containing statistics data and adds it to the root element.
+diff -Naur cppunit-1.10.2/include/cppunit/tools/XmlDocument.h cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h
+--- cppunit-1.10.2/include/cppunit/tools/XmlDocument.h 2002-08-29 14:36:50.000000000 +0700
++++ cppunit-1.10.2-nostandalone/include/cppunit/tools/XmlDocument.h 2004-07-24 15:39:03.516011280 +0700
+@@ -42,6 +42,9 @@
+ std::string styleSheet() const;
+ void setStyleSheet( const std::string &styleSheet = "" );
+
++ bool standalone(void) const;
++ void setStandalone(bool standalone);
++
+ void setRootElement( XmlElement *rootElement );
+ XmlElement &rootElement() const;
+
+@@ -58,6 +61,7 @@
+ std::string m_encoding;
+ std::string m_styleSheet;
+ XmlElement *m_rootElement;
++ bool m_standalone;
+ };
+
+
+diff -Naur cppunit-1.10.2/src/cppunit/XmlDocument.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp
+--- cppunit-1.10.2/src/cppunit/XmlDocument.cpp 2002-08-28 04:51:18.000000000 +0700
++++ cppunit-1.10.2-nostandalone/src/cppunit/XmlDocument.cpp 2004-07-24 15:40:03.344915904 +0700
+@@ -11,6 +11,7 @@
+ , m_styleSheet( styleSheet )
+ {
+ setEncoding( encoding );
++ m_standalone = true;
+ }
+
+
+@@ -67,11 +68,29 @@
+ }
+
+
++bool
++XmlDocument::standalone() const
++{
++ return m_standalone;
++}
++
++
++void
++XmlDocument::setStandalone(bool standalone)
++{
++ m_standalone = standalone;
++}
++
++
+ std::string
+ XmlDocument::toString() const
+ {
+ std::string asString = "<?xml version=\"1.0\" "
+- "encoding='" + m_encoding + "' standalone='yes' ?>\n";
++ "encoding='" + m_encoding + "'";
++ if (m_standalone) {
++ asString += " standalone='yes'";
++ }
++ asString += " ?>\n";
+
+ if ( !m_styleSheet.empty() )
+ asString += "<?xml-stylesheet type=\"text/xsl\" href=\"" + m_styleSheet + "\"?>\n";
+diff -Naur cppunit-1.10.2/src/cppunit/XmlOutputter.cpp cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp
+--- cppunit-1.10.2/src/cppunit/XmlOutputter.cpp 2003-03-15 15:55:29.000000000 +0700
++++ cppunit-1.10.2-nostandalone/src/cppunit/XmlOutputter.cpp 2004-07-24 15:42:59.090198560 +0700
+@@ -43,6 +43,13 @@
+ }
+
+
++void
++XmlOutputter::setStandalone(bool standalone)
++{
++ m_xml->setStandalone(standalone);
++}
++
++
+ void
+ XmlOutputter::write()
+ {
diff --git a/include/cppunit/XmlOutputter.h b/include/cppunit/XmlOutputter.h
index d01968c..7e8104c 100644
--- a/include/cppunit/XmlOutputter.h
+++ b/include/cppunit/XmlOutputter.h
@@ -94,6 +94,16 @@ public:
virtual void addSuccessfulTests( FailedTests &failedTests,
XmlElement *rootNode );
+ /*! \brief set the output document as standalone or not.
+ *
+ * For the output document, specify wether it's a standalone XML
+ * document, or not.
+ *
+ * \param standalone if true, the output will be specified as standalone.
+ * if false, it will be not.
+ */
+ virtual void setStandalone(bool standalone);
+
/*! \brief Adds the statics element to the root node.
*
* Creates a new element containing statistics data and adds it to the root element.
diff --git a/include/cppunit/tools/XmlDocument.h b/include/cppunit/tools/XmlDocument.h
index 8d3f0c7..dbec084 100644
--- a/include/cppunit/tools/XmlDocument.h
+++ b/include/cppunit/tools/XmlDocument.h
@@ -42,6 +42,9 @@ public:
std::string styleSheet() const;
void setStyleSheet( const std::string &styleSheet = "" );
+ bool standalone(void) const;
+ void setStandalone(bool standalone);
+
void setRootElement( XmlElement *rootElement );
XmlElement &rootElement() const;
@@ -58,6 +61,7 @@ protected:
std::string m_encoding;
std::string m_styleSheet;
XmlElement *m_rootElement;
+ bool m_standalone;
};
diff --git a/src/cppunit/XmlDocument.cpp b/src/cppunit/XmlDocument.cpp
index 486c263..e846cd0 100644
--- a/src/cppunit/XmlDocument.cpp
+++ b/src/cppunit/XmlDocument.cpp
@@ -11,6 +11,7 @@ XmlDocument::XmlDocument( const std::string &encoding,
, m_styleSheet( styleSheet )
{
setEncoding( encoding );
+ m_standalone = true;
}
@@ -67,11 +68,29 @@ XmlDocument::rootElement() const
}
+bool
+XmlDocument::standalone() const
+{
+ return m_standalone;
+}
+
+
+void
+XmlDocument::setStandalone(bool standalone)
+{
+ m_standalone = standalone;
+}
+
+
std::string
XmlDocument::toString() const
{
std::string asString = "<?xml version=\"1.0\" "
- "encoding='" + m_encoding + "' standalone='yes' ?>\n";
+ "encoding='" + m_encoding + "'";
+ if (m_standalone) {
+ asString += " standalone='yes'";
+ }
+ asString += " ?>\n";
if ( !m_styleSheet.empty() )
asString += "<?xml-stylesheet type=\"text/xsl\" href=\"" + m_styleSheet + "\"?>\n";
diff --git a/src/cppunit/XmlOutputter.cpp b/src/cppunit/XmlOutputter.cpp
index 8453424..2ec5785 100644
--- a/src/cppunit/XmlOutputter.cpp
+++ b/src/cppunit/XmlOutputter.cpp
@@ -43,6 +43,13 @@ XmlOutputter::removeHook( XmlOutputterHook *hook )
}
+void
+XmlOutputter::setStandalone(bool standalone)
+{
+ m_xml->setStandalone(standalone);
+}
+
+
void
XmlOutputter::write()
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/cppunit.git
More information about the Pkg-openoffice-commits
mailing list