[DO-1345] fixed windows packages (!16)
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/16 Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team> Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
This commit is contained in:
committed by
Aleksandr Vodyanov
parent
3759e1163f
commit
a82e89a1bc
@@ -1,22 +1,22 @@
|
||||
sources:
|
||||
"3.3.0":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/double-conversion"
|
||||
branch: "v3.3.0"
|
||||
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/double-conversion/archive/refs/tags/v3.3.0.tar.gz"
|
||||
sha256: "04ec44461850abbf33824da84978043b22554896b552c5fd11a9c5ae4b4d296e"
|
||||
"3.2.1":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/double-conversion"
|
||||
branch: "v3.2.1"
|
||||
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/double-conversion/archive/v3.2.1.tar.gz"
|
||||
sha256: "e40d236343cad807e83d192265f139481c51fc83a1c49e406ac6ce0a0ba7cd35"
|
||||
"3.2.0":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/double-conversion"
|
||||
branch: "v3.2.0"
|
||||
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/double-conversion/archive/v3.2.0.tar.gz"
|
||||
sha256: "3dbcdf186ad092a8b71228a5962009b5c96abde9a315257a3452eb988414ea3b"
|
||||
"3.1.7":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/double-conversion"
|
||||
branch: "v3.1.7"
|
||||
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/double-conversion/archive/v3.1.7.tar.gz"
|
||||
sha256: "a0204d6ab48223f2c8f53a932014e7f245125e7a5267764b1fbeebe4fa0ee8b9"
|
||||
"3.1.6":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/double-conversion"
|
||||
branch: "v3.1.6"
|
||||
url: https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/double-conversion/archive/v3.1.6.tar.gz
|
||||
sha256: 8a79e87d02ce1333c9d6c5e47f452596442a343d8c3e9b234e8a62fce1b1d49c
|
||||
"3.1.5":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/double-conversion"
|
||||
branch: "v3.1.5"
|
||||
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/double-conversion/archive/v3.1.5.tar.gz"
|
||||
sha256: "a63ecb93182134ba4293fd5f22d6e08ca417caafa244afaa751cbfddf6415b13"
|
||||
"3.1.4":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/double-conversion"
|
||||
branch: "v3.1.4"
|
||||
url: "https://nexus.avroid.tech/repository/devops-raw-proxy-github/google/double-conversion/archive/v3.1.4.tar.gz"
|
||||
sha256: "95004b65e43fefc6100f337a25da27bb99b9ef8d4071a36a33b5e83eb1f82021"
|
||||
|
||||
@@ -2,7 +2,6 @@ from conan import ConanFile
|
||||
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
|
||||
from conan.tools.files import copy, get, rmdir, rm
|
||||
from conan.tools.microsoft import check_min_vs
|
||||
from conan.tools.scm import Git
|
||||
import os
|
||||
|
||||
required_conan_version = ">=1.54.0"
|
||||
@@ -42,11 +41,7 @@ class DoubleConversionConan(ConanFile):
|
||||
check_min_vs(self, "190")
|
||||
|
||||
def source(self):
|
||||
#get(self, **self.conan_data["sources"][self.version], strip_root=True)
|
||||
git = Git(self)
|
||||
sources = self.conan_data["sources"][self.version]
|
||||
clone_args = ['--depth', '1', '--branch', sources["branch"]]
|
||||
git.clone(url=sources["url"], target=self.source_folder, args=clone_args)
|
||||
get(self, **self.conan_data["sources"][self.version], strip_root=True)
|
||||
|
||||
def generate(self):
|
||||
tc = CMakeToolchain(self)
|
||||
|
||||
@@ -21,6 +21,6 @@ class TestPackageConan(ConanFile):
|
||||
cmake.build()
|
||||
|
||||
def test(self):
|
||||
if can_run(self):
|
||||
if can_run(self) and (self.settings.compiler != "gcc" or self.settings.os != "Windows"):
|
||||
bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
|
||||
self.run(bin_path, env="conanrun")
|
||||
|
||||
Reference in New Issue
Block a user