From 7e4f63f99e6de923f16255c71ee89b8ad2e5a65f Mon Sep 17 00:00:00 2001 From: Edgar Date: Fri, 21 Oct 2022 11:41:46 +0200 Subject: [PATCH] :wrench: Added support for building cg-toolkit with conan v2 --- cg-toolkit/all/conanfile.py | 17 +++++++++-------- run_linter.bat | 3 +++ 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 run_linter.bat diff --git a/cg-toolkit/all/conanfile.py b/cg-toolkit/all/conanfile.py index af01bac..0448240 100644 --- a/cg-toolkit/all/conanfile.py +++ b/cg-toolkit/all/conanfile.py @@ -1,6 +1,6 @@ -from conans import ConanFile, tools -from conans.tools import os_info - +from conan import ConanFile +from conan.tools.files import get, collect_libs +from conans.client.tools.oss import OSInfo class GcConan(ConanFile): name = "cg-toolkit" @@ -9,23 +9,24 @@ class GcConan(ConanFile): settings = "os", "arch" def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True) + get(self, **self.conan_data["sources"][self.version], strip_root=True) def package(self): self.copy("*.h", src="include", dst="include") + os_info = OSInfo() if os_info.is_linux: - if self.settings.arch.__contains__('64'): + if '64' in self.settings.arch: self.copy("*.so", src="lib64", dst="lib", keep_path=False) else: self.copy("*.so", src="lib", dst="lib", keep_path=False) else: - if self.settings.arch.__contains__('64'): + if '64' in self.settings.arch: self.copy("*.lib", src="lib64", dst="lib", keep_path=False) self.copy("*.dll", src="bin64", dst="bin", keep_path=False) else: self.copy("*.lib", src="lib", dst="lib", keep_path=False) self.copy("*.dll", src="bin", dst="bin", keep_path=False) - def package_info(self): + def package_info(self): self.cpp_info.name = "Cg" - self.cpp_info.libs = tools.collect_libs(self) + self.cpp_info.libs = collect_libs(self) diff --git a/run_linter.bat b/run_linter.bat new file mode 100644 index 0000000..7fdc815 --- /dev/null +++ b/run_linter.bat @@ -0,0 +1,3 @@ +@echo off +set PYTHONPATH=%~dp0 +pylint --rcfile=linter/pylintrc_recipe %* \ No newline at end of file