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

29385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
j.spijker@ultimaker.com
cbedbbb0bd Remove brackets around env var name 
Contributes to CURA-9365
 2022-07-01 11:33:18 +02:00
j.spijker@ultimaker.com
2fd1309bee Add missing file name 
Contributes to CURA-9365
 2022-07-01 10:50:08 +02:00
j.spijker@ultimaker.com
f2fa309df7 Copy the Cura Installer workflow 
And use the nsis step

Contributes to CURA-9365
 2022-07-01 10:32:12 +02:00
j.spijker@ultimaker.com
085868d692 Copy the packaging scripts/resources and set GH env 
Contributes to CURA-9365
 2022-07-01 10:32:12 +02:00
j.delarago
4ed16881ac Update environment variables 
CURA-8849
 2022-07-01 10:04:38 +02:00
c.lamboo
cf9033498b Fix icon nad bundle identifier in spec file 
icon and bundle_identifier already contain quotes

CURA-9365
 2022-07-01 10:00:38 +02:00
c.lamboo
0580814352 Fix passing macos flag to jinja 
CURA-9365
 2022-07-01 09:56:40 +02:00
Jelle Spijker
61d276f5ee Use ultimaker/testing on main/master branches 
Contributes to CURA-9365
 2022-07-01 09:38:08 +02:00
j.spijker@ultimaker.com
ffd66445d8 Collect all of numpy-stl 
Contributes to CURA-9365
 2022-07-01 09:25:22 +02:00
j.spijker@ultimaker.com
ac2fbbf791 Collect all PyQt6-Qt6 dll's for Win and place them in the root 
Quick fix, we should probably work with hooks in the future

Contributes to CURA-9365
 2022-07-01 09:24:57 +02:00
j.spijker@ultimaker.com
b5e0ae8ff9 fixes for Macos 
Contributes to CURA-9365
 2022-07-01 09:07:38 +02:00
Ghostkeeper
9839393912
Update SDK version to 8.1.0 
There are new functionalities and QML elements for developers to play with.
 2022-07-01 09:04:49 +02:00
Jelle Spijker
ff321409c5 Revert "Clean the install folder first" 
This reverts commit 627bd929c4cce3bac7c4c4a7cdb93e0198752563.
 2022-07-01 08:56:06 +02:00
j.spijker@ultimaker.com
b6676e7bb9 Run workflow when files in packaging changes 
Contributes to CURA-9365
 2022-07-01 08:23:08 +02:00
j.spijker@ultimaker.com
5b771e39d7 Install start menu shortcuts globally 
Use "SetShellVarContext all" so that NSIS installs windows start menu shortcuts globally.
Docs: https://nsis.sourceforge.io/Docs/Chapter4.html#setshellvarcontext

Fixes #12449
Closes Ultimaker/cura-build-environment#147

Contributes to CURA-9365

Co-authored-by: KeenRivals <6865789+KeenRivals@users.noreply.github.com>
 2022-07-01 08:19:27 +02:00
j.spijker@ultimaker.com
5d057db298 Use BUNDLE app for Macos 
Contributes to CURA-9365

Co-authored-by: casperlamboo <c.lamboo@ultimaker.com>
 2022-07-01 08:05:32 +02:00
j.spijker@ultimaker.com
627bd929c4 Clean the install folder first 
Handy for debugging

Contributes to CURA-9365
 2022-07-01 07:46:57 +02:00
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