diff options
| author | jspijker <j.spijker@ultimaker.com> | 2022-07-19 10:53:45 +0300 |
|---|---|---|
| committer | jspijker <j.spijker@ultimaker.com> | 2022-07-19 10:53:45 +0300 |
| commit | a8c2a24f14025b2bbc5dd9a93aad084b27eeb9cb (patch) | |
| tree | 21982e27604e72738261a6e54e6c64c071c214ad | |
| parent | a4065f29d53d2864f1eff7165725abbcd1057559 (diff) | |
| parent | 1c3a46c9e2c49ffeb6e4f5759cd1405e7d29221a (diff) | |
Merge branch '5.1'
| -rw-r--r-- | conanfile.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/conanfile.py b/conanfile.py index b7164ecf56..52d9ac01f0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -138,7 +138,8 @@ class CuraConan(ConanFile): cura_digital_factory_url = self._digital_factory_url)) def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): - pyinstaller_metadata = self._um_data(self.version, self.channel)["pyinstaller"] + channel = "" if not self.channel else self.channel + pyinstaller_metadata = self._um_data(self.version, channel)["pyinstaller"] datas = [(str(self._base_dir.joinpath("conan_install_info.json")), ".")] for data in pyinstaller_metadata["datas"].values(): if "package" in data: # get the paths from conan package @@ -224,7 +225,8 @@ class CuraConan(ConanFile): raise ConanInvalidConfiguration("Only versions 5+ are support") def requirements(self): - for req in self._um_data(self.version, self.channel)["requirements"]: + channel = "" if not self.channel else self.channel + for req in self._um_data(self.version, channel)["requirements"]: self.requires(req) def layout(self): @@ -241,10 +243,11 @@ class CuraConan(ConanFile): vr.generate() if self.options.devtools: + channel = "" if not self.channel else self.channel entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements")) self._generate_pyinstaller_spec(location = self.generators_folder, - entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data(self.version, self.channel)["runinfo"]["entrypoint"])).replace("\\", "\\\\"), - icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data(self.version, self.channel)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), + entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data(self.version, channel)["runinfo"]["entrypoint"])).replace("\\", "\\\\"), + icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data(self.version, channel)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") def imports(self): @@ -340,9 +343,10 @@ echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV self._generate_cura_version(Path(self._site_packages, "cura")) entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "dmg", "cura.entitlements")) + channel = "" if not self.channel else self.channel self._generate_pyinstaller_spec(location = self._base_dir, - entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data(self.version, self.channel)["runinfo"]["entrypoint"])).replace("\\", "\\\\"), - icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data(self.version, self.channel)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), + entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data(self.version, channel)["runinfo"]["entrypoint"])).replace("\\", "\\\\"), + icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data(self.version, channel)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") def package(self): |