From 0210b06fbb8179c38cd597e54566b72ad9dcafde Mon Sep 17 00:00:00 2001 From: jellespijker Date: Wed, 30 Aug 2023 10:51:53 +0200 Subject: [PATCH] Pyinstaller package directories from the instal directory Contributes to CURA-10951 --- conandata.yml | 4 ++++ conanfile.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index efbb7f8349..28179cecd9 100644 --- a/conandata.yml +++ b/conandata.yml @@ -19,6 +19,10 @@ pyinstaller: package: "cura" src: "plugins" dst: "share/cura/plugins" + curaengine_gradual_flow_plugin: + root: "." + src: "share/cura/plugins/CuraEngineGradualFlow" + dst: "share/cura/plugins/CuraEngineGradualFlow" cura_resources: package: "cura" src: "resources" diff --git a/conanfile.py b/conanfile.py index b61a8e0251..d459cdabb6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -210,8 +210,8 @@ class CuraConan(ConanFile): src_path = os.path.join(self.source_folder, data["src"]) else: src_path = os.path.join(self.deps_cpp_info[data["package"]].rootpath, data["src"]) - elif "root" in data: # get the paths relative from the sourcefolder - src_path = os.path.join(self.source_folder, data["root"], data["src"]) + elif "root" in data: # get the paths relative from the install folder + src_path = os.path.join(self.install_folder, data["root"], data["src"]) else: continue if Path(src_path).exists():