From 2272d99e71afd4bf6af810da925cfe24cc913eb2 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 14 May 2025 14:10:52 +0200 Subject: [PATCH] Removed Autopackager Contribute to NP-952 --- .github/workflows/conan-package.yml | 1 + .github/workflows/unit-test.yml | 2 ++ conanfile.py | 12 ++++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 816f2ef..520ef58 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -16,6 +16,7 @@ on: - master - 'CURA-*' - 'PP-*' + - 'NP-*' - '[0-9].[0-9]*' - '[0-9].[0-9][0-9]*' tags: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 30fdb83..5f8300c 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -17,6 +17,8 @@ on: - main - master - 'CURA-*' + - 'PP-*' + - 'NP-*' - '[0-9].[0-9]*' - '[0-9].[0-9][0-9]*' tags: diff --git a/conanfile.py b/conanfile.py index 308b35b..e38a255 100644 --- a/conanfile.py +++ b/conanfile.py @@ -4,7 +4,7 @@ from conan.errors import ConanInvalidConfiguration from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout from conan.tools.env import VirtualBuildEnv -from conan.tools.files import AutoPackager, copy, update_conandata +from conan.tools.files import copy, update_conandata from conan.tools.build import check_min_cppstd from conan.tools.microsoft import check_min_vs, is_msvc, is_msvc_static_runtime from conan.tools.scm import Version, Git @@ -115,6 +115,10 @@ def build(self): cmake.build() def package(self): - copy(self, pattern="LICENSE*", dst="licenses", src=self.source_folder) - packager = AutoPackager(self) - packager.run() + copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses")) + copy(self, pattern="*.h", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include")) + copy(self, pattern="*.a", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False) + copy(self, pattern="*.so", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False) + copy(self, pattern="*.lib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False) + copy(self, pattern="*.dll", src=self.build_folder, dst=os.path.join(self.package_folder, "bin"), keep_path=False) + copy(self, pattern="*.dylib", src=self.build_folder, dst=os.path.join(self.package_folder, "lib"), keep_path=False)