GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Review comments fixed

Browse Source 
CURA-10770
This commit is contained in:
saumya.jain 2023-08-02 09:24:42 +02:00
parent e686baaf92
commit 1442031e28
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
conanfile.py
View File

@ -139,7 +139,7 @@ class CuraConan(ConanFile):
return "None" return "None"
def _generate_about_versions(self, location): def _generate_about_versions(self, location):
with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: with open(os.path.join(self.source_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f:
cura_version_py = Template(f.read()) cura_version_py = Template(f.read())
conan_installs = [] conan_installs = []
@ -150,14 +150,17 @@ class CuraConan(ConanFile):
conan_installs.append([dependency.ref.name,dependency.ref.version]) conan_installs.append([dependency.ref.name,dependency.ref.version])
#list of python installs #list of python installs
python_ins_cmd = f""" python -c "import pkg_resources; import os; [open(os.path.join("'"{self.recipe_folder}"'", "'"info.txt"'"), "'"a"'").write(s.key+"'","'"+ s.version+"'";"'") for s in pkg_resources.working_set]" """ outer = '"' if self.settings.os == "Windows" else "'"
self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=True) inner = "'" if self.settings.os == "Windows" else '"'
with open(os.path.join(self.recipe_folder, "info.txt"), "r") as f: python_ins_cmd = f"python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}"
packages = f.read() from six import StringIO
package = packages.split(";") buffer = StringIO()
for pack in package: self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=buffer)
python_installs.append(pack.split(","))
os.remove(os.path.join(self.recipe_folder, "info.txt")) packages = str(buffer.getvalue()).split("-----------------\n")
package = packages[1].strip('\r\n').split(";")
for pack in package:
python_installs.append(pack.split(","))
with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f: with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f:
f.write(cura_version_py.render( f.write(cura_version_py.render(
@ -354,7 +357,7 @@ class CuraConan(ConanFile):
pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0]) pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0])
pot.generate() pot.generate()
self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) self._generate_about_versions(os.path.join(self.source_folder, "resources","qml", "Dialogs"))
def build(self): def build(self):
if self.options.devtools: if self.options.devtools:
@ -365,7 +368,6 @@ class CuraConan(ConanFile):
mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name)
mkdir(self, str(unix_path(self, Path(mo_file).parent))) mkdir(self, str(unix_path(self, Path(mo_file).parent)))
cpp_info = self.dependencies["gettext"].cpp_info cpp_info = self.dependencies["gettext"].cpp_info
print("we are here /n")
self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True)
def imports(self): def imports(self):
@ -471,6 +473,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
self._generate_about_versions(os.path.join(self.source_folder, "resources", "qml", "Dialogs"))
def package(self): def package(self):
copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0]))
copy(self, "*", src = os.path.join(self.source_folder, "cura"), dst = os.path.join(self.package_folder, self.cpp.package.libdirs[0])) copy(self, "*", src = os.path.join(self.source_folder, "cura"), dst = os.path.join(self.package_folder, self.cpp.package.libdirs[0]))