Merge pull request #875 from madebr/univalue

Add univalue/1.0.5 recipe

Author: SSE4

Diff for: recipes/univalue/all/conandata.yml

@@ -0,0 +1,8 @@
+sources:
+  "1.0.5":
+    url: "https://github.com/jgarzik/univalue/archive/v1.0.5.tar.gz"
+    sha256: "59eee225b078066c60277cab6dd93e74a0e7bed2be455db507eb39bd4f8e4319"
+patches:
+  "1.0.5":
+    - patch_file: "patches/0001-fix-windows.patch"
+      base_path: "source_subfolder"

Diff for: recipes/univalue/all/conanfile.py

@@ -0,0 +1,110 @@
+from conans import ConanFile, tools, AutoToolsBuildEnvironment
+from contextlib import contextmanager
+import os
+
+
+class UnivalueConan(ConanFile):
+    name = "univalue"
+    description = "High performance RAII C++ JSON library and universal value object class"
+    topics = "conan", "univalue", "universal", "json", "encoding", "decoding"
+    license = "MIT"
+    homepage = "https://github.com/jgarzik/univalue"
+    url = "https://github.com/conan-io/conan-center-index"
+    exports_sources = "patches/**"
+    settings = "os", "arch", "compiler", "build_type"
+    options = {
+        "shared": [True, False],
+        "fPIC": [True, False],
+    }
+    default_options = {
+        "shared": False,
+        "fPIC": True,
+    }
+
+    _autotools = None
+
+    @property
+    def _source_subfolder(self):
+        return "source_subfolder"
+
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+
+    def configure(self):
+        if self.options.shared:
+            del self.options.fPIC
+
+    def build_requirements(self):
+        self.build_requires("libtool/2.4.6")
+        if tools.os_info.is_windows and "CONAN_BASH_PATH" not in os.environ and \
+                tools.os_info.detect_windows_subsystem() != "msys2":
+            self.build_requires("msys2/20190524")
+
+    def source(self):
+        tools.get(**self.conan_data["sources"][self.version])
+        os.rename("univalue-{}".format(self.version), self._source_subfolder)
+
+    def _configure_autotools(self):
+        if self._autotools:
+            return self._autotools
+        self._autotools =  AutoToolsBuildEnvironment(self, win_bash=tools.os_info.is_windows)
+        self._autotools.libs = []
+        if self.settings.compiler == "Visual Studio":
+            self._autotools.flags.append("-FS")
+            self._autotools.cxx_flags.append("-EHsc")
+        conf_args = []
+        if self.options.shared:
+            conf_args.extend(["--enable-shared", "--disable-static"])
+        else:
+            conf_args.extend(["--disable-shared", "--enable-static"])
+        self._autotools.configure(args=conf_args, configure_dir=self._source_subfolder)
+        if self.settings.compiler == "Visual Studio":
+            tools.replace_in_file("libtool", "-Wl,-DLL,-IMPLIB", "-link -DLL -link -DLL -link -IMPLIB")
+        return self._autotools
+
+    def _patch_sources(self):
+        for patch in self.conan_data["patches"][self.version]:
+            tools.patch(**patch)
+
+    @contextmanager
+    def _build_context(self):
+        if self.settings.compiler == "Visual Studio":
+            with tools.vcvars(self.settings):
+                env = {
+                    "CC": "cl -nologo",
+                    "CXX": "cl -nologo",
+                    "CPP": "cl -nologo -EP",
+                    "LD": "link",
+                    "CXXLD": "link",
+                    "AR": "{} lib".format(tools.unix_path(self.deps_user_info["automake"].ar_lib)),
+                    "NM": "dumpbin -symbols",
+                }
+                with tools.environment_append(env):
+                    yield
+        else:
+            yield
+
+    def build(self):
+        self._patch_sources()
+        with tools.chdir(self._source_subfolder):
+            self.run("{} --verbose --install --force".format(tools.get_env("AUTORECONF")), win_bash=tools.os_info.is_windows)
+        with self._build_context():
+            autotools = self._configure_autotools()
+            autotools.make()
+
+    def package(self):
+        self.copy("COPYING", src=self._source_subfolder, dst="licenses")
+        with self._build_context():
+            autotools = self._configure_autotools()
+            autotools.install()
+            tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
+            os.unlink(os.path.join(self.package_folder, "lib",  "libunivalue.la"))
+
+    def package_info(self):
+        suffix = ".dll" if self.options.shared and self.settings.os == "Windows" else ""
+        if self.settings.compiler == "Visual Studio":
+            suffix += ".lib"
+        self.cpp_info.libs = ["univalue{}".format(suffix)]
+        if self.options.shared:
+            self.cpp_info.defines = ["UNIVALUE_SHARED"]

Diff for: recipes/univalue/all/patches/0001-fix-windows.patch

@@ -0,0 +1,89 @@
+--- configure.ac
++++ configure.ac
+@@ -42,14 +42,14 @@
+ AC_SUBST(LIBUNIVALUE_REVISION)
+ AC_SUBST(LIBUNIVALUE_AGE)
+
+-LT_INIT
++LT_INIT([win32-dll])
+ LT_LANG([C++])
+
+-case $host in
+-  *mingw*)
+-    LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"
+-  ;;
+-esac
++#case $host in
++#  *mingw*)
++#    LIBTOOL_APP_LDFLAGS="$LIBTOOL_APP_LDFLAGS -all-static"
++#  ;;
++#esac
+
+ BUILD_EXEEXT=
+ case $build in
+diff -ur source/source_subfolder/Makefile.am source_modified/source_subfolder/Makefile.am
+--- Makefile.am
++++ Makefile.am
+@@ -34,6 +34,8 @@
+ 	@echo Updating $<
+ 	$(AM_V_at)$(GENBIN) > lib/univalue_escapes.h
+
++if FALSE
++
+ noinst_PROGRAMS = $(TESTS) test/test_json
+
+ TEST_DATA_DIR=test
+@@ -58,6 +60,8 @@
+ test_object_CXXFLAGS = -I$(top_srcdir)/include
+ test_object_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)
+
++endif
++
+ TEST_FILES = \
+ 	$(TEST_DATA_DIR)/fail10.json \
+ 	$(TEST_DATA_DIR)/fail11.json \
+--- include/univalue.h
++++ include/univalue.h
+@@ -16,7 +16,19 @@
+
+ #include <utility>        // std::pair
+
+-class UniValue {
++#ifdef _WIN32
++# ifdef EXPORT_DLL
++#  define UNIVALUE_API __declspec(dllexport)
++# elif defined(UNIVALUE_SHARED)
++#  define UNIVALUE_API __declspec(dllimport)
++# endif
++#endif
++
++#ifndef UNIVALUE_API
++# define UNIVALUE_API
++#endif
++
++UNIVALUE_API class UniValue {
+ public:
+     enum VType { VNULL, VOBJ, VARR, VSTR, VNUM, VBOOL, };
+
+@@ -262,9 +274,9 @@
+     JTOK_STRING,
+ };
+
+-extern enum jtokentype getJsonToken(std::string& tokenVal,
++UNIVALUE_API extern enum jtokentype getJsonToken(std::string& tokenVal,
+                                     unsigned int& consumed, const char *raw, const char *end);
+-extern const char *uvTypeName(UniValue::VType t);
++UNIVALUE_API extern const char *uvTypeName(UniValue::VType t);
+
+ static inline bool jsonTokenIsValue(enum jtokentype jtt)
+ {
+@@ -299,8 +311,8 @@
+     // not reached
+ }
+
+-extern const UniValue NullUniValue;
++UNIVALUE_API extern const UniValue NullUniValue;
+
+ const UniValue& find_value( const UniValue& obj, const std::string& name);
+
+ #endif // __UNIVALUE_H__

Diff for: recipes/univalue/all/test_package/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.1)
+project(test_package CXX)
+
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
+add_executable(${PROJECT_NAME} test_package.cpp)
+target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})

Diff for: recipes/univalue/all/test_package/conanfile.py

@@ -0,0 +1,16 @@
+import os
+from conans import ConanFile, CMake, tools
+
+class apriltagTestConan(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+    generators = "cmake"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if not tools.cross_building(self.settings):
+            bin_path = os.path.join("bin", "test_package")
+            self.run(bin_path, run_environment=True)

Diff for: recipes/univalue/all/test_package/test_package.cpp

@@ -0,0 +1,21 @@
+#include "univalue.h"
+
+#include <cstdlib>
+#include <iostream>
+
+int main(int argc, char *argv[])
+{
+    UniValue package1(UniValue::VOBJ);
+    package1.pushKV("name", "univalue");
+    package1.pushKV("number", 1337);
+    package1.pushKV("double", 3.14);
+    UniValue package2(UniValue::VOBJ);
+    package2.pushKV("name", "boost");
+    package2.pushKV("bool", true);
+    UniValue parents(UniValue::VOBJ);
+    parents.pushKV("p1", package1);
+    parents.pushKV("p2", package2);
+
+    std::cout << parents.write(2);
+    return EXIT_SUCCESS;
+}

Diff for: recipes/univalue/config.yml

@@ -0,0 +1,3 @@
+versions:
+  "1.0.5":
+    folder: all