diff --git a/conanfile.py b/conanfile.py index 790ceb6757..2449437b92 100644 --- a/conanfile.py +++ b/conanfile.py @@ -225,7 +225,7 @@ class CuraConan(ConanFile): self._generate_pyinstaller_spec(self.generators_folder, Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]), - Path(self.source_folder, "packaging", "signing", "cura.entitlements" if self.settings.os == "Macos" else None)) + Path(self.source_folder, "packaging", "dmg", "cura.entitlements" if self.settings.os == "Macos" else None)) def imports(self): self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) @@ -300,7 +300,7 @@ class CuraConan(ConanFile): self._generate_pyinstaller_spec(self._base_dir, Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"]), Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)]), - Path(self.source_folder, "packaging", "signing", "cura.entitlements" if self.settings.os == "Macos" else None)) + Path(self.source_folder, "packaging", "dmg", "cura.entitlements" if self.settings.os == "Macos" else None)) def package(self): self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0]) diff --git a/packaging/signing/cura.entitlements b/packaging/dmg/cura.entitlements similarity index 100% rename from packaging/signing/cura.entitlements rename to packaging/dmg/cura.entitlements diff --git a/packaging/dmg_sign_noterize.py b/packaging/dmg/dmg_sign_noterize.py similarity index 97% rename from packaging/dmg_sign_noterize.py rename to packaging/dmg/dmg_sign_noterize.py index 46a3e1374a..803991594d 100644 --- a/packaging/dmg_sign_noterize.py +++ b/packaging/dmg/dmg_sign_noterize.py @@ -2,7 +2,7 @@ import os import subprocess import shutil -SOURCE_DIR = os.environ.get("SOURCE_DIR", ".") +SOURCE_DIR = os.environ.get("SOURCE_DIR", "..") DIST_DIR = os.environ.get("DIST_DIR", os.path.join(SOURCE_DIR, "dist")) DMG_PATH = "Ultimaker-Cura.dmg" APP_PATH = "Ultimaker-Cura.app"