GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 21:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,658 Commits 287 Branches 260 Tags
Commit Graph

369 Commits

Author SHA1 Message Date
Remco Burema
86f12f62f7 Build: Some files may have already been removed. 
Symlinks for example?

part of CURA-12229
 2024-10-30 17:02:42 +01:00
Remco Burema
cd2e4220f0 Build: Don't remove dir with os.remove use rmdir instead. 
part of CURA-12229
 2024-10-30 15:49:02 +01:00
Remco Burema
2aed655c8b Build: Really try to make sure unwanted binaries are gone. 
part of CURA-12229
 2024-10-30 15:07:00 +01:00
Remco Burema
cf836c29cb Build: Outright remove the unwanted binaries, just to be sure. 
This is needed on Windows at the moment, which doesn't actually parse that file, but does execute the method.

part of CURA-12229
 2024-10-30 08:45:58 +01:00
Remco Burema
e0f0e9407b Build: Filter didn't work because the filename was in a tuple. 
part of CURA-12229
 2024-10-29 16:14:19 +01:00
Remco Burema
2d9e7a347f Build: Fix inverted filter condition for libraries. 
Noticed that we _only_ kept the libraries we _didn't_ want, instead of the inverse :-p

part of CURA-12229
 2024-10-29 13:49:24 +01:00
Remco Burema
52824c4872 Build: Make pseudo-code into something that should work for all OS's. 
part of CURA-12229
 2024-10-29 13:18:04 +01:00
Jelle Spijker
5dd6700031 Refactor binaries filtering and update dependencies 
Introduce a mechanism to filter blacklisted binaries from the build configuration and update the conandata.yml with a new blacklist section. Additionally, remove unnecessary dependencies from requirements.txt, particularly entries for PyQt6-NetworkAuth and related packages.

Contribute to CURA-12229
 2024-10-23 17:08:15 +02:00
Erwan MATHIEU
5a3ced550d Remove extra file cleaning in conanfile.py 
CURA-12096

This was apparently only useful for the gradual flow plugin. Advised by @jellespijker.
 2024-08-16 16:05:53 +02:00
Erwan MATHIEU
5a4ce498d4 Remove gradual flow plugin dependency 
CURA-12096
 2024-08-16 14:57:58 +02:00
Erwan MATHIEU
d828396749 Remove indirect conan dependency 2024-07-01 12:04:47 +02:00
Jelle Spijker
9824c5703c
Update resource directories in Conanfile 
Resource directories in the Conanfile have been updated to include full resource paths and also preserve the original directory structure when copying. The 'keep_path' option has been set to true to maintain the original path structure during the copying process.

Contribute to NP-186
 2024-05-06 13:11:52 +02:00
Jelle Spijker
0942c35c0a
Add cura_resources as dependency and update resource directories 
A new dependency 'cura_resources' has been added to the conandata.yml. The handling of 'cura_resources' has been updated, now including specific sections for definitions, extruders, intent, meshes, quality and variants. GitHub Actions workflows and conan scripts have been adjusted accordingly to include these changes.

Contribute to NP-186
 2024-05-06 11:40:39 +02:00
Jelle Spijker
ee23e2cf67
Add native CAD plugin to Enterprise edition 
The native CAD plugin has been added to the requirements and reference copy operations in the Conan data file and Conan file script.
Now the native CAD plugin will only be included if the enterprise build flag is set. This ensures that unnecessary dependencies are not brought into non-enterprise builds.
 2024-03-11 11:01:53 +01:00
Jelle Spijker
fca8d2a751
Revert "override Protobuf requirement deps" 
This reverts commit ec138516eb1f46d9bb1d7aaa01394d55542c67ba.
 2024-02-26 06:54:20 +01:00
Jelle Spijker
ec138516eb
override Protobuf requirement deps 
Fix versions conflict
 2024-02-26 06:53:39 +01:00
Remco Burema
5f884c737b Fix build, prevent protobuf version mismatch. 2024-02-21 16:39:50 +01:00
Jelle Spijker
20becc1700 Fix Python Installs about dialog 
It will now use the Python Virtual env
 2024-01-26 12:49:37 +01:00
Jelle Spijker
b8d1c885c7
Remove comment 
Mostly to force a build from a push action
 2024-01-19 08:31:49 +01:00
Erwan MATHIEU
1514d755b0 Set proper dependancies versions 2024-01-17 11:03:32 +01:00
Jelle Spijker
e91322d070
ALso enable Sentry for Clipper 
Contributes to CURA-11482
 2024-01-15 09:57:04 +01:00
Jelle Spijker
34e7ea8185 Use clipper with Sentry support 
Contributes to CURA-11482
 2024-01-12 14:28:01 +01:00
Jelle Spijker
0661fe5dcb Enable Sentry for Arcus 
Contributes to CURA-11482
 2024-01-12 11:04:31 +01:00
Jelle Spijker
ec1c825352 Don't package pdb 
Contributes to CURA-11482
 2024-01-12 11:00:18 +01:00
Jelle Spijker
8f29e8d77b
Fix wrongful removal of i18n option 
This caused the option to be always be removed, while we only needed the info of the option to be removed

Contributes to CURA-11497
 2024-01-11 09:00:19 +01:00
HellAholic
bb0c17b2fd
Revert "qt6.6 scroll issues" 2024-01-10 15:41:20 +01:00
saumya.jain
2fbdb633e1 qt6.6 scroll issues 
CURA-11468
 2024-01-03 12:23:40 +01:00
Jelle Spijker
3da4fb2d26 Install pdb files 
Contribute to CURA-11443
 2023-12-11 09:13:36 +01:00
Jelle Spijker
9bb065a294
make sure fdm_materials is installed for internals 
Contributes to CURA-10831
 2023-12-08 07:40:30 +01:00
Jelle Spijker
f94198c108
Fix behaviour of internal property 
The attribute 'enterprise' in conanfile.py was incorrectly named and has been renamed to 'internal'.
This revision ensures that options are accessed correctly to avoid potential issues in usage.

Contributes to CURA-10831
 2023-12-07 14:41:44 +01:00
Jelle Spijker
1156ad7f56
Merge branch 'main' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-05 10:24:50 +01:00
Jelle Spijker
ee1f1a1a82
Merge remote-tracking branch 'origin/CURA-11364_add_sentry_engine' 
# Conflicts:
#	conanfile.py
 2023-12-05 10:22:46 +01:00
Jelle Spijker
8aa6d2c5b6
Update conan_data with actual version 
Contributes to CURA-10831
 2023-12-05 07:44:04 +01:00
Jelle Spijker
b678951759
Applied work-around for GH true/false instead of True/False 
Contributes to CURA-10831
 2023-12-04 18:15:50 +01:00
c.lamboo
58c174ff68 pin dulcificum to 0.1.0-beta.2 2023-12-04 13:49:02 +01:00
c.lamboo
89be765841 Revert "unpin dulcificum" 
This reverts commit ba9e122f6add419824e6fc03d55df40766d4e71d.
 2023-12-04 13:48:05 +01:00
c.lamboo
ba9e122f6a unpin dulcificum 2023-12-04 11:45:12 +01:00
Jelle Spijker
a0f161cd18
Merge branch 'main' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-04 11:05:10 +01:00
Erwan MATHIEU
7d04a988b1
Merge branch 'main' into CURA-11080_use_openssl_3 2023-12-04 10:09:56 +01:00
jellespijker
bffbded591 Override spdlog version 2023-12-01 17:42:27 +01:00
jellespijker
806eba0c6b Merge remote-tracking branch 'origin/CURA-11080_use_openssl_3' into CURA-10831 
# Conflicts:
#	conanfile.py
 2023-12-01 11:27:05 +01:00
Jelle Spijker
10b69e801e
Openssl shared on Linux static for the rest 
Contribute to CURA-11080
 2023-12-01 07:51:31 +01:00
c.lamboo
d93d66dd8a Use sentry cura engine version 
CURA-11364
 2023-11-30 13:45:21 +01:00
c.lamboo
1e190ebcb9 Format file 
CURA-1364
 2023-11-30 13:16:25 +01:00
Jelle Spijker
ef5bc6d3d5 Use custom CPython 3.10.4 and OpenSSL 3.2.0 
Due to changes made to the recipes up stream,
and some tweaks to our own cpython recipe.

We can now build cpython with the newest OpenSSL version

Contribute to CURA-11080
 2023-11-30 12:57:14 +01:00
Casper Lamboo
1dc350012d
Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 09:29:47 +01:00
Jelle Spijker
ac55306d0b
Use Dulcificum 0.1.0-beta.1 2023-11-29 18:44:11 +01:00
Jelle Spijker
37a4c5d19a
Merge branch 'main' into CURA-10831 
# Conflicts:
#	.github/workflows/conan-package-create.yml
#	.github/workflows/conan-package.yml
 2023-11-29 15:18:39 +01:00
Jelle Spijker
50fe469122
Use CCI gettext 
Contributes to CURA-10831
 2023-11-28 17:30:15 +01:00
Jaime van Kessel
344d648445
Merge branch '5.6' of github.com:Ultimaker/Cura 2023-11-27 12:40:56 +01:00