Skip to contentSkip to conversation

package/pugixml: add support for a limited set of configuration options

PATCH Superseded Thomas De Schampheleire 2 participants 3 messages Jan 30, 2019 – Jan 31, 2019

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pugixml: add support for a limited set of configuration options

From: Wouter Vermeiren <[email protected]>

[ThomasDS: align with Buildroot coding style]
---
 package/pugixml/Config.in  | 67 ++++++++++++++++++++++++++++++++++++++
 package/pugixml/pugixml.mk | 26 +++++++++++++++
 2 files changed, 93 insertions(+)
package/pugixml/Config.in +67 -0
index c37b1df9e5..f3432d873d 100644
@@ -18,5 +18,72 @@ config BR2_PACKAGE_PUGIXML
 	  http://pugixml.org/
 	  https://github.com/zeux/pugixml
 
+if BR2_PACKAGE_PUGIXML
+
+config BR2_PACKAGE_PUGIXML_WCHAR_MODE
+	bool "Enable wchar_t mode"
+	help
+	  Toggles between UTF-8 (default) style interface (the in-memory
+	  text encoding is assumed to be UTF-8, most functions use char
+	  as character type) and UTF-16/32 style interface (the
+	  in-memory text encoding is assumed to be UTF-16/32, depending
+	  on wchar_t size, most functions use wchar_t as character type)
+
+	  http://pugixml.org/docs/manual.html#dom.unicode
+
+config BR2_PACKAGE_PUGIXML_COMPACT
+	bool "Enable compact mode"
+	help
+	  Activates a different internal representation of document
+	  storage that is much more memory efficient for documents with
+	  a lot of markup (i.e.  nodes and attributes), but is slightly
+	  slower to parse and access.
+
+	  http://pugixml.org/docs/manual.html#dom.memory.compact
+
+config BR2_PACKAGE_PUGIXML_NO_XPATH_SUPPORT
+	bool "Disable XPath support"
+	help
+	  Disables XPath support in pugixml. Both XPath interfaces and
+	  XPath implementation are excluded from compilation. This
+	  option is provided in case you do not need XPath functionality
+	  and need to save code space.
+
+config BR2_PACKAGE_PUGIXML_NO_STL_SUPPORT
+	bool "Disable STL support"
+	help
+	  Disables use of STL in pugixml. The functions that operate on
+	  STL types are no longer present (i.e. load/save via iostream)
+	  if this macro is defined.  This option is provided in case
+	  your target platform does not have a standard-compliant STL
+	  implementation.
+
+config BR2_PACKAGE_PUGIXML_NO_EXCEPTIONS
+	bool "Disable exceptions"
+	help
+	  Disables use of exceptions in pugixml. This option is provided
+	  in case your target platform does not have exception handling
+	  capabilities.
+
+config BR2_PACKAGE_PUGIXML_HEADER_ONLY
+	bool "Enable header-only version"
+	help
+	  All source code for pugixml will be included in every
+	  translation unit that includes pugixml.hpp. This is how most
+	  of Boost and STL libraries work.
+
+	  http://pugixml.org/docs/manual.html#install.building.header
+
+config BR2_PACKAGE_PUGIXML_HAS_LONG_LONG
+	bool "Enable long long support"
+	help
+	  Enables support for long long type in pugixml. This define is
+	  automatically enabled if your platform is known to have long
+	  long support (i.e. has C++11 support or uses a reasonably
+	  modern version of a known compiler); if pugixml does not
+	  recognize that your platform supports long long but in fact it
+	  does, you can enable the define manually.
+endif
+
 comment "pugixml needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
package/pugixml/pugixml.mk +26 -0
index e5188e5f53..02706e36f5 100644
@@ -10,4 +10,30 @@ PUGIXML_LICENSE = MIT
 PUGIXML_LICENSE_FILES = readme.txt
 PUGIXML_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_PUGIXML_WCHAR_MODE),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_WCHAR_MODE
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_NO_XPATH_SUPPORT),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_NO_STL_SUPPORT),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_NO_STL
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_NO_EXCEPTIONS),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_NO_EXCEPTIONS
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_HAS_LONG_LONG),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
+endif
+
+ifneq (,$(PUGIXML_BUILD_DEFINES))
+PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(strip $(PUGIXML_BUILD_DEFINES)))"
+endif
+
 $(eval $(cmake-package))
Signature · 1 line
2.19.2
#1 lore raw

PATCH 1/1 package/pugixml: add support for a limited set of configuration options

Hello,

Quick comments, not a full review.

Quoted 13 lines · On Wed, 30 Jan 2019 21:14:16 +0100 Thomas De Schampheleire…
package/pugixml/Config.in +13 -0
+config BR2_PACKAGE_PUGIXML_NO_XPATH_SUPPORT
+	bool "Disable XPath support"
+	help
+	  Disables XPath support in pugixml. Both XPath interfaces and
+	  XPath implementation are excluded from compilation. This
+	  option is provided in case you do not need XPath functionality
+	  and need to save code space.
+
+config BR2_PACKAGE_PUGIXML_NO_STL_SUPPORT
+	bool "Disable STL support"
+	help
+	  Disables use of STL in pugixml. The functions that operate on
+	  STL types are no longer present (i.e. load/save via iostream)

package/pugixml/Config.in config BR2_PACKAGE_PUGIXML · line 66

Quoted 10 lines
package/pugixml/Config.in +10 -0
+	  if this macro is defined.  This option is provided in case
+	  your target platform does not have a standard-compliant STL
+	  implementation.
+
+config BR2_PACKAGE_PUGIXML_NO_EXCEPTIONS
+	bool "Disable exceptions"
+	help
+	  Disables use of exceptions in pugixml. This option is provided
+	  in case your target platform does not have exception handling
+	  capabilities.

These options that you enable to disable something are backwards. Could you turn them over to actual enabling options, with "default y" if you want to keep backward compatibility.

package/pugixml/Config.in config BR2_PACKAGE_PUGIXML · line 77

Quoted 10 lines
package/pugixml/Config.in +10 -0
+config BR2_PACKAGE_PUGIXML_HEADER_ONLY
+	bool "Enable header-only version"
+	help
+	  All source code for pugixml will be included in every
+	  translation unit that includes pugixml.hpp. This is how most
+	  of Boost and STL libraries work.
+
+	  http://pugixml.org/docs/manual.html#install.building.header
+
+config BR2_PACKAGE_PUGIXML_HAS_LONG_LONG

"HAS_LONG_LONG" doesn't read like an enabling option, but like "does this package has long long".

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/pugixml: add support for a limited set of configuration options

El mi?., 30 ene. 2019 a las 21:34, Thomas Petazzoni (<[email protected]>) escribi?:

Quoted 36 lines

Hello,

Quick comments, not a full review.

Quoted 13 lines · On Wed, 30 Jan 2019 21:14:16 +0100 Thomas De Schampheleire…
package/pugixml/Config.in +13 -0
+config BR2_PACKAGE_PUGIXML_NO_XPATH_SUPPORT
+     bool "Disable XPath support"
+     help
+       Disables XPath support in pugixml. Both XPath interfaces and
+       XPath implementation are excluded from compilation. This
+       option is provided in case you do not need XPath functionality
+       and need to save code space.
+
+config BR2_PACKAGE_PUGIXML_NO_STL_SUPPORT
+     bool "Disable STL support"
+     help
+       Disables use of STL in pugixml. The functions that operate on
+       STL types are no longer present (i.e. load/save via iostream)

package/pugixml/Config.in config BR2_PACKAGE_PUGIXML · line 66

Quoted 10 lines
package/pugixml/Config.in +10 -0
+       if this macro is defined.  This option is provided in case
+       your target platform does not have a standard-compliant STL
+       implementation.
+
+config BR2_PACKAGE_PUGIXML_NO_EXCEPTIONS
+     bool "Disable exceptions"
+     help
+       Disables use of exceptions in pugixml. This option is provided
+       in case your target platform does not have exception handling
+       capabilities.

These options that you enable to disable something are backwards. Could you turn them over to actual enabling options, with "default y" if you want to keep backward compatibility.

Quoted 13 lines

package/pugixml/Config.in config BR2_PACKAGE_PUGIXML · line 77

Quoted 10 lines
package/pugixml/Config.in +10 -0
+config BR2_PACKAGE_PUGIXML_HEADER_ONLY
+     bool "Enable header-only version"
+     help
+       All source code for pugixml will be included in every
+       translation unit that includes pugixml.hpp. This is how most
+       of Boost and STL libraries work.
+
+       http://pugixml.org/docs/manual.html#install.building.header
+
+config BR2_PACKAGE_PUGIXML_HAS_LONG_LONG

"HAS_LONG_LONG" doesn't read like an enabling option, but like "does this package has long long".

Ok, thanks for both suggestions, I'll send a v2.

/Thomas