3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use BUNDLE app for Macos

Browse source 
Contributes to CURA-9365

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
This commit is contained in:
j.spijker@ultimaker.com 2022-07-01 08:05:32 +02:00 • committed by Jelle Spijker
parent 627bd929c4
commit 5d057db298
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ultimaker-Cura.spec.jinja
View file

@ -46,9 +46,9 @@ exe = EXE(
target_arch={{ target_arch }}, target_arch={{ target_arch }},
codesign_identity=os.getenv('CODESIGN_IDENTITY', None), codesign_identity=os.getenv('CODESIGN_IDENTITY', None),
entitlements_file={{ entitlements_file }}, entitlements_file={{ entitlements_file }},
bundle_identifier={{ osx_bundle_identifier }},
icon={{ icon }} icon={{ icon }}
) )
coll = COLLECT( coll = COLLECT(
exe, exe,
a.binaries, a.binaries,
@ -59,3 +59,10 @@ coll = COLLECT(
upx_exclude=[], upx_exclude=[],
name=r'{{ name }}' name=r'{{ name }}'
) )
{% if macos == 'True' %}app = BUNDLE(
coll,
name='{{ name }}.app',
icon='{{ icon }}',
bundle_identifier='{{ osx_bundle_identifier }}'
){% endif %}

3
conanfile.py
View file

@ -192,7 +192,8 @@ class CuraConan(ConanFile):
osx_bundle_identifier = "'nl.ultimaker.cura.dmg'" if self.settings.os == "Macos" else "None", osx_bundle_identifier = "'nl.ultimaker.cura.dmg'" if self.settings.os == "Macos" else "None",
upx = str(self.settings.os == "Windows"), upx = str(self.settings.os == "Windows"),
strip = str(self.settings.os != "Windows"), strip = str(self.settings.os != "Windows"),
target_arch = "x86_64" if self.settings.os == "Macos" else "None" # FIXME: Make this dependent on the settings.arch_target target_arch = "x86_64" if self.settings.os == "Macos" else "None", # FIXME: Make this dependent on the settings.arch_target
macos = "'{}'".format(str(self.settings.os == "Macos"))
)) ))
def source(self): def source(self):