(#7212) nspr: bump + modernize + no tools.os_info in `build_requireme…

…nts` * nspr: bump + modernize + no tools.os_info in `build_requirements` * nspr: add more 64-bit cpus * nspr: DEBUG print config.log * Revert "nspr: DEBUG print config.log" This reverts commit 3a9dd3e. * Update recipes/nspr/all/conanfile.py * - PR_Initialize implicitly calls PR_Cleanup on exiting the primordial function (https://www-archive.mozilla.org/projects/nspr/reference/html/prinit.html#15758) Signed-off-by: SSE4 <[email protected]> * - typo Signed-off-by: SSE4 <[email protected]> * - support msvc compiler Signed-off-by: SSE4 <[email protected]> * Revert "Update recipes/nspr/all/conanfile.py" This reverts commit 0a8b084. * - linter Signed-off-by: SSE4 <[email protected]> Co-authored-by: SSE4 <[email protected]>
conan-io · Mar 7, 2022 · 3fcd880 · 3fcd880
1 parent c23140c
commit 3fcd880
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 72 deletions.
diff --git a/recipes/nspr/all/conandata.yml b/recipes/nspr/all/conandata.yml
@@ -1,13 +1,13 @@
 sources:
-  "4.24":
-    sha256: 90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0
-    url: https://ftp.mozilla.org/pub/nspr/releases/v4.24/src/nspr-4.24.tar.gz
-  "4.27":
-    sha256: 6d495192b6ab00a3c28db053492cf794329f7c0351a5728db198111a1816e89b
-    url: https://ftp.mozilla.org/pub/nspr/releases/v4.27/src/nspr-4.27.tar.gz
   "4.29":
     sha256: 22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582
     url: https://ftp.mozilla.org/pub/nspr/releases/v4.29/src/nspr-4.29.tar.gz
   "4.32":
     sha256: bb6bf4f534b9559cf123dcdc6f9cd8167de950314a90a88b2a329c16836e7f6c
     url: https://ftp.mozilla.org/pub/nspr/releases/v4.32/src/nspr-4.32.tar.gz
+  "4.27":
+    url: "https://ftp.mozilla.org/pub/nspr/releases/v4.27/src/nspr-4.27.tar.gz"
+    sha256: "6d495192b6ab00a3c28db053492cf794329f7c0351a5728db198111a1816e89b"
+  "4.24":
+    url: "https://ftp.mozilla.org/pub/nspr/releases/v4.24/src/nspr-4.24.tar.gz"
+    sha256: "90a59a0df6a11528749647fe18401cc7e03881e3e63c309f8c520ce06dd413d0"
diff --git a/recipes/nspr/all/conanfile.py b/recipes/nspr/all/conanfile.py
@@ -1,35 +1,39 @@
 from conans import ConanFile, tools, AutoToolsBuildEnvironment
 from conans.errors import ConanInvalidConfiguration
-import conan.tools.files
-from contextlib import contextmanager
 import os
+import contextlib
 
-required_conan_version = ">=1.33"
+required_conan_version = ">=1.33.0"
 
 class NsprConan(ConanFile):
     name = "nspr"
     homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
     description = "Netscape Portable Runtime (NSPR) provides a platform-neutral API for system level and libc-like functions."
-    topics = ("conan", "nspr", "libc")
+    topics = ("nspr", "libc")
     url = "https://github.com/conan-io/conan-center-index"
-    settings = "os", "compiler", "arch", "build_type"
     license = "MPL-2.0"
+    settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
         "fPIC": [True, False],
         "with_mozilla": [True, False],
-        "win32_target": ["winnt", "win95"]
+        "win32_target": ["winnt", "win95"],
     }
     default_options = {
         "shared": False,
         "fPIC": True,
         "with_mozilla": True,
         "win32_target": "winnt",
     }
+
     generators = "cmake"
 
     _autotools = None
 
+    @property
+    def _is_msvc(self):
+        return self.settings.compiler in ["Visual Studio", "msvc"]
+
     @property
     def _source_subfolder(self):
         return "source_subfolder"
@@ -45,10 +49,10 @@ def config_options(self):
             del self.options.win32_target
 
     def configure(self):
-        del self.settings.compiler.cppstd
-        del self.settings.compiler.libcxx
         if self.options.shared:
             del self.options.fPIC
+        del self.settings.compiler.cppstd
+        del self.settings.compiler.libcxx
 
     def validate(self):
         # https://bugzilla.mozilla.org/show_bug.cgi?id=1658671
@@ -58,19 +62,20 @@ def validate(self):
 
     def source(self):
         tools.get(**self.conan_data["sources"][self.version],
-                  strip_root=True)
-        conan.tools.files.rename(self, "nspr", self._source_subfolder)
+                  destination="tmp", strip_root=True)
+        os.rename(os.path.join("tmp", "nspr"), self._source_subfolder)
+        tools.rmdir("tmp")
 
     def build_requirements(self):
-        if self._settings_build.os == "Windows" :
+        if self._settings_build.os == "Windows":
             self.build_requires("mozilla-build/3.3")
             if not tools.get_env("CONAN_BASH_PATH"):
                 self.build_requires("msys2/cci.latest")
 
-    @contextmanager
+    @contextlib.contextmanager
     def _build_context(self):
-        if self.settings.compiler == "Visual Studio":
-            with tools.vcvars(self.settings):
+        if self._is_msvc:
+            with tools.vcvars(self):
                 with tools.environment_append({"CC": "cl", "CXX": "cl", "LD": "link"}):
                     yield
         else:
@@ -79,30 +84,34 @@ def _build_context(self):
     def _configure_autotools(self):
         if self._autotools:
             return self._autotools
+        self._autotools = AutoToolsBuildEnvironment(self, win_bash=tools.os_info.is_windows)
+        yes_no = lambda v: "yes" if v else "no"
         conf_args = [
-            "--with-mozilla" if self.options.with_mozilla else "--without-mozilla",
+            "--with-mozilla={}".format(yes_no(self.options.with_mozilla)),
+            "--enable-64bit={}".format(yes_no(self.settings.arch in ("armv8", "x86_64", "mips64", "ppc64", "ppc64le"))),
+            "--enable-strip={}".format(yes_no(self.settings.build_type not in ("Debug", "RelWithDebInfo"))),
+            "--enable-debug={}".format(yes_no(self.settings.build_type == "Debug")),
+            "--datarootdir={}".format(tools.unix_path(os.path.join(self.package_folder, "res"))),
             "--disable-cplus",
             "--enable-64bit" if self.settings.arch in ("armv8", "x86_64") else "--disable-64bit",
             "--disable-strip" if self.settings.build_type == "RelWithDebInfo" else "--enable-strip",
             "--enable-debug" if self.settings.build_type == "Debug" else "--disable-debug",
         ]
-        if self.settings.compiler == "Visual Studio":
+        if self._is_msvc:
             conf_args.extend([
                 "{}-pc-mingw32".format("x86_64" if self.settings.arch == "x86_64" else "x86"),
-                "--enable-static-rtl" if "MT" in str(self.settings.compiler.runtime) else "--disable-static-rtl",
-                "--enable-debug-rtl" if "d" in str(self.settings.compiler.runtime) else "--disable-debug-rtl",
+                "--enable-static-rtl={}".format(yes_no("MT" in self.settings.compiler.runtime)),
+                "--enable-debug-rtl={}".format(yes_no("d" in self.settings.compiler.runtime)),
             ])
         elif self.settings.os == "Android":
             conf_args.extend([
-                "--with-android-ndk={}".format(os.environ["NDK_ROOT"]),
+                "--with-android-ndk={}".format(tools.get_env(["NDK_ROOT"])),
                 "--with-android-version={}".format(self.settings.os.api_level),
-                "--with-android-platform={}".format(os.environ["ANDROID_PLATFORM"]),
-                "--with-android-toolchain={}".format(os.environ["ANDROID_TOOLCHAIN"]),
+                "--with-android-platform={}".format(tools.get_env("ANDROID_PLATFORM")),
+                "--with-android-toolchain={}".format(tools.get_env("ANDROID_TOOLCHAIN")),
             ])
         elif self.settings.os == "Windows":
             conf_args.append("--enable-win32-target={}".format(self.options.win32_target))
-        self._autotools = AutoToolsBuildEnvironment(self, win_bash=tools.os_info.is_windows)
-
         env = self._autotools.vars
         if self.settings.os == "Macos":
             if self.settings.arch == "armv8":
@@ -132,8 +141,8 @@ def package(self):
             if self.options.shared:
                 os.mkdir(os.path.join(self.package_folder, "bin"))
             for lib in self._library_names:
-                libsuffix = "lib" if self.settings.compiler == "Visual Studio" else "a"
-                libprefix = "" if self.settings.compiler == "Visual Studio" else "lib"
+                libsuffix = "lib" if self._is_msvc else "a"
+                libprefix = "" if self._is_msvc else "lib"
                 if self.options.shared:
                     os.unlink(os.path.join(self.package_folder, "lib", "{}{}_s.{}".format(libprefix, lib, libsuffix)))
                     os.rename(os.path.join(self.package_folder, "lib", "{}.dll".format(lib)),
@@ -184,3 +193,9 @@ def package_info(self):
             self.cpp_info.system_libs.extend(["dl", "pthread"])
         elif self.settings.os == "Windows":
             self.cpp_info.system_libs.extend(["winmm", "ws2_32"])
+
+        aclocal = tools.unix_path(os.path.join(self.package_folder, "res", "aclocal"))
+        self.output.info("Appending AUTOMAKE_CONAN_INCLUDES environment variable: {}".format(aclocal))
+        self.env_info.AUTOMAKE_CONAN_INCLUDES.append(aclocal)
+
+        self.cpp_info.resdirs = ["res"]
diff --git a/recipes/nspr/all/test_package/CMakeLists.txt b/recipes/nspr/all/test_package/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.1)
-project(test_package)
-
-set(CMAKE_CXX_STANDARD 11)
+project(test_package C)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
+conan_basic_setup(TARGETS)
+
+find_package(nspr REQUIRED CONFIG)
 
-add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
+add_executable(${PROJECT_NAME} test_package.c)
+target_link_libraries(${PROJECT_NAME} PRIVATE nspr::nspr)
diff --git a/recipes/nspr/all/test_package/conanfile.py b/recipes/nspr/all/test_package/conanfile.py
@@ -4,7 +4,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
+    generators = "cmake", "cmake_find_package_multi"
 
     def build(self):
         cmake = CMake(self)

diff --git a/recipes/nspr/all/test_package/test_package.c b/recipes/nspr/all/test_package/test_package.c
@@ -0,0 +1,26 @@
+#include <nspr.h>
+
+#include <stdio.h>
+
+static int primordial(int argc, char *argv[]) {
+    if (PR_Initialized() != PR_TRUE) {
+        fprintf(stderr, "NSPR not initialized!\n");
+        return 1;
+    }
+    fprintf(stderr, "Inside primordial function\n");
+    return 0;
+}
+
+int main(int argc, char *argv[]) {
+    int versionOk = PR_VersionCheck(PR_VERSION);
+    if (versionOk == 0) {
+        fprintf(stderr, "PR_VersionCheck() failed\n");
+        return 1;
+    }
+    printf(PR_NAME " version %s\n", PR_GetVersion());
+    PR_Initialize(primordial, argc, argv, 0);
+
+    PR_ProcessExit(0);
+    fprintf(stderr, "PR_ProcessExit failed\n");
+    return 1;
+}
diff --git a/recipes/nspr/all/test_package/test_package.cpp b/recipes/nspr/all/test_package/test_package.cpp
diff --git a/recipes/nspr/config.yml b/recipes/nspr/config.yml
@@ -1,9 +1,9 @@
 versions:
-  "4.24":
-    folder: all
-  "4.27":
+  "4.32":
     folder: all
   "4.29":
     folder: all
-  "4.32":
+  "4.27":
+    folder: all
+  "4.24":
     folder: all