@@ -25,7 +25,7 @@ class CuraConan(ConanFile):
25
25
exports = "LICENSE*" , "*.jinja"
26
26
settings = "os" , "compiler" , "build_type" , "arch"
27
27
generators = "VirtualPythonEnv"
28
- tool_requires = "gettext/0.21 "
28
+ tool_requires = "gettext/0.22.5 "
29
29
30
30
# FIXME: Remove specific branch once merged to main
31
31
python_requires = "translationextractor/[>=2.2.0]@ultimaker/cura_11622"
@@ -348,9 +348,7 @@ def generate(self):
348
348
vb = VirtualBuildEnv (self )
349
349
vb .generate ()
350
350
351
- # # FIXME: once m4, autoconf, automake are Conan V2 ready use self.win_bash and add gettext as base tool_requirement
352
- cpp_info = self .dependencies ["gettext" ].cpp_info
353
- pot = self .python_requires ["translationextractor" ].module .ExtractTranslations (self , cpp_info .bindirs [0 ])
351
+ pot = self .python_requires ["translationextractor" ].module .ExtractTranslations (self )
354
352
pot .generate ()
355
353
356
354
def build (self ):
@@ -362,8 +360,7 @@ def build(self):
362
360
mo_file = Path (self .build_folder , po_file .with_suffix ('.mo' ).relative_to (self .source_folder ))
363
361
mo_file = mo_file .parent .joinpath ("LC_MESSAGES" , mo_file .name )
364
362
mkdir (self , str (unix_path (self , Path (mo_file ).parent )))
365
- cpp_info = self .dependencies ["gettext" ].cpp_info
366
- self .run (f"{ cpp_info .bindirs [0 ]} /msgfmt { po_file } -o { mo_file } -f" , env = "conanbuild" , ignore_errors = True )
363
+ self .run (f"msgfmt { po_file } -o { mo_file } -f" , env = "conanbuild" )
367
364
368
365
def deploy (self ):
369
366
''' Note: this deploy step is actually used to prepare for building a Cura distribution with pyinstaller, which is not
0 commit comments