diff -r af7671a9945a -r 03df7946c2fa ProjectController.py --- a/ProjectController.py Mon Nov 18 22:42:11 2024 +0100 +++ b/ProjectController.py Tue Nov 19 23:52:04 2024 +0100 @@ -46,7 +46,7 @@ import features import connectors -import util.paths as paths +import util.paths as pathutils from util.misc import CheckPathPerm, GetClassImporter from util.MiniTextControler import MiniTextControler from util.ProcessLogger import ProcessLogger @@ -65,7 +65,6 @@ from ConfigTreeNode import ConfigTreeNode, XSDSchemaErrorMessage from POULibrary import UserAddressedException -base_folder = paths.AbsParentDir(__file__) MATIEC_ERROR_MODEL = re.compile( r".*\.st:(\d+)-(\d+)\.\.(\d+)-(\d+): (?:error)|(?:warning) : (.*)$") @@ -116,7 +115,7 @@ def findCmd(self): cmd = "iec2c" + (".exe" if os.name == 'nt' else "") paths = [ - os.path.join(base_folder, "matiec") + pathutils.ThirdPartyPath("matiec") ] path = self.findObject( paths, lambda p: os.path.isfile(os.path.join(p, cmd))) @@ -129,7 +128,7 @@ def findLibPath(self): paths = [ - os.path.join(base_folder, "matiec", "lib"), + pathutils.ThirdPartyPath("matiec", "lib"), "/usr/lib/matiec" ] path = self.findObject(