3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Only run gettext in a bash environment

Browse source 
Once the msys2 (m4, autoconf, automake) are fixed
we can use the msys2 recipe.

For now people can use their own bash environment
on Windows by setting the tools.microsoft.bash:path
and tools.microsoft.bash:subsystem when needed.
This commit is contained in:
Jelle Spijker 2022-10-23 15:25:16 +02:00
parent c45f371582
commit e400f04319
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
conanfile.py
View file

@ -276,9 +276,8 @@ class CuraConan(ConanFile):
self.requires(req)
def build_requirements(self):
if self.settings_build.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", default=False, check_type=bool):
self.tool_requires("msys2/cci.latest")
self.tool_requires("gettext/0.21")
if self.settings_build.os != "Windows" or self.conf.get("tools.microsoft.bash:path", default=False, check_type=bool):
self.tool_requires("gettext/0.21")
def layout(self):
self.folders.source = "."
@ -290,7 +289,7 @@ class CuraConan(ConanFile):
self.cpp.package.resdirs = ["resources", "plugins", "packaging", "pip_requirements"] # pip_requirements should be the last item in the list
def build(self):
if self.settings.os == "Windows":
if self.settings_build.os == "Windows" and not self.conf.get("tools.microsoft.bash:path", default=False, check_type=bool):
return
# FIXME: once m4, autoconf, automake are Conan V2 ready self.win_bash = True # We need gettext, which requires the bash environment
@ -318,6 +317,7 @@ class CuraConan(ConanFile):
icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data()["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
def imports(self):
self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False)
self.copy("CuraEngine", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False)