3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
29312 commits 312 branches 275 tags 718 MiB
Commit graph

29312 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
c.lamboo
f2717d1906 Add resources for mac dmg creation 
CURA-9365
 2022-06-30 14:08:37 +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
j.spijker@ultimaker.com
6b51753973 Renamed folder structure to venv structure 
Contributes to CURA-9365
 2022-06-30 09:39:21 +02:00
j.spijker@ultimaker.com
d47635c0f9 Removed requirement install from deploy steps. 
I'm gonna repurpose the VirtualPythonEnv for this

Contributes to CURA-9365
 2022-06-30 09:37:17 +02:00
j.spijker@ultimaker.com
eae13942f3 Add PyQt6 to hidden imports 
Contributes to CURA-9365
 2022-06-29 16:15:55 +02:00
j.spijker@ultimaker.com
a837827bf3 Added extra Uranium cases 
Contributes to CURA-9365
 2022-06-29 15:56:18 +02:00
j.spijker@ultimaker.com
f745ab7fbc Add PyQt6 sip to hidden_imports 
Contributes to CURA-9365
 2022-06-29 15:52:43 +02:00
j.spijker@ultimaker.com
a2413f4a69 Use correct UM qml path 
Contributes to CURA-9365
 2022-06-29 15:51:14 +02:00
j.spijker@ultimaker.com
ed3f342e7f Search unsecure when not frozen 
Also added share/<dep>/resources releative to sys.executable

Contributes to CURA-9365
 2022-06-29 15:48:04 +02:00
j.spijker@ultimaker.com
2cee093d0b Map new conan local cache resources 
Contributes to CURA-9365
 2022-06-29 15:42:24 +02:00
j.spijker@ultimaker.com
1bb1efd429 Store generators in build folder 
Contributes to CURA-9365
 2022-06-29 15:32:24 +02:00
j.spijker@ultimaker.com
ff3a422890 Fixed mapping for pyinstaller from source install 
Some paths in dependencies were moved around due to the new deploy functionality
this should fix it.

Contributes to CURA-9365
 2022-06-29 15:12:51 +02:00
j.spijker@ultimaker.com
5062d704c2 Add deploy functionality 
Contributes to CURA-9365
 2022-06-29 15:12:51 +02:00
Ghostkeeper
8724c8cec9
Merge branch '5.1' into CURA-9365_fix_building_cura_main 2022-06-29 12:06:03 +02:00
j.spijker@ultimaker.com
32ed0619b0 Set the runenv for deploy 
Contributes to CURA-9365
 2022-06-29 04:53:26 +02:00
j.spijker@ultimaker.com
aa43287c26 Only do package-export 
Contributes to CURA-9365
 2022-06-29 03:52:38 +02:00
Ghostkeeper
f241638890
Add resolve function to Remove Raft Inside Corners 
That way, an extruder profile can say that they want this.
If any extruder needs this setting enabled, it will be enabled for the whole print.

Done as a 5 minute fix.
 2022-06-28 17:53:00 +02:00
j.spijker@ultimaker.com
5a61c4ea38 Fix uranium deploy 
Contributes to CURA-9365
 2022-06-28 16:57:54 +02:00
j.spijker@ultimaker.com
cdc8fd759b Don't use CuraVersion.py options to calc package_id 
The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py
which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_`

Contributes to CURA-9365
 2022-06-28 15:08:07 +02:00
j.spijker@ultimaker.com
0cea013e2f Move venv creation to UMBaseConanfile 
Contributes to CURA-9365
 2022-06-28 15:07:01 +02:00
Remco Burema
c4422b87f9
Merge pull request #12599 from Ultimaker/CURA-9414 
Don't show scary error message when saving custom file
 2022-06-28 13:07:21 +02:00
Remco Burema
1872e54842 Message might be good for debugging. 
Maybe at some point someone will ask wjy they don't get a message.

part of CURA-9414
 2022-06-28 13:06:59 +02:00
j.spijker@ultimaker.com
da00707ead Add requirements.txt as user_info 
Something similar should be done for Uranium

Contributes to CURA-9365
 2022-06-28 07:43:00 +02:00
j.spijker@ultimaker.com
705231d56a Copy resources to to correct paths 
Still WIP, but needs to be committed due to not copying sources (1gb saving)

Contributes to CURA-9365
 2022-06-28 07:43:00 +02:00
c.lamboo
8a905fcb7d Merge remote-tracking branch 'origin/CURA-9365_fix_building_cura_main' into CURA-9365_fix_building_cura_main 2022-06-27 15:47:03 +02:00
c.lamboo
a967462038 Add res folder to resource folder 
CURA-9365
 2022-06-27 15:39:48 +02:00
j.spijker@ultimaker.com
62aacc5946 Initial set-up of deploy functionality 
Contributes to CURA-9365
 2022-06-27 13:51:50 +02:00
Casper Lamboo
fd09bcfb9b
Merge pull request #12476 from Ultimaker/CURA-9271 
[CURA-9271] Build plate shrinks when using horizontal scaling shrinkage compensation
 2022-06-27 09:09:37 +02:00
Jelle Spijker
fab8598a05 Add numpy-stl to hidden-imports 
Fixes #10696

Contributes to CURA-9365
 2022-06-26 11:18:53 +02:00
Jelle Spijker
5090626144 Added python-utils and six to requirements 
These are dependencies of numpy-stl

Contributes to CURA-9365
 2022-06-26 11:14:59 +02:00
Jelle Spijker
ed9cdb6b34 Added Numpy-stl to requirements 
Relates to GH issue #10696
TODO: double check if we need to specify it manualy for pyinstaller to collect

Contributes to CURA-9365
 2022-06-26 10:55:29 +02:00
Jelle Spijker
ced7a6fde2 Added PyQt6-sip to requirements 
Contributes to CURA-9365
 2022-06-26 10:49:02 +02:00
j.spijker@ultimaker.com
815160f45f
Build CPython shared 
Contributes to CURA-9365
 2022-06-25 18:56:13 +02:00
j.spijker@ultimaker.com
5f6d59c63d
Only build Arcus, Savitar and pynest2d shared 
Contributes to CURA-9365
 2022-06-25 18:40:27 +02:00
Casper Lamboo
651c0afa11
Merge pull request #12585 from Ultimaker/CURA-9412_saving_with_no_material_fails 
[CURA-9412] Project file saving fails on printers without materials
 2022-06-24 15:15:01 +02:00
j.delarago
41cc78af1a Add at a minumum a very small border around the edges of the build plate. Otherwise models with shrinkage compensation (or any model with disallowed areas around it) can be placed so that the output model is off the build plate. 
CURA-9271
 2022-06-24 15:00:42 +02:00
c.lamboo
2c074fb7a3 Don't show scary error message when saving custom file 
CURA-9414
 2022-06-24 14:52:42 +02:00
j.delarago
9aaf59ae86 Suggested changes 
CURA-9412
 2022-06-24 14:29:50 +02:00
j.spijker@ultimaker.com
30135072de Compile cpython dependencies statically 
Contributes to CURA-9365
 2022-06-23 12:58:09 +02:00