Move icons to icons folder

Update dmg building script

CURA-9365

9 files changed, 53 insertions, 42 deletions

diff --git a/packaging/Cura.ico b/packaging/Cura.ico
deleted file mode 100644
index b1d34e54d0..0000000000
--- a/packaging/Cura.ico
+++ /dev/null
diff --git a/packaging/cura.icns b/packaging/cura.icns
deleted file mode 100644
index 8e8e09b389..0000000000
--- a/packaging/cura.icns
+++ /dev/null
diff --git a/packaging/dmg_sign_noterize.py b/packaging/dmg_sign_noterize.py
index 66e49c728d..46a3e1374a 100644
--- a/packaging/dmg_sign_noterize.py
+++ b/packaging/dmg_sign_noterize.py
@@ -1,13 +1,11 @@
 import os
 import subprocess
+import shutil
 
 SOURCE_DIR = os.environ.get("SOURCE_DIR", ".")
 DIST_DIR = os.environ.get("DIST_DIR", os.path.join(SOURCE_DIR, "dist"))
-
-INSTALLER_FILENAME = "Ultimaker-Cura.dmg"
-DMG_PATH = INSTALLER_FILENAME
-ULTIMAKER_CURA_APP_PATH = os.path.join("dist/Ultimaker-Cura.app")
-
+DMG_PATH = "Ultimaker-Cura.dmg"
+APP_PATH = "Ultimaker-Cura.app"
 ULTIMAKER_CURA_DOMAIN = os.environ.get("ULTIMAKER_CURA_DOMAIN", "nl.ultimaker.cura")
 
 
@@ -15,58 +13,59 @@ def build_dmg() -> None:
     create_dmg_executable = os.environ.get("CREATE_DMG_EXECUTABLE", "create-dmg")
 
     arguments = [create_dmg_executable,
-                    "--window-pos", "640",  "360",
-                    "--window-size", "690",  "503",
-                    "--app-drop-link", "520",  "272",
-                    "--volicon", f"{SOURCE_DIR}/packaging/VolumeIcons_Cura.icns",
-                    "--icon-size", "90",
-                    "--icon", "Ultimaker-Cura.app", "169", "272",
-                    "--eula", f"{SOURCE_DIR}/packaging/cura_license.txt",
-                    "--background", f"{SOURCE_DIR}/packaging/cura_background_dmg.png",
-                    DMG_PATH,
-                    DIST_DIR]
+                 "--window-pos", "640", "360",
+                 "--window-size", "690", "503",
+                 "--app-drop-link", "520", "272",
+                 "--volicon", f"{SOURCE_DIR}/packaging/icons/VolumeIcons_Cura.icns",
+                 "--icon-size", "90",
+                 "--icon", "Ultimaker-Cura.app", "169", "272",
+                 "--eula", f"{SOURCE_DIR}/packaging/cura_license.txt",
+                 "--background", f"{SOURCE_DIR}/packaging/icons/cura_background_dmg.png",
+                 DMG_PATH,
+                 APP_PATH]
 
     subprocess.run(arguments)
 
 
-def sign() -> None:
-    codesign_executable = os.environ.get("CODESIGN", "/usr/bin/codesign")
-    codesign_identity = os.environ.get("CODESIGN_IDENTITY", "test")
-    
-    sign_command = f""" 
-                    {codesign_executable}
-                    -s {codesign_identity}
-                    --timestamp 
-                    -i {ULTIMAKER_CURA_DOMAIN}.dmg
-                    {DMG_PATH}
-                   """
+def sign(file_path: str) -> None:
+    codesign_executable = os.environ.get("CODESIGN", "codesign")
+    codesign_identity = os.environ.get("CODESIGN_IDENTITY", "A831301292FC30F84F3C137F2141401620EE5FA0")
 
-    subprocess.Popen(sign_command)
+    arguments = [codesign_executable,
+                 "-s", codesign_identity,
+                 "--timestamp",
+                 "-i", f"{ULTIMAKER_CURA_DOMAIN}.dmg",
+                 file_path]
+
+    subprocess.run(arguments)
 
 
 def notarize() -> None:
-    
     notarize_user = os.environ.get("NOTARIZE_USER")
     notarize_password = os.environ.get("NOTARIZE_PASSWORD")
-    altool_executable = os.environ.get("ALTOOL_EXECUTABLE", "/Applications/Xcode.app/Contents/Developer/usr/bin/altool")
-    
-    notarize_command = f"""
-                        xcrun {altool_executable}
-                        --notarize-app
-                        --primary-bundle-id {ULTIMAKER_CURA_DOMAIN}
-                        --username {notarize_user}
-                        --password {notarize_password}
-                        --file {DMG_PATH}
-                        """
-    
-    subprocess.Popen(notarize_command)
+    altool_executable = os.environ.get("ALTOOL_EXECUTABLE", "altool")
+
+    arguments = [
+        "xcrun", altool_executable,
+        "--notarize-app",
+        "--primary-bundle-id", ULTIMAKER_CURA_DOMAIN,
+        "--username", notarize_user,
+        "--password", notarize_password,
+        "--file", DMG_PATH
+    ]
+
+    subprocess.run(arguments)
 
 
 if __name__ == "__main__":
+    try:
+        os.rename(os.path.join(DIST_DIR, "Ultimaker-Cura"), os.path.join(DIST_DIR, "Ultimaker-Cura.app"))
+    except:
+        pass
+    sign(APP_PATH)
     build_dmg()
-    sign()
+    sign(DMG_PATH)
 
     # notarize_dmg = bool(os.environ.get("NOTARIZE_DMG", "TRUE"))
     # if notarize_dmg:
     #     notarize()
-    
diff --git a/packaging/VolumeIcons_Cura.icns b/packaging/icons/VolumeIcons_Cura.icns
index 6ea4526293..6ea4526293 100644
--- a/packaging/VolumeIcons_Cura.icns
+++ b/packaging/icons/VolumeIcons_Cura.icns
diff --git a/packaging/cura-icon_128x128.png b/packaging/icons/cura-icon_128x128.png
index 7f70fe330e..7f70fe330e 100644
--- a/packaging/cura-icon_128x128.png
+++ b/packaging/icons/cura-icon_128x128.png
diff --git a/packaging/cura-icon_256x256.png b/packaging/icons/cura-icon_256x256.png
index a9ddbd94c4..a9ddbd94c4 100644
--- a/packaging/cura-icon_256x256.png
+++ b/packaging/icons/cura-icon_256x256.png
diff --git a/packaging/cura-icon_64x64.png b/packaging/icons/cura-icon_64x64.png
index 5bfbf782ce..5bfbf782ce 100644
--- a/packaging/cura-icon_64x64.png
+++ b/packaging/icons/cura-icon_64x64.png
diff --git a/packaging/cura_background_dmg.png b/packaging/icons/cura_background_dmg.png
index e838608293..e838608293 100644
--- a/packaging/cura_background_dmg.png
+++ b/packaging/icons/cura_background_dmg.png
diff --git a/packaging/signing/cura.entitlements b/packaging/signing/cura.entitlements
new file mode 100644
index 0000000000..3b95f077c9
--- /dev/null
+++ b/packaging/signing/cura.entitlements
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
+	<true/>
+	<key>com.apple.security.cs.disable-executable-page-protection</key>
+	<true/>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
+</dict>
+</plist>