[xmlwrapp-commits] SF.net SVN: xmlwrapp:[188] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 188
          http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=188&view=rev
Author:   tbrowder2
Date:     2012-03-18 19:50:46 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
incorporate changes from forked version on github

Modified Paths:
--------------
    trunk/LICENSE
    trunk/bootstrap
    trunk/include/xmlwrapp/exception.h
    trunk/include/xmlwrapp/export.h
    trunk/include/xmlwrapp/node.h
    trunk/include/xmlwrapp/nodes_view.h
    trunk/include/xmlwrapp/version.h
    trunk/platform/Win32/master.proj
    trunk/src/libxml/node.cxx
    trunk/src/libxml/node_iterator.cxx
    trunk/src/libxml/node_iterator.h
    trunk/src/libxml/nodes_view.cxx
    trunk/src/libxml/pimpl_base.h
    trunk/src/libxslt/result.h
    trunk/tests/Makefile.am
    trunk/tests/attributes/test_attributes.cxx
    trunk/tests/event/test_event.cxx
    trunk/tests/node/test_node.cxx
    trunk/tests/test.h
    trunk/tests/test_main.cxx
    trunk/tests/tree/test_tree.cxx
    trunk/tests/xslt/test_xslt.cxx

Modified: trunk/LICENSE
===================================================================

--- trunk/LICENSE	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/LICENSE	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 Copyright (C) 2001-2003 Peter J Jones <pj...@pm...>
-Copyright (C) 2009-2010 Vaclav Slavik <vs...@fa...>
+Copyright (C) 2009-2010 Vaclav Slavik <vs...@gm...>
 All Rights Reserved
 
 Redistribution and use in source and binary forms, with or without

Modified: trunk/bootstrap
===================================================================
--- trunk/bootstrap	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/bootstrap	2012-03-18 19:50:46 UTC (rev 188)
@@ -42,13 +42,19 @@
     exit 2
 fi
 
+if [ "${OSTYPE:0:6}" = "darwin" ]; then
+    LIBTOOLIZE=glibtoolize
+else
+    LIBTOOLIZE=libtoolize
+fi
+
 # use --foreign with automake because we lack standard GNU NEWS and AUTHOR
 # files, if they're added we can "upgrade" to (default) GNU strictness. Use
 # --copy to allow simultaneous use on windows under mingw and cygwin platforms.
 # Symlinking of files under mingw does not work out for cygwin and vice-versa.
 echo "Setting up build system for xmlwrapp:"
 echo " - aclocal " && aclocal -I admin && \
-echo " - libtoolize " && libtoolize --copy --automake && \
+echo " - libtoolize " && $LIBTOOLIZE --copy --automake && \
 echo " - autoconf " && autoconf && \
 echo " - automake " && automake --add-missing --copy --foreign && \
 echo " - doxygen " && (cd docs && doxygen) && \

Modified: trunk/include/xmlwrapp/exception.h
===================================================================
--- trunk/include/xmlwrapp/exception.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/include/xmlwrapp/exception.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Vaclav Slavik <vs...@fa...>
+ * Copyright (C) 2010 Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/include/xmlwrapp/export.h
===================================================================
--- trunk/include/xmlwrapp/export.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/include/xmlwrapp/export.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Vaclav Slavik <vs...@fa...>
+ * Copyright (C) 2010 Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/include/xmlwrapp/node.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- *               2009      Vaclav Slavik <vs...@fa...>
+ *               2009      Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -177,9 +177,11 @@
     explicit node(const char *name);
 
     /**
-        Construct a new xml::node given a name and content. The content will
-        be used to create a new child text node.
+        Construct a new xml::node given a name and content.
 
+        The content, if it's not an empty string, will be used to create a new
+        child text node.
+
         @param name The name of the new element.
         @param content The text that will be used to create a child node.
      */

Modified: trunk/include/xmlwrapp/nodes_view.h
===================================================================
--- trunk/include/xmlwrapp/nodes_view.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/include/xmlwrapp/nodes_view.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Vaclav Slavik <vs...@fa...>
+ * Copyright (C) 2009 Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/include/xmlwrapp/version.h
===================================================================
--- trunk/include/xmlwrapp/version.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/include/xmlwrapp/version.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Vaclav Slavik <vs...@fa...>
+ * Copyright (C) 2009 Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/platform/Win32/master.proj
===================================================================
--- trunk/platform/Win32/master.proj	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/platform/Win32/master.proj	2012-03-18 19:50:46 UTC (rev 188)
@@ -5,9 +5,9 @@
     <PropertyGroup>
         <VCVersion>9</VCVersion>
 
-        <VersionZlib>1.2.3</VersionZlib>
+        <VersionZlib>1.2.5</VersionZlib>
         <VersionIconv>1.9.2</VersionIconv>
-        <VersionLibxml2>2.7.6</VersionLibxml2>
+        <VersionLibxml2>2.7.8</VersionLibxml2>
         <VersionLibxslt>1.1.26</VersionLibxslt>
     </PropertyGroup>
 

Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/src/libxml/node.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- *               2009      Vaclav Slavik <vs...@fa...>
+ *               2009      Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -299,14 +299,17 @@
     if (!pimpl_->xmlnode_)
         throw std::bad_alloc();
 
-    xmlNodePtr content_node = xmlNewText(reinterpret_cast<const xmlChar*>(content));
-    if (!content_node)
-        throw std::bad_alloc();
+    if (std::strlen(content))
+    {
+        xmlNodePtr content_node = xmlNewText(reinterpret_cast<const xmlChar*>(content));
+        if (!content_node)
+            throw std::bad_alloc();
 
-    if (!xmlAddChild(pimpl_->xmlnode_, content_node))
-    {
-        xmlFreeNode(content_node);
-        throw std::bad_alloc();
+        if (!xmlAddChild(pimpl_->xmlnode_, content_node))
+        {
+            xmlFreeNode(content_node);
+            throw std::bad_alloc();
+        }
     }
 
     ap.release();

Modified: trunk/src/libxml/node_iterator.cxx
===================================================================
--- trunk/src/libxml/node_iterator.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/src/libxml/node_iterator.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- *               2009      Vaclav Slavik <vs...@fa...>
+ *               2009      Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/src/libxml/node_iterator.h
===================================================================
--- trunk/src/libxml/node_iterator.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/src/libxml/node_iterator.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- *               2009      Vaclav Slavik <vs...@fa...>
+ *               2009      Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/src/libxml/nodes_view.cxx
===================================================================
--- trunk/src/libxml/nodes_view.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/src/libxml/nodes_view.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Vaclav Slavik <vs...@fa...>
+ * Copyright (C) 2009 Vaclav Slavik <vs...@gm...>
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/src/libxml/pimpl_base.h
===================================================================
--- trunk/src/libxml/pimpl_base.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/src/libxml/pimpl_base.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2008 Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/src/libxslt/result.h
===================================================================
--- trunk/src/libxslt/result.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/src/libxslt/result.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Vadim Zeitlin (va...@ze...)
+ * Copyright (C) 2008 Vadim Zeitlin (vz-...@ze...)
  * All Rights Reserved
  *
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/Makefile.am	2012-03-18 19:50:46 UTC (rev 188)
@@ -3,8 +3,8 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 LIBS = $(top_builddir)/src/libxmlwrapp.la \
-	   -lboost_unit_test_framework \
-	   -lboost_iostreams
+	   $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) \
+	   $(BOOST_IOSTREAMS_LIBS) $(BOOST_IOSTREAMS_LDFLAGS)
 
 noinst_PROGRAMS = test
 

Modified: trunk/tests/attributes/test_attributes.cxx
===================================================================
--- trunk/tests/attributes/test_attributes.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/attributes/test_attributes.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- * Copyright (C) 2009      Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2009      Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/tests/event/test_event.cxx
===================================================================
--- trunk/tests/event/test_event.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/event/test_event.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- * Copyright (C) 2009      Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2009      Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/tests/node/test_node.cxx
===================================================================
--- trunk/tests/node/test_node.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/node/test_node.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- * Copyright (C) 2009-2010 Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2009-2010 Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/tests/test.h
===================================================================
--- trunk/tests/test.h	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/test.h	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2009 Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/tests/test_main.cxx
===================================================================
--- trunk/tests/test_main.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/test_main.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2009 Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/tests/tree/test_tree.cxx
===================================================================
--- trunk/tests/tree/test_tree.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/tree/test_tree.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- * Copyright (C) 2009      Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2009      Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

Modified: trunk/tests/xslt/test_xslt.cxx
===================================================================
--- trunk/tests/xslt/test_xslt.cxx	2012-03-18 19:49:33 UTC (rev 187)
+++ trunk/tests/xslt/test_xslt.cxx	2012-03-18 19:50:46 UTC (rev 188)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
- * Copyright (C) 2009      Vaclav Slavik (vs...@fa...)
+ * Copyright (C) 2009      Vaclav Slavik (vs...@gm...)
  * All Rights Reserved
  * 
  * Redistribution and use in source and binary forms, with or without

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





[xmlwrapp-commits] SF.net SVN: xmlwrapp:[188] trunk

A modern style C++ library for working with XML data

[xmlwrapp-commits] SF.net SVN: xmlwrapp:[188] trunk