|
|
@@ -31,7 +31,7 @@ class CuraConan(ConanFile):
|
|
|
|
|
|
# FIXME: Remove specific branch once merged to main
|
|
|
# Extending the conanfile with the UMBaseConanfile https://github.com/Ultimaker/conan-ultimaker-index/tree/CURA-9177_Fix_CI_CD/recipes/umbase
|
|
|
- python_requires = "umbase/0.1.2@ultimaker/testing"
|
|
|
+ python_requires = "umbase/0.1.4@ultimaker/testing"
|
|
|
python_requires_extend = "umbase.UMBaseConanfile"
|
|
|
|
|
|
options = {
|
|
|
@@ -138,7 +138,7 @@ 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)["pyinstaller"]
|
|
|
+ pyinstaller_metadata = self._um_data(self.version, self.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 +224,7 @@ class CuraConan(ConanFile):
|
|
|
raise ConanInvalidConfiguration("Only versions 5+ are support")
|
|
|
|
|
|
def requirements(self):
|
|
|
- for req in self._um_data(self.version)["requirements"]:
|
|
|
+ for req in self._um_data(self.version, self.channel)["requirements"]:
|
|
|
self.requires(req)
|
|
|
|
|
|
def layout(self):
|
|
|
@@ -243,8 +243,8 @@ class CuraConan(ConanFile):
|
|
|
if self.options.devtools:
|
|
|
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)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
|
|
|
- icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
|
|
|
+ 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("\\", "\\\\"),
|
|
|
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
|
|
|
|
|
|
def imports(self):
|
|
|
@@ -341,8 +341,8 @@ echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV
|
|
|
|
|
|
entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "dmg", "cura.entitlements"))
|
|
|
self._generate_pyinstaller_spec(location = self._base_dir,
|
|
|
- entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
|
|
|
- icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
|
|
|
+ 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("\\", "\\\\"),
|
|
|
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
|
|
|
|
|
|
def package(self):
|
j.spijker@ultimaker.com