Do not use os.rename in recipes, as it is unreliable on windows

This commit is contained in:
Dmitry Vedenko 2022-01-28 14:55:13 +03:00
parent 0db5a93813
commit 36f6950ccb
No known key found for this signature in database
GPG Key ID: 48E633545A67E387
12 changed files with 29 additions and 28 deletions

View File

@ -12,7 +12,7 @@ insert_final_newline = true
[Makefile]
indent_style = tab
[*.yml, *.yaml]
[*.{yml,yaml}]
indent_style = space
indent_size = 2
@ -26,6 +26,5 @@ trim_trailing_whitespace = false
end_of_line = lf
[*.patch]
trim_trailing_whitespace = false
insert_final_newline = false

4
.gitignore vendored
View File

@ -1 +1,3 @@
build/
build/
.venv
.idea

View File

@ -33,7 +33,7 @@ class ExpatConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = self.name + "-" + self.version
os.rename(extracted_dir, self._source_subfolder)
tools.rename(extracted_dir, self._source_subfolder)
def _configure_cmake(self):
if self._cmake:
@ -59,11 +59,11 @@ class ExpatConan(ConanFile):
def _build_cmake(self):
cmake = self._configure_cmake()
cmake.build()
def _install_cmake(self):
cmake = self._configure_cmake()
cmake.install()
def _configure_autotools(self):
if self._autotools:
return self._autotools
@ -77,7 +77,7 @@ class ExpatConan(ConanFile):
self._autotools.configure(args=args, configure_dir=self._source_subfolder)
return self._autotools
def _build_autotools(self):
autotools = self._configure_autotools()
autotools.make()
@ -93,15 +93,15 @@ class ExpatConan(ConanFile):
if self.settings.os == "Windows":
self._build_cmake()
else:
self._build_autotools()
self._build_autotools()
def package(self):
self.copy(pattern="COPYING", dst="licenses", src=self._source_subfolder)
if self.settings.os == "Windows":
self._install_cmake()
else:
self._install_autotools()
self._install_autotools()
tools.rmdir(os.path.join(self.package_folder, "lib", "pkgconfig"))
tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))

View File

@ -12,6 +12,6 @@ class TestPackageConan(ConanFile):
cmake.build()
def test(self):
if not tools.cross_building(self.settings):
if not tools.cross_building(self):
bin_path = os.path.join("bin", "test_package")
self.run(bin_path, run_environment=True)

View File

@ -44,7 +44,7 @@ class LibId3TagConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = self.name + "-" + self.version
os.rename(extracted_dir, self._source_subfolder)
tools.rename(extracted_dir, self._source_subfolder)
def _configure_cmake(self):
@ -69,7 +69,7 @@ class LibId3TagConan(ConanFile):
self.copy("COPYRIGHT", dst="licenses", src=self._source_subfolder)
self.copy("COPYING", dst="licenses", src=self._source_subfolder)
self.copy("CREDITS", dst="licenses", src=self._source_subfolder)
cmake = self._configure_cmake()
cmake.install()

View File

@ -13,18 +13,18 @@ class LibmadConan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
generators = ["cmake", "cmake_find_package"]
options = {
"shared": [True, False],
"fPIC": [True, False],
"opt_accuracy": [True, False],
"opt_speed": [True, False],
"shared": [True, False],
"fPIC": [True, False],
"opt_accuracy": [True, False],
"opt_speed": [True, False],
"opt_sso": [True, False]
}
default_options = {
"shared": False,
"fPIC": True,
"opt_accuracy": True,
"opt_speed": False,
"shared": False,
"fPIC": True,
"opt_accuracy": True,
"opt_speed": False,
"opt_sso": False
}
@ -48,7 +48,7 @@ class LibmadConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = self.name + "-" + self.version
os.rename(extracted_dir, self._source_subfolder)
tools.rename(extracted_dir, self._source_subfolder)
def _configure_cmake(self):
if self._cmake:

View File

@ -35,7 +35,7 @@ class LibMP3LameConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = "lame-" + self.version
os.rename(extracted_dir, self._source_subfolder)
tools.rename(extracted_dir, self._source_subfolder)
def _apply_patch(self):
tools.replace_in_file(os.path.join(self._source_subfolder, 'include', 'libmp3lame.sym'), 'lame_init_old\n', '')

View File

@ -73,7 +73,7 @@ class ConanRecipe(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
os.rename("portaudio-19.7.0", self.sources_folder)
tools.rename("portaudio-19.7.0", self.sources_folder)
if "patches" in self.conan_data:
for p in self.conan_data["patches"][self.version]:

View File

@ -1,4 +1,4 @@
sources:
"r234":
url: "https://sourceforge.net/projects/portmedia/files/portmedia-code-r234.zip"
url: "https://artifactory.audacityteam.org/artifactory/mirror/portmedia-code-r234.zip"
sha256: "d737d3f10a70ad6a79fd8a6556015bacf8e8223d4ef8b79a621ec6ac1e44f1bc"

View File

@ -40,7 +40,7 @@ class PortMidiConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = os.path.join("portmedia-code-" + self.version, "portmidi", "trunk")
os.rename(extracted_dir, self._source_subfolder)
tools.rename(extracted_dir, self._source_subfolder)
tools.patch(patch_file="patches/build-system.patch", base_path=self._source_subfolder)
tools.patch(patch_file="patches/portmidi.h.patch", base_path=self._source_subfolder)

View File

@ -40,7 +40,7 @@ class WavPackConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = "wavpack-" + self.version
os.rename(extracted_dir, self._source_subfolder)
tools.rename(extracted_dir, self._source_subfolder)
def _configure_cmake(self):
if self._cmake:

View File

@ -165,7 +165,7 @@ class wxWidgetsConan(ConanFile):
def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = self.conan_data["folders"][self.version]
os.rename(extracted_dir, self._source_subfolder)
tools.rename(extracted_dir, self._source_subfolder)
def add_libraries_from_pc(self, library):
pkg_config = tools.PkgConfig(library)