[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,10 +1,9 @@
|
||||
sources:
|
||||
"1.0.8":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/bzip2"
|
||||
branch: bzip2-1.0.8
|
||||
url: "https://nexus.avroid.tech/repository/all-raw-proxy-sourceware_org/pub/bzip2/bzip2-1.0.8.tar.gz"
|
||||
sha256: "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"
|
||||
"1.0.6":
|
||||
url: "ssh://git@git.avroid.tech.:2222/Mirrors/bzip2"
|
||||
branch: bzip2-1.0.6
|
||||
url: "https://nexus.avroid.tech/repository/all-raw-proxy-sourceware_org/pub/bzip2/bzip2-1.0.6.tar.gz"
|
||||
sha256: "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"
|
||||
patches:
|
||||
"1.0.6":
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from conan import ConanFile
|
||||
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
|
||||
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, save
|
||||
from conan.tools.scm import Version, Git
|
||||
from conan.tools.scm import Version
|
||||
import os
|
||||
import textwrap
|
||||
|
||||
@@ -47,11 +47,7 @@ class Bzip2Conan(ConanFile):
|
||||
cmake_layout(self, src_folder="src")
|
||||
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user