liquid-dsp: Conan v2 update

recipes/liquid-dsp/all/conandata.yml

@@ -2,7 +2,3 @@ sources:
   "1.3.2":
     url: "https://github.com/jgaeddert/liquid-dsp/archive/refs/tags/v1.3.2.tar.gz"
     sha256: "85093624EF9CB90EAD64C836D2F42690197EDACE1A86257D6524C4E4DC870483"
-patches:
-  "1.3.2":
-    - patch_file: "patches/1.3.2/0001-Remove-headers-check.patch"
-      base_path: "source_subfolder"

recipes/liquid-dsp/all/conanfile.py

@@ -1,186 +1,122 @@
-from conans import ConanFile, tools
-from conans.errors import ConanInvalidConfiguration
-from contextlib import contextmanager
+from conan import ConanFile
+from conan.errors import ConanInvalidConfiguration
+from conan.tools.build import cross_building
+from conan.tools.env import VirtualBuildEnv
+from conan.tools.files import apply_conandata_patches, chdir, copy, export_conandata_patches, get, rm
+from conan.tools.gnu import Autotools, AutotoolsDeps, AutotoolsToolchain
+from conan.tools.layout import basic_layout
+from conan.tools.microsoft import is_msvc, unix_path
 import os
 
-required_conan_version = ">=1.33.0"
+required_conan_version = ">=1.57.0"
 
 class LiquidDspConan(ConanFile):
     name = "liquid-dsp"
-    description = (
-        "Digital signal processing library for software-defined radios (and more)"
-    )
-    topics = ("dsp", "sdr", "liquid-dsp")
+    description = "Digital signal processing library for software-defined radios (and more)"
+    topics = ("dsp", "sdr")
+    package_type = "library"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/jgaeddert/liquid-dsp"
-    license = ("MIT",)
-    settings = "os", "arch", "build_type", "compiler"
-    exports_sources = ["generate_link_library.bat"]
+    license = "MIT"
+    settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
         "simdoverride": [True, False],
+        "with_fftw": [True, False],
     }
     default_options = {
         "shared": False,
-        "simdoverride": False,
+        "simdoverride": True,
+        "with_fftw": False,
     }
 
-    _autotools = None
+    def layout(self):
+        basic_layout(self, src_folder="src")
 
     @property
-    def _source_subfolder(self):
-        return "source_subfolder"
-
-    @property
-    def _libname(self):
-        if self.settings.os == "Windows":
-            return "libliquid"
-        return "liquid"
-
-    @property
-    def _target_name(self):
-        if self.settings.os == "Macos":
-            if not self.options.shared:
-                return "libliquid.ar"
-            return "libliquid.dylib"
-        if not self.options.shared:
-            return "libliquid.a"
-        return "libliquid.so"
-
-    @property
-    def _lib_pattern(self):
-        if self.settings.os == "Macos" and not self.options.shared:
-            return "libliquid.a"
-        if self.settings.os != "Windows":
-            return self._target_name
-        return "libliquid.lib"
+    def _settings_build(self):
+        return getattr(self, "settings_build", self.settings)
 
     def configure(self):
-        del self.settings.compiler.cppstd
-        del self.settings.compiler.libcxx
+        self.settings.rm_safe("compiler.libcxx")
+        self.settings.rm_safe("compiler.cppstd")
 
-    @property
-    def _settings_build(self):
-        return getattr(self, "settings_build", self.settings)
+    def requirements(self):
+        if self.options.with_fftw:
+            self.requires("fftw/[~3.3]")
 
     def build_requirements(self):
-        if self._settings_build.os == "Windows" and not tools.get_env("CONAN_BASH_PATH"):
-            self.build_requires("msys2/cci.latest")
-        if self.settings.compiler == "Visual Studio":
-            self.build_requires("mingw-w64/8.1")
-            self.build_requires("automake/1.16.4")
+        self.tool_requires("libtool/2.4.7")
+        if self._settings_build.os == "Windows":
+            self.win_bash = True
+            if not self.conf.get("tools.microsoft.bash:path", check_type=str):
+                self.tool_requires("msys2/cci.latest")
+        if is_msvc(self):
+            self.tool_requires("automake/1.16.5")
 
     def export_sources(self):
-        for patch in self.conan_data.get("patches", {}).get(self.version, []):
-            self.copy(patch["patch_file"])
+        export_conandata_patches(self)
 
     def validate(self):
-        if hasattr(self, "settings_build") and tools.cross_building(self):
+        if hasattr(self, "settings_build") and cross_building(self):
             raise ConanInvalidConfiguration("Cross building is not yet supported. Contributions are welcome")
 
     def source(self):
-        tools.get(
-            **self.conan_data["sources"][self.version],
-            destination=self._source_subfolder,
-            strip_root=True,
-        )
-
-    def _patch_sources(self):
-        if self.settings.os == "Windows":
-            for patch in self.conan_data["patches"][self.version]:
-                tools.patch(**patch)
-
-    def _gen_link_library(self):
-        if self.settings.compiler != "Visual Studio" or (not self.options.shared):
-            return
-        self.run("cmd /c generate_link_library.bat")
-        with tools.chdir(self._source_subfolder):
-            self.run(
-                "{} /def:libliquid.def /out:libliquid.lib /machine:{}".format(
-                    os.getenv("AR"), "X86" if self.settings.arch == "x86" else "X64"
-                ),
-                win_bash=tools.os_info.is_windows,
-            )
-
-    def _rename_libraries(self):
-        with tools.chdir(self._source_subfolder):
-            if self.settings.os == "Windows" and self.options.shared:
-                tools.rename("libliquid.so", "libliquid.dll")
-            elif self.settings.os == "Windows" and not self.options.shared:
-                tools.rename("libliquid.a", "libliquid.lib")
-            elif self.settings.os == "Macos" and not self.options.shared:
-                tools.rename("libliquid.ar", "libliquid.a")
-
-    @contextmanager
-    def _build_context(self):
-        if self.settings.compiler == "Visual Studio":
-            env = {
-                "CC": "gcc",
-                "CXX": "g++",
-                "LD": "ld",
-                "AR": "ar",
-            }
-            with tools.environment_append(env):
-                yield
-        else:
-            yield
-
-    @contextmanager
-    def _msvc_context(self):
-        if self.settings.compiler == "Visual Studio":
-            with tools.vcvars(self.settings):
-                env = {
-                    "CC": "cl -nologo",
-                    "CXX": "cl -nologo",
-                    "AR": "lib",
-                    "LD": "link",
-                }
-                with tools.environment_append(env):
-                    yield
-        else:
-            yield
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
-    def build(self):
-        self._patch_sources()
-        ncpus = tools.cpu_count()
-        configure_args = []
-        cflags = ["-static-libgcc"]
-        if self.settings.build_type == "Debug":
-            configure_args.append("--enable-debug-messages")
-            cflags.extend(["-g", "-O0"])
-        else:
-            cflags.extend(["-s", "-O2", "-DNDEBUG"])
+    def generate(self):
+        env = VirtualBuildEnv(self)
+        env.generate()
+
+        tc = AutotoolsToolchain(self)
+        configure_args = {}
+
+        # configure script does not support shared or static library flags
+        for arg in ["--enable-shared", "--disable-static", "--disable-shared", "--enable-static"]:
+            configure_args[arg] = None
+
+        if not self.options.with_fftw:
+            configure_args["--enable-fftoverride"] = ''
         if self.options.simdoverride:
-            configure_args.append("--enable-simdoverride")
-        if self.settings.compiler == "Visual Studio":
-            configure_args.append("CFLAGS='{}'".format(" ".join(cflags)))
-        configure_args_str = " ".join(configure_args)
-        with self._build_context():
-            with tools.chdir(self._source_subfolder):
-                self.run("./bootstrap.sh", win_bash=tools.os_info.is_windows)
-                self.run(
-                    "./configure {}".format(configure_args_str),
-                    win_bash=tools.os_info.is_windows,
-                )
-                self.run(
-                    "make {} -j{}".format(self._target_name, ncpus),
-                    win_bash=tools.os_info.is_windows,
-                )
-        self._rename_libraries()
-        with self._msvc_context():
-            self._gen_link_library()
+            configure_args["--enable-simdoverride"] = ''
+        tc.update_configure_args(configure_args)
+
+        env = tc.environment()
+        if is_msvc(self):
+            compile_wrapper = unix_path(self, self.conf.get("user.automake:compile-wrapper", check_type=str))
+            ar_wrapper = unix_path(self, self.conf.get("user.automake:lib-wrapper", check_type=str))
+            env.define("CC", f"{compile_wrapper} cl -nologo")
+            env.define("CXX", f"{compile_wrapper} cl -nologo")
+            env.define("LD", "link -nologo")
+            env.define("AR", f"{ar_wrapper} \"lib -nologo\"")
+            env.define("NM", "dumpbin -symbols")
+            env.define("OBJDUMP", ":")
+            env.define("RANLIB", ":")
+            env.define("STRIP", ":")
+            env.vars(self).save_script("conanbuild_msvc")
+        tc.generate()
+
+        deps = AutotoolsDeps(self)
+        deps.generate()
+
+    def build(self):
+        apply_conandata_patches(self)
+
+        with chdir(self, self.source_folder):
+            autotools = Autotools(self)
+            autotools.autoreconf()
+            autotools.configure()
+            autotools.make()
 
     def package(self):
-        self.copy(pattern="LICENSE", src=self._source_subfolder, dst="licenses")
-        self.copy(
-            pattern="liquid.h",
-            dst=os.path.join("include", "liquid"),
-            src=os.path.join(self._source_subfolder, "include"),
-        )
-        self.copy(pattern="libliquid.dll", dst="bin", src=self._source_subfolder)
-        self.copy(pattern=self._lib_pattern, dst="lib", src=self._source_subfolder)
+        copy(self, pattern="LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
+        with chdir(self, self.source_folder):
+            autotools = Autotools(self)
+            autotools.install()
+
+        rm(self, "*.a" if self.options.shared else "*.[so|dylib]*", os.path.join(self.package_folder, "lib"))
 
     def package_info(self):
-        self.cpp_info.libs = [self._libname]
+        self.cpp_info.libs = ["liquid"]
         if self.settings.os == "Linux":
             self.cpp_info.system_libs.append("m")

recipes/liquid-dsp/all/test_package/CMakeLists.txt

@@ -1,8 +1,7 @@
-cmake_minimum_required(VERSION 3.0)
-project(test_package)
+cmake_minimum_required(VERSION 3.15)
+project(test_package C)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
+find_package(liquid-dsp REQUIRED CONFIG)
 
-add_executable(${CMAKE_PROJECT_NAME} test_package.cpp)
-target_link_libraries(${CMAKE_PROJECT_NAME} ${CONAN_LIBS})
+add_executable(${CMAKE_PROJECT_NAME} test_package.c)
+target_link_libraries(${CMAKE_PROJECT_NAME} liquid-dsp::liquid-dsp)

recipes/liquid-dsp/all/test_package/conanfile.py

@@ -1,17 +1,26 @@
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake, cmake_layout
 import os
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake"
+    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
 
     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)
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
+            self.run(bin_path, env="conanrun")

recipes/liquid-dsp/all/test_package/test_package.cpp → recipes/liquid-dsp/all/test_package/test_package.c

@@ -1,9 +1,9 @@
 #include "liquid/liquid.h"
 
-#include <iostream>
+#include <stdio.h>
 
 int main(int argc, char **argv)
 {
-  std::cout << liquid_libversion();
+  puts(liquid_libversion());
   return 0;
 }