3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Moved MacOS dmg to dedicated folder

Browse source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-01 05:39:22 +02:00 • committed by Jelle Spijker
parent 9801402638
commit dc8c9bb276
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
conanfile.py
View file

@ -225,7 +225,7 @@ class CuraConan(ConanFile):
self._generate_pyinstaller_spec(self.generators_folder, self._generate_pyinstaller_spec(self.generators_folder,
Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"]), 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", 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): def imports(self):
self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) 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, 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.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.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): def package(self):
self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0]) self.copy("cura_app.py", src = ".", dst = self.cpp.package.bindirs[0])

0
packaging/signing/cura.entitlements → packaging/dmg/cura.entitlements
View file

2
packaging/dmg_sign_noterize.py → packaging/dmg/dmg_sign_noterize.py
View file

@ -2,7 +2,7 @@ import os
import subprocess import subprocess
import shutil 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")) DIST_DIR = os.environ.get("DIST_DIR", os.path.join(SOURCE_DIR, "dist"))
DMG_PATH = "Ultimaker-Cura.dmg" DMG_PATH = "Ultimaker-Cura.dmg"
APP_PATH = "Ultimaker-Cura.app" APP_PATH = "Ultimaker-Cura.app"