Skip to content

Commit

Permalink
remove useless silent option
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceIm committed Nov 12, 2022
1 parent de3b1df commit faf561b
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions recipes/icu/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class ICUConan(ConanFile):
"shared": [True, False],
"fPIC": [True, False],
"data_packaging": ["files", "archive", "library", "static"],
"silent": [True, False],
"with_dyload": [True, False],
"dat_package_file": [None, "ANY"],
"with_icuio": [True, False],
Expand All @@ -39,7 +38,6 @@ class ICUConan(ConanFile):
"shared": False,
"fPIC": True,
"data_packaging": "archive",
"silent": True,
"with_dyload": True,
"dat_package_file": None,
"with_icuio": True,
Expand Down Expand Up @@ -74,9 +72,8 @@ def layout(self):
basic_layout(self, src_folder="src")

def package_id(self):
del self.info.options.silent # Verbosity doesn't affect package's ID
if self.info.options.dat_package_file:
dat_package_file_sha256 = sha256sum(str(self.info.options.dat_package_file))
if self.options.dat_package_file:
dat_package_file_sha256 = sha256sum(str(self.options.dat_package_file))
self.info.options.dat_package_file = dat_package_file_sha256

def build_requirements(self):
Expand Down Expand Up @@ -171,10 +168,6 @@ def _patch_sources(self):
"-install_name @rpath/$(notdir $(MIDDLE_SO_TARGET))",
)

@property
def _silent(self):
return "--silent" if self.options.silent else "VERBOSE=1"

def build(self):
self._patch_sources()

Expand All @@ -190,7 +183,7 @@ def build(self):

autotools = Autotools(self)
autotools.configure(build_script_folder=os.path.join(self.source_folder, "source"))
autotools.make(args=[self._silent])
autotools.make()

@property
def _data_filename(self):
Expand All @@ -208,8 +201,8 @@ def _data_path(self):
def package(self):
copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
autotools = Autotools(self)
# TODO: replace by autotools.install(args=[self._silent]) once https://github.com/conan-io/conan/issues/12153 fixed
autotools.install(args=[self._silent, f"DESTDIR={unix_path(self, self.package_folder)}"])
# TODO: replace by autotools.install() once https://github.com/conan-io/conan/issues/12153 fixed
autotools.install(args=[f"DESTDIR={unix_path(self, self.package_folder)}"])

for dll in glob.glob(os.path.join(self.package_folder, "lib", "*.dll")):
shutil.move(dll, os.path.join(self.package_folder, "bin"))
Expand Down

0 comments on commit faf561b

Please sign in to comment.