Index: Makefile =================================================================== --- Makefile (revision 445437) +++ Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cpp-hocon -PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTVERSION= 0.1.5 CATEGORIES= devel MAINTAINER= jslagle@gmail.com @@ -9,6 +8,7 @@ COMMENT= C++ configuration library LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libleatherman_util.so:devel/leatherman @@ -16,7 +16,9 @@ USE_GITHUB= yes GH_ACCOUNT= puppetlabs +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=SHARED +TEST_TARGET= test USES= cmake -CMAKE_ARGS= -DCPP_HOCON_SHARED:BOOL=ON +USE_LDCONFIG= yes .include Index: distinfo =================================================================== --- distinfo (revision 445437) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477237793 -SHA256 (puppetlabs-cpp-hocon-0.1.4_GH0.tar.gz) = 2274b99dc098122b6e3d2c8d23173d21893555190c5a008e5a9a7d84875c7275 -SIZE (puppetlabs-cpp-hocon-0.1.4_GH0.tar.gz) = 157988 +TIMESTAMP = 1487758806 +SHA256 (puppetlabs-cpp-hocon-0.1.5_GH0.tar.gz) = 4b9d13edf455fd00aedf5a5c151b637f933e796be896f7dc59c9e8255aec99ab +SIZE (puppetlabs-cpp-hocon-0.1.5_GH0.tar.gz) = 158284 Index: files/patch-lib_CMakeLists.txt =================================================================== --- files/patch-lib_CMakeLists.txt (revision 445437) +++ files/patch-lib_CMakeLists.txt (nonexistent) @@ -1,32 +0,0 @@ ---- lib/CMakeLists.txt.orig 2016-09-23 20:45:10 UTC -+++ lib/CMakeLists.txt -@@ -75,20 +75,23 @@ set(PROJECT_SOURCES - ## Without the intermediate target, unexported symbols can't be tested. - add_library(libprojectsrc OBJECT ${PROJECT_SOURCES}) - set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true) -- --add_library(lib${PROJECT_NAME} $) --set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") --target_link_libraries(lib${PROJECT_NAME} -+if(CPP_HOCON_SHARED) -+ add_library(${PROJECT_NAME} SHARED $) -+else() -+ add_library(${PROJECT_NAME} $) -+endif() -+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -+target_link_libraries(${PROJECT_NAME} - ${LEATHERMAN_LIBRARIES} - ${Boost_LIBRARIES} - ) - - # Generate the export header for restricting symbols exported from the library. - # Restricting symbols has several advantages, noted at https://gcc.gnu.org/wiki/Visibility. --symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h") -+symbol_exports(${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h") - - # This correctly handles DLL installation on Windows. --leatherman_install(lib${PROJECT_NAME}) -+leatherman_install(${PROJECT_NAME}) - install(DIRECTORY inc/hocon DESTINATION include) - - add_subdirectory(tests) Property changes on: files/patch-lib_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config.hpp =================================================================== --- files/patch-lib_inc_hocon_config.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config.hpp -@@ -169,7 +169,7 @@ namespace hocon { - * interface is likely to grow new methods over time, so third-party - * implementations will break. - */ -- class LIBCPP_HOCON_EXPORT config : public config_mergeable, public std::enable_shared_from_this { -+ class CPP_HOCON_EXPORT config : public config_mergeable, public std::enable_shared_from_this { - friend class config_object; - friend class config_value; - friend class config_parseable; Property changes on: files/patch-lib_inc_hocon_config.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__include__context.hpp =================================================================== --- files/patch-lib_inc_hocon_config__include__context.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__include__context.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_include_context.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_include_context.hpp -@@ -18,7 +18,7 @@ namespace hocon { - * interface is likely to grow new methods over time, so third-party - * implementations will break. - */ -- class LIBCPP_HOCON_EXPORT config_include_context { -+ class CPP_HOCON_EXPORT config_include_context { - public: - /** - * Tries to find a name relative to whatever is doing the including, for Property changes on: files/patch-lib_inc_hocon_config__include__context.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__includer.hpp =================================================================== --- files/patch-lib_inc_hocon_config__includer.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__includer.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_includer.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_includer.hpp -@@ -12,7 +12,7 @@ namespace hocon { - * customize handling of {@code include} statements in config files. You may - * also want to implement {@link config_includer_file} and {@link config_includer_URL}, or not. - */ -- class LIBCPP_HOCON_EXPORT config_includer { -+ class CPP_HOCON_EXPORT config_includer { - public: - /** - * Returns a new includer that falls back to the given includer. This is how Property changes on: files/patch-lib_inc_hocon_config__includer.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__includer__file.hpp =================================================================== --- files/patch-lib_inc_hocon_config__includer__file.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__includer__file.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_includer_file.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_includer_file.hpp -@@ -11,7 +11,7 @@ namespace hocon { - * If you do not implement this but do implement {@link config_includer}, - * attempts to load files will use the default includer. - */ -- class LIBCPP_HOCON_EXPORT config_includer_file { -+ class CPP_HOCON_EXPORT config_includer_file { - public: - /** - * Parses another item to be included. The returned object typically would Property changes on: files/patch-lib_inc_hocon_config__includer__file.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__list.hpp =================================================================== --- files/patch-lib_inc_hocon_config__list.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__list.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_list.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_list.hpp -@@ -34,7 +34,7 @@ namespace hocon { - * - */ - -- class LIBCPP_HOCON_EXPORT config_list : public config_value { -+ class CPP_HOCON_EXPORT config_list : public config_value { - public: - config_list(shared_origin origin) : config_value(move(origin)) {} - Property changes on: files/patch-lib_inc_hocon_config__list.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__mergeable.hpp =================================================================== --- files/patch-lib_inc_hocon_config__mergeable.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__mergeable.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_mergeable.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_mergeable.hpp -@@ -5,7 +5,7 @@ - - namespace hocon { - -- class LIBCPP_HOCON_EXPORT config_mergeable { -+ class CPP_HOCON_EXPORT config_mergeable { - friend class config_value; - public: - /** Property changes on: files/patch-lib_inc_hocon_config__mergeable.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__object.hpp =================================================================== --- files/patch-lib_inc_hocon_config__object.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__object.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_object.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_object.hpp -@@ -8,7 +8,7 @@ - - namespace hocon { - -- class LIBCPP_HOCON_EXPORT config_object : public config_value { -+ class CPP_HOCON_EXPORT config_object : public config_value { - friend class config; - friend class config_value; - friend class simple_config_object; Property changes on: files/patch-lib_inc_hocon_config__object.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__origin.hpp =================================================================== --- files/patch-lib_inc_hocon_config__origin.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__origin.hpp (nonexistent) @@ -1,47 +0,0 @@ ---- lib/inc/hocon/config_origin.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_origin.hpp -@@ -36,7 +36,7 @@ namespace hocon { - * - * @return string describing the origin - */ -- LIBCPP_HOCON_EXPORT virtual std::string const& description() const = 0; -+ CPP_HOCON_EXPORT virtual std::string const& description() const = 0; - - /** - * Returns a {@code ConfigOrigin} based on this one, but with the given -@@ -55,7 +55,7 @@ namespace hocon { - * @param lineNumber the new line number - * @return the created ConfigOrigin - */ -- LIBCPP_HOCON_EXPORT virtual shared_origin with_line_number(int line_number) const = 0; -+ CPP_HOCON_EXPORT virtual shared_origin with_line_number(int line_number) const = 0; - - /** - * Returns a line number where the value or exception originated. This will -@@ -63,7 +63,7 @@ namespace hocon { - * - * @return line number or -1 if none is available - */ -- LIBCPP_HOCON_EXPORT virtual int line_number() const = 0; -+ CPP_HOCON_EXPORT virtual int line_number() const = 0; - - /** - * Returns any comments that appeared to "go with" this place in the file. -@@ -75,7 +75,7 @@ namespace hocon { - * @return any comments that seemed to "go with" this origin, empty list if - * none - */ -- LIBCPP_HOCON_EXPORT virtual std::vector const& comments() const = 0; -+ CPP_HOCON_EXPORT virtual std::vector const& comments() const = 0; - - /** - * Returns a {@code config_origin} based on this one, but with the given -@@ -92,7 +92,7 @@ namespace hocon { - * @param comments the comments used on the returned origin - * @return the config_origin with the given comments - */ -- LIBCPP_HOCON_EXPORT virtual shared_origin with_comments(std::vector comments) const = 0; -+ CPP_HOCON_EXPORT virtual shared_origin with_comments(std::vector comments) const = 0; - }; - - } // namespace hocon Property changes on: files/patch-lib_inc_hocon_config__origin.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__parse__options.hpp =================================================================== --- files/patch-lib_inc_hocon_config__parse__options.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__parse__options.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_parse_options.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_parse_options.hpp -@@ -22,7 +22,7 @@ namespace hocon { - * - * ClassLoader is Java-specific, so it was not ported to C++. - */ -- class LIBCPP_HOCON_EXPORT config_parse_options { -+ class CPP_HOCON_EXPORT config_parse_options { - public: - /** - * Gets an instance of config_parse_options with all fields Property changes on: files/patch-lib_inc_hocon_config__parse__options.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__parseable.hpp =================================================================== --- files/patch-lib_inc_hocon_config__parseable.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__parseable.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_parseable.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_parseable.hpp -@@ -16,7 +16,7 @@ namespace hocon { - * interface is likely to grow new methods over time, so third-party - * implementations will break. - */ -- class LIBCPP_HOCON_EXPORT config_parseable { -+ class CPP_HOCON_EXPORT config_parseable { - public: - /** - * Parse whatever it is. The options should come from Property changes on: files/patch-lib_inc_hocon_config__parseable.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__render__options.hpp =================================================================== --- files/patch-lib_inc_hocon_config__render__options.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__render__options.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_render_options.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_render_options.hpp -@@ -17,7 +17,7 @@ namespace hocon { - * config_render_options().set_comments(false) - * - */ -- class LIBCPP_HOCON_EXPORT config_render_options { -+ class CPP_HOCON_EXPORT config_render_options { - public: - /** Leaving the default arguments will result in a verbose rendering, - * which contains comments and therefore is not valid JSON. Property changes on: files/patch-lib_inc_hocon_config__render__options.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__resolve__options.hpp =================================================================== --- files/patch-lib_inc_hocon_config__resolve__options.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__resolve__options.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_resolve_options.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_resolve_options.hpp -@@ -27,7 +27,7 @@ namespace hocon { - * environment variables or other external system information. (Right now, - * environment variables are the only example.) - */ -- class LIBCPP_HOCON_EXPORT config_resolve_options { -+ class CPP_HOCON_EXPORT config_resolve_options { - public: - /** - * Returns the default resolve options. By default the system environment Property changes on: files/patch-lib_inc_hocon_config__resolve__options.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__value.hpp =================================================================== --- files/patch-lib_inc_hocon_config__value.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__value.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/config_value.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_value.hpp -@@ -36,7 +36,7 @@ namespace hocon { - * Also, this interface is likely to grow new methods over time, so third-party - * implementations will break. - */ -- class LIBCPP_HOCON_EXPORT config_value : public config_mergeable, public std::enable_shared_from_this { -+ class CPP_HOCON_EXPORT config_value : public config_mergeable, public std::enable_shared_from_this { - friend class token; - friend class value; - friend class default_transformer; Property changes on: files/patch-lib_inc_hocon_config__value.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_config__value__factory.hpp =================================================================== --- files/patch-lib_inc_hocon_config__value__factory.hpp (revision 445437) +++ files/patch-lib_inc_hocon_config__value__factory.hpp (nonexistent) @@ -1,14 +0,0 @@ ---- lib/inc/hocon/config_value_factory.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/config_value_factory.hpp -@@ -2,9 +2,10 @@ - - #include "types.hpp" - #include "export.h" -+#include - - namespace hocon { -- class LIBCPP_HOCON_EXPORT config_value_factory { -+ class CPP_HOCON_EXPORT config_value_factory { - public: - /** - * Creates a {@link ConfigValue} from a plain value, which may be Property changes on: files/patch-lib_inc_hocon_config__value__factory.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_parser_config__document.hpp =================================================================== --- files/patch-lib_inc_hocon_parser_config__document.hpp (revision 445437) +++ files/patch-lib_inc_hocon_parser_config__document.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/parser/config_document.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/parser/config_document.hpp -@@ -23,7 +23,7 @@ namespace hocon { - * Also, this interface is likely to grow new methods over time, so third-party - * implementations will break. - */ -- class LIBCPP_HOCON_EXPORT config_document { -+ class CPP_HOCON_EXPORT config_document { - public: - /** - * Returns a new config_document that is a copy of the current config_document, Property changes on: files/patch-lib_inc_hocon_parser_config__document.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_parser_config__document__factory.hpp =================================================================== --- files/patch-lib_inc_hocon_parser_config__document__factory.hpp (revision 445437) +++ files/patch-lib_inc_hocon_parser_config__document__factory.hpp (nonexistent) @@ -1,28 +0,0 @@ ---- lib/inc/hocon/parser/config_document_factory.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/parser/config_document_factory.hpp -@@ -18,11 +18,11 @@ namespace hocon { namespace config_docum - * parse options to control how the file is interpreted - * @return the parsed configuration - */ -- LIBCPP_HOCON_EXPORT std::shared_ptr parse_file(std::string input_file_path, -+ CPP_HOCON_EXPORT std::shared_ptr parse_file(std::string input_file_path, - config_parse_options options); - - /** Parses a file into a config_document instance using default options. */ -- LIBCPP_HOCON_EXPORT std::shared_ptr parse_file(std::string input_file_path); -+ CPP_HOCON_EXPORT std::shared_ptr parse_file(std::string input_file_path); - - /** - * Parses a string which should be valid HOCON or JSON. -@@ -31,9 +31,9 @@ namespace hocon { namespace config_docum - * @param options parse options - * @return the parsed configuration - */ -- LIBCPP_HOCON_EXPORT std::shared_ptr parse_string(std::string s, config_parse_options options); -+ CPP_HOCON_EXPORT std::shared_ptr parse_string(std::string s, config_parse_options options); - - /** Parses a string into a config_document instance using default options. */ -- LIBCPP_HOCON_EXPORT std::shared_ptr parse_string(std::string s); -+ CPP_HOCON_EXPORT std::shared_ptr parse_string(std::string s); - - }} // namespace hocon::config_document_factory Property changes on: files/patch-lib_inc_hocon_parser_config__document__factory.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_parser_config__node.hpp =================================================================== --- files/patch-lib_inc_hocon_parser_config__node.hpp (revision 445437) +++ files/patch-lib_inc_hocon_parser_config__node.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/parser/config_node.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/parser/config_node.hpp -@@ -18,7 +18,7 @@ namespace hocon { - * Also, this interface is likely to grow new methods over time, so third-party - * implementations will break. - */ -- class LIBCPP_HOCON_EXPORT config_node { -+ class CPP_HOCON_EXPORT config_node { - public: - /** - * The original text of the input which was used to form this particular Property changes on: files/patch-lib_inc_hocon_parser_config__node.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_inc_hocon_path.hpp =================================================================== --- files/patch-lib_inc_hocon_path.hpp (revision 445437) +++ files/patch-lib_inc_hocon_path.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- lib/inc/hocon/path.hpp.orig 2016-09-23 20:45:10 UTC -+++ lib/inc/hocon/path.hpp -@@ -10,7 +10,7 @@ - - namespace hocon { - -- class LIBCPP_HOCON_EXPORT path { -+ class CPP_HOCON_EXPORT path { - public: - path(); - explicit path(std::string first, path const& remainder); Property changes on: files/patch-lib_inc_hocon_path.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_src_config__value__factory.cc =================================================================== --- files/patch-lib_src_config__value__factory.cc (revision 445437) +++ files/patch-lib_src_config__value__factory.cc (nonexistent) @@ -1,63 +0,0 @@ ---- lib/src/config_value_factory.cc.orig 2016-09-23 20:45:10 UTC -+++ lib/src/config_value_factory.cc -@@ -17,27 +17,27 @@ namespace hocon { - // TODO: If use cases of from_any_ref require other types to produce config_nulls, - // we can revise this behavior - shared_value operator()(boost::blank null_value) const { -- return make_shared(nullptr); -+ return make_shared(nullptr); - } - - shared_value operator()(string str) const { -- return make_shared(nullptr, str, config_string_type::QUOTED); -+ return make_shared(nullptr, str, config_string_type::QUOTED); - } - - shared_value operator()(int64_t num) const { -- return make_shared(nullptr, num, ""); -+ return make_shared(nullptr, num, ""); - } - - shared_value operator()(double num) const { -- return make_shared(nullptr, num, ""); -+ return make_shared(nullptr, num, ""); - } - - shared_value operator()(int num) const { -- return make_shared(nullptr, num, ""); -+ return make_shared(nullptr, num, ""); - } - - shared_value operator()(bool boolean) const { -- return make_shared(nullptr, boolean); -+ return make_shared(nullptr, boolean); - } - - shared_value operator()(vector value_list) const { -@@ -45,7 +45,7 @@ namespace hocon { - for (unwrapped_value v : value_list) { - config_values.emplace_back(boost::apply_visitor(config_value_visitor(), v)); - } -- return make_shared(nullptr, config_values); -+ return make_shared(nullptr, config_values); - } - - shared_value operator()(unordered_map value_map) const { -@@ -53,7 +53,7 @@ namespace hocon { - for (auto pair : value_map) { - config_map[pair.first] = boost::apply_visitor(config_value_visitor(), pair.second); - } -- return make_shared(nullptr, config_map); -+ return make_shared(nullptr, config_map); - } - }; - -@@ -62,7 +62,7 @@ namespace hocon { - if (origin.empty()) { - origin = "hardcoded value"; - } -- auto conf_origin = make_shared(origin); -+ auto conf_origin = make_shared(origin); - return boost::apply_visitor(config_value_visitor(), value)->with_origin(conf_origin); - } - } // namespace hocon Property changes on: files/patch-lib_src_config__value__factory.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_tests_CMakeLists.txt =================================================================== --- files/patch-lib_tests_CMakeLists.txt (revision 445437) +++ files/patch-lib_tests_CMakeLists.txt (nonexistent) @@ -1,31 +0,0 @@ ---- lib/tests/CMakeLists.txt.orig 2016-09-23 20:45:10 UTC -+++ lib/tests/CMakeLists.txt -@@ -18,23 +18,23 @@ set(TEST_CASES - program_options.cc - ) - --add_executable(lib${PROJECT_NAME}_test $ ${TEST_CASES} main.cc) -+add_executable(${PROJECT_NAME}_test $ ${TEST_CASES} main.cc) - - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") -- target_link_libraries(lib${PROJECT_NAME}_test rt) -+ target_link_libraries(${PROJECT_NAME}_test rt) - endif() - --target_link_libraries(lib${PROJECT_NAME}_test -+target_link_libraries(${PROJECT_NAME}_test - ${Boost_LIBRARIES} - ${LEATHERMAN_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) - - if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND BOOST_STATIC AND LEATHERMAN_USE_LOCALES) -- target_link_libraries(lib${PROJECT_NAME}_test iconv) -+ target_link_libraries(${PROJECT_NAME}_test iconv) - endif() - --add_test(NAME "unit_tests" COMMAND lib${PROJECT_NAME}_test) -+add_test(NAME "unit_tests" COMMAND ${PROJECT_NAME}_test) - - configure_file ( - "${CMAKE_CURRENT_LIST_DIR}/fixtures.hpp.in" Property changes on: files/patch-lib_tests_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-lib_tests_config__value__test.cc =================================================================== --- files/patch-lib_tests_config__value__test.cc (revision 445437) +++ files/patch-lib_tests_config__value__test.cc (nonexistent) @@ -1,20 +0,0 @@ ---- lib/tests/config_value_test.cc.orig 2016-09-23 20:45:10 UTC -+++ lib/tests/config_value_test.cc -@@ -91,7 +91,7 @@ TEST_CASE("config object unwraps") { - auto value2 = config_int::new_number(fake_origin(), int64_t(2), "2"); - auto value3 = config_int::new_number(fake_origin(), int64_t(3), "3"); - unordered_map org {{"a", value1}, {"b", value2}, {"c", value3}}; -- auto obj = make_shared(fake_origin(), org); -+ auto obj = make_shared(fake_origin(), org); - unordered_map map {{"a", 1}, {"b", 2}, {"c", 3}}; - unwrapped_value expected(map); - bool test = expected == obj->unwrapped(); -@@ -103,7 +103,7 @@ TEST_CASE("config list unwraps") { - auto value2 = config_int::new_number(fake_origin(), int64_t(2), "2"); - auto value3 = config_int::new_number(fake_origin(), int64_t(3), "3"); - vector data { value1, value2, value3 }; -- auto list = make_shared(fake_origin(), data); -+ auto list = make_shared(fake_origin(), data); - vector v { 1,2,3 }; - unwrapped_value expected(v); - bool test = expected == list->unwrapped(); Property changes on: files/patch-lib_tests_config__value__test.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 445437) +++ pkg-plist (working copy) @@ -14,7 +14,6 @@ include/hocon/config_syntax.hpp include/hocon/config_value.hpp include/hocon/config_value_factory.hpp -include/hocon/config_value_factory.hpp.orig include/hocon/export.h include/hocon/functional_list.hpp include/hocon/parser/config_document.hpp @@ -24,5 +23,5 @@ include/hocon/program_options.hpp include/hocon/types.hpp include/hocon/version.h -lib/libcpp-hocon.so -lib/libcpp-hocon.so.0.1.2 +lib/liblibcpp-hocon.so +lib/liblibcpp-hocon.so.0.1.5