GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,521 Commits 295 Branches 268 Tags
Commit Graph

29521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
j.spijker@ultimaker.com
1f629b9e48 Fixes escaped path's on Windows 
Why is it that the Path is converted to single \
for the icon and entry_point but not for the binaries?

Contributes to CURA-9365
 2022-07-01 07:43:11 +02:00
j.spijker@ultimaker.com
e90f75174e Added missing comma 
Contributes to CURA-9365
 2022-07-01 07:27:06 +02:00
j.spijker@ultimaker.com
7bc71070fd Remove quotes around None value 
Contributes to CURA-9365
 2022-07-01 07:25:28 +02:00
j.spijker@ultimaker.com
dec5609459 Set strip to True for Mac and Linux 
Contributes to CURA-9365
 2022-07-01 07:09:31 +02:00
j.spijker@ultimaker.com
f5789433ce Add target architecture for Macos 
We should extend this Arm support in the future

Contributes to CURA-9365
 2022-07-01 07:00:34 +02:00
j.spijker@ultimaker.com
87a521159e Add osx_bundle_identifier 
Contributes to CURA-9365
 2022-07-01 06:52:19 +02:00
j.spijker@ultimaker.com
f3ebf98440 Only use upx on Windows 
Contributes to CURA-9365
 2022-07-01 06:37:34 +02:00
j.spijker@ultimaker.com
3fe0f26e94 explicit cast from Path to str 
Contributes to CURA-9365
 2022-07-01 06:33:50 +02:00
j.spijker@ultimaker.com
2ea78a3ef6 use package resource folder 
Contributes to CURA-9365
 2022-07-01 06:20:26 +02:00
j.spijker@ultimaker.com
721aff4255 Ported nsis scripts and resource from cura-build-environment 
Contributes to CURA-9365
 2022-07-01 06:18:43 +02:00
j.spijker@ultimaker.com
dc8c9bb276 Moved MacOS dmg to dedicated folder 
Contributes to CURA-9365
 2022-07-01 05:39:22 +02:00
j.spijker@ultimaker.com
9801402638 Moved AppImage files to dedicated folder 
Contributes to CURA-9365
 2022-07-01 05:37:08 +02:00
j.spijker@ultimaker.com
e9cbad1164 Allow for pyinstaller to sign the files on MacOS 
Contributes to CURA-9365
 2022-07-01 05:34:52 +02:00
j.spijker@ultimaker.com
055eda2856 Added the pyinstaller-hook-contrib 
Contributes to CURA-9365
 2022-07-01 05:25:25 +02:00
j.spijker@ultimaker.com
cc8f0d3001 Add conan binaries to binaries 
Contributes to CURA-9365
 2022-07-01 05:25:25 +02:00
Jelle Spijker
e570e3bec6
Run when jinja changes 2022-07-01 00:46:08 +02:00
Jelle Spijker
f6ca16a053
parse tuple not string 2022-07-01 00:44:21 +02:00
Jelle Spijker
7dc4266b09
single qoutes 2022-07-01 00:29:15 +02:00
Jelle Spijker
36bcb97dbb
place qoutes around path 2022-07-01 00:09:22 +02:00
j.spijker@ultimaker.com
6047c101ed map binaries to root 
Contributes to CURA-9365
 2022-06-30 23:50:10 +02:00
j.spijker@ultimaker.com
c4aee2a6b6 Fixed Ultimaker-Cura spec 
Contributes to CURA-9365
 2022-06-30 23:26:22 +02:00
j.spijker@ultimaker.com
21e69a8c67 Use bindirs instead of paths 
Contributes to CURA-9365
 2022-06-30 22:55:42 +02:00
j.spijker@ultimaker.com
cf1e2bd7af Add conan_binaries to pyinstaller 
Contributes to CURA-9365
 2022-06-30 17:57:42 +02:00
Ghostkeeper
83bad98ea3
Merge branch 'CURA-9365_fix_building_cura_main' into 5.1 2022-06-30 17:48:38 +02:00
Ghostkeeper
e069946c24
Merge branch 'CURA-9365_fix_building_cura_main' of github.com:Ultimaker/Cura into CURA-9365_fix_building_cura_main 2022-06-30 17:48:19 +02:00
Ghostkeeper
585834970d
Update branches of Conan config files to 5.1 
We'll want to have it test/build those next.

Contributes to issue CURA-9365.
 2022-06-30 17:47:33 +02:00
j.delarago
c08aa5b765 Move icons to icons folder 
Update dmg building script

CURA-9365
 2022-06-30 17:41:38 +02:00
j.spijker@ultimaker.com
77a72fce25 Use correct paths 
Contributes to CURA-9365
 2022-06-30 16:55:56 +02:00
j.spijker@ultimaker.com
b4f3d5cbab Use correct paths 
Contributes to CURA-9365
 2022-06-30 16:40:24 +02:00
Jaime van Kessel
12379b15cd Use correct key for serialized setting to keep 
'recommend cleaning after n prints' instead of 'recommended cleaning after n prints'

CURA-9432
 2022-06-30 16:37:26 +02:00
j.spijker@ultimaker.com
2739057a97 Copy all shared libs 
Contributes to CURA-9365
 2022-06-30 16:36:09 +02:00
Jaime van Kessel
5c0f416536
Merge pull request #12638 from Ultimaker/CURA-9432_add_extra_material_settings 
Add two recently introduced material settings
 2022-06-30 16:31:40 +02:00
j.spijker@ultimaker.com
724f2ab079 Create tcl and tk paths 
Needed by the dist

Contributes to CURA-9365
 2022-06-30 15:37:24 +02:00
j.delarago
afa899cf21 Add dmg building script 😎 
CURA-9365
 2022-06-30 15:08:46 +02:00
j.spijker@ultimaker.com
a2da68d806 Updated mapping of pyinstaller metadata 
Contributes to CURA-9365
 2022-06-30 14:49:07 +02:00
Ghostkeeper
72b1097c9a
Add auxiliary files needed for AppImage 
AppRun is the file that gets packaged inside of the AppImage that bootstraps the application.
The AppImage can only have one icon, so we use the largest sample we have available.
The appdata.xml contains some metadata.

Contributes to issue CURA-9409.
 2022-06-30 14:43:52 +02:00
Ghostkeeper
047d7b1b19
Provision desktop file with Jinja to put in version number 
This way the Desktop file for the AppImage knows the version number, and the appimage itself knows it too.

Contributes to issue CURA-9409.
 2022-06-30 14:43:51 +02:00
Ghostkeeper
c2f3161fb6
Allow providing dist_path and version via command line arguments 
Previously you had to call the script from the dist path specifically, using the cwd as a parameter. Now you can provide a different path, allowing you to call this script from any location.
Also the version number used to be hard-coded. Now that can be provided by the caller.

Contributes to issue CURA-9409.
 2022-06-30 14:43:51 +02:00
c.lamboo
394942e2cf Move resources for mac dmg creation 
CURA-9365
 2022-06-30 14:34:22 +02:00
c.lamboo
5c1b665f25 Move resources for mac dmg creation 
CURA-9365
 2022-06-30 14:17:26 +02:00
Remco Burema
fab86be909 Keep settings throughout reserilization process. 
Save some settings Cura doesn't use, but other consumers of the file might in the metadata during deserilization, so they can be properly re-serialized whenever exported.

part of CURA-9432
 2022-06-30 14:14:11 +02:00
c.lamboo
f2717d1906 Add resources for mac dmg creation 
CURA-9365
 2022-06-30 14:08:37 +02:00
Ghostkeeper
f4b3256e3d
Add resolve value for Raft Base Wall Count 
It's also a global setting and there is no particular reason for this to not be settable by a material profile or anything.

Done as a 5 minute fix.
 2022-06-30 13:25:13 +02:00
j.spijker@ultimaker.com
a62e5ec1ad Use package for cura as well 
Still need to fix the mappings and hidden imports

Contributes to CURA-9365
 2022-06-30 12:11:00 +02:00
j.spijker@ultimaker.com
d07c9d64cc Fixed empty source 
Contributes to CURA-9365
 2022-06-30 11:58:57 +02:00
Ghostkeeper
648c1e95db
Add main function to make it easier to call this 
Contributes to issue CURA-9409.
 2022-06-30 11:48:56 +02:00
Ghostkeeper
f3fd2d6f80
Fix calling subprocesses 
We shouldn't unpack the list. The first argument is allowed to be a list. If we unpack it, it'll override other arguments to the call function that would be the wrong type then (buffer size).

Contributes to issue CURA-9409.
 2022-06-30 11:48:56 +02:00
Ghostkeeper
254edfd3ec
Fix deleting old files if they exist 
Rmdir crashes when it needs to delete just one file, annoyingly.

Contributes to issue CURA-9409.
 2022-06-30 11:48:56 +02:00
Ghostkeeper
970e0d8395
Add script to package and sign AppImages 
This has not been tested yet at all.

Contributes to issue CURA-9409.
 2022-06-30 11:48:55 +02:00
j.spijker@ultimaker.com
d20976d459 Moved pyinstaller, cura_version generate function 
This is used both in source, generate and deploy

Contributes to CURA-9365
 2022-06-30 09:49:22 +02:00