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

Format file

Browse Source 
CURA-1364
This commit is contained in:
c.lamboo 2023-11-30 13:16:25 +01:00
parent b9f8ef9bc2
commit 1e190ebcb9
1 changed files with 121 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
conanfile.py
View File

@ -30,7 +30,8 @@ class CuraConan(ConanFile):
options = { options = {
"enterprise": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string "enterprise": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string
"staging": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string "staging": ["True", "False", "true", "false"], # Workaround for GH Action passing boolean as lowercase string
"devtools": [True, False], # FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools "devtools": [True, False],
# FIXME: Split this up in testing and (development / build (pyinstaller) / system installer) tools
"cloud_api_version": "ANY", "cloud_api_version": "ANY",
"display_name": "ANY", # TODO: should this be an option?? "display_name": "ANY", # TODO: should this be an option??
"cura_debug_mode": [True, False], # FIXME: Use profiles "cura_debug_mode": [True, False], # FIXME: Use profiles
@ -278,7 +279,8 @@ class CuraConan(ConanFile):
entitlements_file=entitlements_file, entitlements_file=entitlements_file,
osx_bundle_identifier="'nl.ultimaker.cura'" if self.settings.os == "Macos" else "None", osx_bundle_identifier="'nl.ultimaker.cura'" if self.settings.os == "Macos" else "None",
upx=str(self.settings.os == "Windows"), upx=str(self.settings.os == "Windows"),
strip = False, # This should be possible on Linux and MacOS but, it can also cause issues on some distributions. Safest is to disable it for now strip=False,
# This should be possible on Linux and MacOS but, it can also cause issues on some distributions. Safest is to disable it for now
target_arch=self._pyinstaller_spec_arch, target_arch=self._pyinstaller_spec_arch,
macos=self.settings.os == "Macos", macos=self.settings.os == "Macos",
version=f"'{version}'", version=f"'{version}'",
@ -286,12 +288,17 @@ class CuraConan(ConanFile):
)) ))
def export_sources(self): def export_sources(self):
copy(self, "*", os.path.join(self.recipe_folder, "plugins"), os.path.join(self.export_sources_folder, "plugins")) copy(self, "*", os.path.join(self.recipe_folder, "plugins"),
copy(self, "*", os.path.join(self.recipe_folder, "resources"), os.path.join(self.export_sources_folder, "resources"), excludes = "*.mo") os.path.join(self.export_sources_folder, "plugins"))
copy(self, "*", os.path.join(self.recipe_folder, "resources"),
os.path.join(self.export_sources_folder, "resources"), excludes="*.mo")
copy(self, "*", os.path.join(self.recipe_folder, "tests"), os.path.join(self.export_sources_folder, "tests")) copy(self, "*", os.path.join(self.recipe_folder, "tests"), os.path.join(self.export_sources_folder, "tests"))
copy(self, "*", os.path.join(self.recipe_folder, "cura"), os.path.join(self.export_sources_folder, "cura"), excludes="CuraVersion.py") copy(self, "*", os.path.join(self.recipe_folder, "cura"), os.path.join(self.export_sources_folder, "cura"),
copy(self, "*", os.path.join(self.recipe_folder, "packaging"), os.path.join(self.export_sources_folder, "packaging")) excludes="CuraVersion.py")
copy(self, "*", os.path.join(self.recipe_folder, ".run_templates"), os.path.join(self.export_sources_folder, ".run_templates")) copy(self, "*", os.path.join(self.recipe_folder, "packaging"),
os.path.join(self.export_sources_folder, "packaging"))
copy(self, "*", os.path.join(self.recipe_folder, ".run_templates"),
os.path.join(self.export_sources_folder, ".run_templates"))
copy(self, "requirements.txt", self.recipe_folder, self.export_sources_folder) copy(self, "requirements.txt", self.recipe_folder, self.export_sources_folder)
copy(self, "requirements-dev.txt", self.recipe_folder, self.export_sources_folder) copy(self, "requirements-dev.txt", self.recipe_folder, self.export_sources_folder)
copy(self, "requirements-ultimaker.txt", self.recipe_folder, self.export_sources_folder) copy(self, "requirements-ultimaker.txt", self.recipe_folder, self.export_sources_folder)
@ -349,7 +356,8 @@ class CuraConan(ConanFile):
self.cpp.package.libdirs = [os.path.join("site-packages", "cura")] self.cpp.package.libdirs = [os.path.join("site-packages", "cura")]
self.cpp.package.bindirs = ["bin"] self.cpp.package.bindirs = ["bin"]
self.cpp.package.resdirs = ["resources", "plugins", "packaging", "pip_requirements"] # pip_requirements should be the last item in the list self.cpp.package.resdirs = ["resources", "plugins", "packaging",
"pip_requirements"] # pip_requirements should be the last item in the list
def generate(self): def generate(self):
copy(self, "cura_app.py", self.source_folder, str(self._script_dir)) copy(self, "cura_app.py", self.source_folder, str(self._script_dir))
@ -371,9 +379,11 @@ class CuraConan(ConanFile):
# Copy the external plugins that we want to bundle with Cura # Copy the external plugins that we want to bundle with Cura
rmdir(self, str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow"))) rmdir(self, str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")))
curaengine_plugin_gradual_flow = self.dependencies["curaengine_plugin_gradual_flow"].cpp_info curaengine_plugin_gradual_flow = self.dependencies["curaengine_plugin_gradual_flow"].cpp_info
copy(self, "*", curaengine_plugin_gradual_flow.resdirs[0], str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")), keep_path = True) copy(self, "*", curaengine_plugin_gradual_flow.resdirs[0],
str(self.source_path.joinpath("plugins", "CuraEngineGradualFlow")), keep_path=True)
copy(self, "*", curaengine_plugin_gradual_flow.bindirs[0], self.source_folder, keep_path=False) copy(self, "*", curaengine_plugin_gradual_flow.bindirs[0], self.source_folder, keep_path=False)
copy(self, "bundled_*.json", curaengine_plugin_gradual_flow.resdirs[1], str(self.source_path.joinpath("resources", "bundled_packages")), keep_path = False) copy(self, "bundled_*.json", curaengine_plugin_gradual_flow.resdirs[1],
str(self.source_path.joinpath("resources", "bundled_packages")), keep_path=False)
# Copy resources of cura_binary_data # Copy resources of cura_binary_data
cura_binary_data = self.dependencies["cura_binary_data"].cpp_info cura_binary_data = self.dependencies["cura_binary_data"].cpp_info
@ -401,7 +411,8 @@ class CuraConan(ConanFile):
copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura"))) copy(self, "*", cura_private_data.resdirs[0], str(self._share_dir.joinpath("cura")))
if self.options.devtools: if self.options.devtools:
entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements")) entitlements_file = "'{}'".format(
os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements"))
self._generate_pyinstaller_spec( self._generate_pyinstaller_spec(
location=self.generators_folder, location=self.generators_folder,
entrypoint_location="'{}'".format( entrypoint_location="'{}'".format(
@ -430,16 +441,22 @@ 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
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 deploy(self): def deploy(self):
copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]), os.path.join(self.install_folder, "packaging"), keep_path = True) copy(self, "*", os.path.join(self.package_folder, self.cpp.package.resdirs[2]),
os.path.join(self.install_folder, "packaging"), keep_path=True)
# Copy resources of Cura (keep folder structure) needed by pyinstaller to determine the module structure # Copy resources of Cura (keep folder structure) needed by pyinstaller to determine the module structure
copy(self, "*", os.path.join(self.package_folder, self.cpp_info.bindirs[0]), str(self._base_dir), keep_path = False) copy(self, "*", os.path.join(self.package_folder, self.cpp_info.bindirs[0]), str(self._base_dir),
copy(self, "*", os.path.join(self.package_folder, self.cpp_info.libdirs[0]), str(self._site_packages.joinpath("cura")), keep_path = True) keep_path=False)
copy(self, "*", os.path.join(self.package_folder, self.cpp_info.resdirs[0]), str(self._share_dir.joinpath("cura", "resources")), keep_path = True) copy(self, "*", os.path.join(self.package_folder, self.cpp_info.libdirs[0]),
copy(self, "*", os.path.join(self.package_folder, self.cpp_info.resdirs[1]), str(self._share_dir.joinpath("cura", "plugins")), keep_path = True) str(self._site_packages.joinpath("cura")), keep_path=True)
copy(self, "*", os.path.join(self.package_folder, self.cpp_info.resdirs[0]),
str(self._share_dir.joinpath("cura", "resources")), keep_path=True)
copy(self, "*", os.path.join(self.package_folder, self.cpp_info.resdirs[1]),
str(self._share_dir.joinpath("cura", "plugins")), keep_path=True)
# Copy resources of Uranium (keep folder structure) # Copy resources of Uranium (keep folder structure)
uranium = self.dependencies["uranium"].cpp_info uranium = self.dependencies["uranium"].cpp_info
@ -451,43 +468,60 @@ class CuraConan(ConanFile):
version = self.conf.get("user.cura:version", default=self.version, check_type=str) version = self.conf.get("user.cura:version", default=self.version, check_type=str)
cura_version = Version(version) cura_version = Version(version)
env_prefix = "Env:" if self.settings.os == "Windows" else "" env_prefix = "Env:" if self.settings.os == "Windows" else ""
activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV activate_github_actions_version_env = (Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV
echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV
echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV
echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV
echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV
echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV""")
""").render(cura_version_major = cura_version.major, .render(
cura_version_major=cura_version.major,
cura_version_minor=cura_version.minor, cura_version_minor=cura_version.minor,
cura_version_patch=cura_version.patch, cura_version_patch=cura_version.patch,
cura_version_build=cura_version.build if cura_version.build != "" else "0", cura_version_build=cura_version.build if cura_version.build != "" else "0",
cura_version_full=self.version, cura_version_full=self.version,
cura_app_name=self._app_name, cura_app_name=self._app_name,
env_prefix = env_prefix) env_prefix=env_prefix,
)
)
ext = ".sh" if self.settings.os != "Windows" else ".ps1" ext = ".sh" if self.settings.os != "Windows" else ".ps1"
save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"),
activate_github_actions_version_env)
self._generate_cura_version(os.path.join(self._site_packages, "cura")) self._generate_cura_version(os.path.join(self._site_packages, "cura"))
entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements"))
self._generate_pyinstaller_spec(location=self._base_dir, self._generate_pyinstaller_spec(location=self._base_dir,
entrypoint_location = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.bindirs[0], self.conan_data["pyinstaller"]["runinfo"]["entrypoint"])).replace("\\", "\\\\"), entrypoint_location="'{}'".format(
icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), os.path.join(self.package_folder, self.cpp_info.bindirs[0],
self.conan_data["pyinstaller"]["runinfo"][
"entrypoint"])).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")
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,
copy(self, "*", src = os.path.join(self.source_folder, "cura"), dst = os.path.join(self.package_folder, self.cpp.package.libdirs[0])) dst=os.path.join(self.package_folder, self.cpp.package.bindirs[0]))
copy(self, "*", src = os.path.join(self.source_folder, "resources"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[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, "resources"),
dst=os.path.join(self.package_folder, self.cpp.package.resdirs[0]))
copy(self, "*.mo", os.path.join(self.build_folder, "resources"), os.path.join(self.package_folder, "resources")) copy(self, "*.mo", os.path.join(self.build_folder, "resources"), os.path.join(self.package_folder, "resources"))
copy(self, "*", src = os.path.join(self.source_folder, "plugins"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[1])) copy(self, "*", src=os.path.join(self.source_folder, "plugins"),
copy(self, "requirement*.txt", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.resdirs[-1])) dst=os.path.join(self.package_folder, self.cpp.package.resdirs[1]))
copy(self, "*", src = os.path.join(self.source_folder, "packaging"), dst = os.path.join(self.package_folder, self.cpp.package.resdirs[2])) copy(self, "requirement*.txt", src=self.source_folder,
dst=os.path.join(self.package_folder, self.cpp.package.resdirs[-1]))
copy(self, "*", src=os.path.join(self.source_folder, "packaging"),
dst=os.path.join(self.package_folder, self.cpp.package.resdirs[2]))
# Remove the CuraEngineGradualFlow plugin from the package # Remove the CuraEngineGradualFlow plugin from the package
rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[1], "CuraEngineGradualFlow")) rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[1], "CuraEngineGradualFlow"))
rm(self, "bundled_*.json", os.path.join(self.package_folder, self.cpp.package.resdirs[0], "bundled_packages"), recursive = False) rm(self, "bundled_*.json", os.path.join(self.package_folder, self.cpp.package.resdirs[0], "bundled_packages"),
recursive=False)
# Remove the fdm_materials from the package # Remove the fdm_materials from the package
rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], "materials")) rmdir(self, os.path.join(self.package_folder, self.cpp.package.resdirs[0], "materials"))