(#14212) QArchive: Add version 2.2.2 and modernize

* Add version 2.2.1

* Simplify test package so it doesn't require Qt code

* Modernize recipe and test packages

* Bump qt version

* Fix copy-paste error

* Fix patches

* Use tool_rquires instead of build_requires

Co-authored-by: Uilian Ries <[email protected]>

* Replace 2.2.1 with 2.2.2

* Replace 2.2.2 with 2.2.3

* Improve qt6 support

* Use modern approach to query dependencies info

Co-authored-by: Uilian Ries <[email protected]>

Co-authored-by: Uilian Ries <[email protected]>

Author: ericriff

recipes/qarchive/all/CMakeLists.txt

@@ -1,4 +1,7 @@
 sources:
+  "2.2.3":
+    url: "https://github.com/antony-jr/QArchive/archive/v2.2.3.tar.gz"
+    sha256: "2ada10efda34fe96c25744dd67e74ec68587d30ab01cc20be25cbcfb1e6262c4"
   "2.1.1":
     url: "https://github.com/antony-jr/QArchive/archive/v2.1.1.tar.gz"
     sha256: "4ed51121a5bc9b5981d2fa3927f951a6a91ccca233d6b6dc4fef55b4ca5a2d92"
@@ -11,16 +14,10 @@ sources:
 patches:
   "2.1.1":
     - patch_file: "patches/0001-cmake-conan-compatibility.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/0002-export-symbols.patch"
-      base_path: "source_subfolder"
   "2.0.2":
     - patch_file: "patches/0001-cmake-conan-compatibility.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/0002-export-symbols.patch"
-      base_path: "source_subfolder"
   "2.0.1":
     - patch_file: "patches/0001-cmake-conan-compatibility.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/0002-export-symbols.patch"
-      base_path: "source_subfolder"

recipes/qarchive/all/conandata.yml

@@ -1,7 +1,7 @@
 from conan import ConanFile
 from conan.tools.files import get, apply_conandata_patches, rmdir, save, export_conandata_patches
-from conans import CMake
-import functools
+from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout, CMakeDeps
+from conan.tools.scm import Version
 import os
 import textwrap
 
@@ -29,14 +29,11 @@ class QarchiveConan(ConanFile):
         "fPIC": True,
     }
 
-    generators = "cmake", "cmake_find_package"
-
     @property
-    def _source_subfolder(self):
-        return "source_subfolder"
+    def _qt_major(self):
+        return Version(self.dependencies["qt"].ref.version).major
 
     def export_sources(self):
-        self.copy("CMakeLists.txt")
         export_conandata_patches(self)
 
     def config_options(self):
@@ -49,29 +46,35 @@ def configure(self):
 
     def requirements(self):
         self.requires("libarchive/3.6.1")
-        self.requires("qt/5.15.6")
+        self.requires("qt/5.15.7")
 
     def build_requirements(self):
-        self.build_requires("cmake/3.24.2")
+        self.tool_requires("cmake/3.24.2")
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version],
-                  destination=self._source_subfolder, strip_root=True)
+                  destination=self.source_folder, strip_root=True)
 
-    @functools.lru_cache(1)
-    def _configure_cmake(self):
-        cmake = CMake(self)
-        cmake.configure()
-        return cmake
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.variables["QARCHIVE_QT_VERSION_MAJOR"] = self._qt_major
+        tc.generate()
+
+        cd = CMakeDeps(self)
+        cd.generate()
 
     def build(self):
         apply_conandata_patches(self)
-        cmake = self._configure_cmake()
+        cmake = CMake(self)
+        cmake.configure()
         cmake.build()
 
     def package(self):
-        self.copy("LICENSE", src=self._source_subfolder, dst="licenses")
-        cmake = self._configure_cmake()
+        self.copy("LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
+        cmake = CMake(self)
         cmake.install()
         rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
         rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))

recipes/qarchive/all/conanfile.py

@@ -1,9 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(test_package CXX)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
 find_package(QArchive REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)

recipes/qarchive/all/test_package/CMakeLists.txt

@@ -1,17 +1,26 @@
-from conans import ConanFile, CMake, tools
 import os
-
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake
+from conan.tools.layout import cmake_layout
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "cmake", "cmake_find_package_multi"
+    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def layout(self):
+        cmake_layout(self)
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self):
-            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/qarchive/all/test_package/conanfile.py

@@ -1,17 +1,8 @@
-#include <QCoreApplication>
 #include <QArchive>
 
 int main(int argc, char **argv)
 {
-    using QArchive::DiskExtractor;
-    QCoreApplication app(argc, argv);
-    DiskExtractor Extractor("Test.7z");
-
-    /* Connect Signals and Slots. */
-    QObject::connect(&Extractor ,
-                     &DiskExtractor::finished ,
-                     &app ,
-                     &QCoreApplication::quit);
+    QArchive::DiskExtractor Extractor("Test.7z");
 
     Extractor.start();
     Extractor.cancel();

recipes/qarchive/all/test_package/test_package.cpp

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.1)
+project(test_package CXX)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
+find_package(QArchive REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
+target_link_libraries(${PROJECT_NAME} QArchive)
+# Must compile with "-fPIC" since Qt was built with -reduce-relocations.
+target_compile_options(${PROJECT_NAME} PRIVATE -fPIC)
+set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11)

recipes/qarchive/all/test_v1_package/CMakeLists.txt

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

recipes/qarchive/all/test_v1_package/conanfile.py

@@ -1,4 +1,6 @@
 versions:
+  "2.2.3":
+    folder: all
   "2.1.1":
     folder: all
   "2.0.2":