374 Commits

Author SHA1 Message Date
Erwan MATHIEU
bec1ff1243 Fix pyinstaller resources deployment 2024-11-14 13:59:27 +01:00
Erwan MATHIEU
4fedf332a0 Raise exceptions on critical errors 2024-11-13 16:22:18 +01:00
Erwan MATHIEU
85644b621e Remove debug print 2024-11-13 13:33:15 +01:00
Erwan MATHIEU
b78143546c Add more debug printed information 2024-11-13 10:25:04 +01:00
Erwan MATHIEU
440b51c189 Add debug information to try and fix build 2024-11-13 09:20:21 +01:00
Erwan MATHIEU
9a1e384f9a Fix deploy step 2024-11-12 15:45:57 +01:00
Erwan MATHIEU
ab96236a8f Fix pyinstaller data generation 2024-09-26 16:38:23 +02:00
Erwan MATHIEU
cee46ae1ea Rename devtools option to pyinstaller 2024-09-26 12:58:35 +02:00
Erwan MATHIEU
3199437403 Remove now useless attribute 2024-09-25 16:52:51 +02:00
Erwan MATHIEU
7ddd65987f Update recipe for package creation 2024-09-25 11:32:51 +02:00
Erwan MATHIEU
5506d57d38 Fix dep and remove references to pip requirements txt files 2024-09-25 09:17:37 +02:00
Erwan MATHIEU
d26c5b74a6 Fix incompatible Python dependencies and files generation 2024-09-24 16:37:15 +02:00
Erwan MATHIEU
e3cb6d4f8c Basically working recipe 2024-09-24 16:08:30 +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