Browse Source

Moved MacOS dmg to dedicated folder

Contributes to CURA-9365
j.spijker@ultimaker.com 2 years ago
parent
commit
dc8c9bb276
3 changed files with 3 additions and 3 deletions
  1. 2 2
      conanfile.py
  2. 0 0
      packaging/dmg/cura.entitlements
  3. 1 1
      packaging/dmg/dmg_sign_noterize.py

+ 2 - 2
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])

+ 0 - 0
packaging/signing/cura.entitlements → packaging/dmg/cura.entitlements


+ 1 - 1
packaging/dmg_sign_noterize.py → 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"