202 Commits

Author SHA1 Message Date
Jelle Spijker
9693ec2e0e
Merge main and update versions
Contribute to CURA-10831
2023-11-27 08:10:34 +01:00
Jelle Spijker
1fb1fe9faa
don't set release from conandata.yml
Contributes to CURA-10831
2023-11-11 11:59:56 +01:00
Jelle Spijker
33ecec6951
add release tagging info to conandata
Contributes to CURA-10831
2023-11-11 10:42:05 +01:00
Jelle Spijker
2dfe6d7e5d
Set requirements and version with conandata
This will allow workflow automations to easily create release branches and set the versions

Contributes to CURA-10831
2023-11-11 08:54:23 +01:00
Jelle Spijker
b2ced7c0ba
Install pyDulcificum
Contributes to CURA-10561
2023-10-26 16:09:38 +02:00
Jelle Spijker
471490540d
Copy curaengine_gradual_flow_plugin exec to correct deploy path
Contributes CURA-11038
2023-09-20 17:17:43 +02:00
Jelle Spijker
7fbd716bb4
Bundling the Gradualflow plugin
This commit simplifies the deploy method in conanfile.py by reducing the number of lines of code and refactor the
handling of the Gradualflow plugin in the deploy method. In conandata.yml, the paths for the Gradualflow plugin
resources have been adjusted for correct deployment. This update aims to fix the pyinstaller deployment failures
associated with the Gradualflow plugin. It resolves the CURA-10951 tracking issue.

Contributes CURA-10951
2023-09-05 05:11:51 +02:00
Jelle Spijker
2d389a6819 Windows packaging
Contributes to CURA-10951
2023-08-30 16:51:56 +02:00
jellespijker
0210b06fbb Pyinstaller package directories from the instal directory
Contributes to CURA-10951
2023-08-30 10:51:53 +02:00
Jelle Spijker
551036352d
Copy private data and materials from new location
Contributes to CURA-10317
2023-03-28 11:26:46 +02:00
jspijker
a6ede540e8 Move staging urls out-of conanfile
Contributes to CURA-10317 Inconsitent material profiles in internal builds
2023-02-24 11:35:46 +01:00
Remco Burema
5970524b3a Merge branch '5.3' 2023-02-23 13:41:00 +01:00
jspijker
88da5300ef Fixed paths 2023-02-22 21:52:25 +01:00
jspijker
065e785e90 Fixing Paths
To custom for it
2023-02-22 21:43:28 +01:00
jelle Spijker
ed49a01fdc Move requirements out of conan_data
(cherry picked from commit 89ee82fa8223536aedfc791963907cd8faa7e296)
2023-02-22 20:20:21 +01:00
Joey de l'Arago
12ec61be1d Fix translations missing from build...maybe? 2023-02-22 17:39:11 +01:00
jspijker
89ee82fa82 Move requirements out of conan_data 2023-02-22 13:51:44 +01:00
jspijker
64ecc2118d Set the correct curaengine version for 5.3.0-beta.1 2023-02-22 12:41:29 +01:00
jspijker
8dfaca3752 Set the correct requirements for 5.3.0-beta.1 2023-02-22 12:15:17 +01:00
Jelle Spijker
eb12a636cc
Add 5.4.0-alpha to conandata main 2023-02-01 07:55:16 +01:00
jspijker
a632d154eb Move beta as first entry 2023-01-31 12:42:37 +01:00
jspijker
c261253f8a Add 5.3.0 and 5.3.0-beta to conandata
Contributes to CURA-10209
2023-01-30 12:28:10 +01:00
jspijker
d75291e3a9 Clean-up
Contributes to CURA-10072
2022-12-30 13:42:01 +01:00
jspijker
4830479b63 Also map plugins folder in conandata.yml 2022-11-10 11:34:46 +01:00
c.lamboo
f803279a43 Merge branch '5.2'
# Conflicts:
#	conandata.yml
2022-11-04 14:00:40 +01:00
jelle spijker
6860c6777c Update conandata for the 5.2.1 release
Fix translation:
- Italian (mea culpa)
- Chinese (我们很抱歉)
2022-10-19 15:52:29 +02:00
jelle spijker
1f5336805c Add 5.3.0-alpha entry 2022-10-17 16:29:06 +02:00
Jelle Spijker
7faf2f63da Remove 5.3.0-alpha from the conandata
When the `conan install . ` command is run without a version specifier it would take the dependencies for 5.3.0-alpha
on the 5.2 branch.
2022-10-11 15:05:46 +02:00
jelle Spijker
ca90ac7787 Fix adding all shared libs managed by Conan to pyinstaller
Closes #13422

Contributes to CURA-9711
2022-10-05 10:47:34 +02:00
jspijker
73c8bf5c66 Merge branch '5.2' into CURA-9711_libspdlog_missing 2022-10-05 10:22:37 +02:00
jspijker
4cdf4e607d update conandata.yml 2022-10-04 16:38:01 +02:00
Joey de l'Arago
1287dffe22 Add fmt binaries to list.
CURA-9711
2022-10-04 15:45:37 +02:00
Casper Lamboo
bef3eb8703
Update conandata.yml 2022-10-04 15:27:41 +02:00
Casper Lamboo
566cbba111
Update conandata.yml 2022-10-04 15:23:58 +02:00
Joey de l'Arago
ccea542280 Add spdlog to binaries list.
Add warning for missing binary

Update pattern matching for binaries glob in bin paths. It will now match .so.X files that it would not before.

CURA-9711
2022-10-04 14:40:13 +02:00
Joey de l'Arago
6da52b1d59
Update conandata.yml 2022-09-30 15:50:35 +02:00
Joey de l'Arago
b7ef313375
Update conandata.yml 2022-09-30 13:19:47 +02:00
Joey de l'Arago
959e4bfadd
Update conandata.yml 2022-09-30 11:07:10 +02:00
Joey de l'Arago
ff9fb445e0
Update conandata.yml 2022-09-30 10:54:52 +02:00
Joey de l'Arago
94d80ef712
Update conandata.yml 2022-09-30 10:35:50 +02:00
Joey de l'Arago
c482cbddf3 Update conandata.yml 2022-09-30 10:33:06 +02:00
Joey de l'Arago
5eccf57c51
Update conandata.yml 2022-09-30 10:05:15 +02:00
Joey de l'Arago
f769216340
Update conandata.yml 2022-09-30 09:23:51 +02:00
Joey de l'Arago
cbadf50f4d
Add beta version 2022-09-29 12:57:10 +02:00
Remco Burema
31e1577347 Revert "Should be able to run a build for VnV (testing)."
This reverts commit 827ef072bd1a40b6d59a6e3f576950c6f9bfebee.
2022-09-23 14:01:55 +02:00
Remco Burema
827ef072bd Should be able to run a build for VnV (testing). 2022-09-23 13:28:13 +02:00
jelle Spijker
59d9bfde99 Use umbase 0.1.7
This will now set the version by default if not
defined at the cmd line to the first entry in the
conandata.yml
2022-09-06 11:33:18 +02:00
j.spijker@ultimaker.com
d92fd3d1e3 Make internal resources requirements
Contributes to CURA-9528
2022-08-12 16:38:17 +02:00
j.spijker@ultimaker.com
c5acaa768b Moved pycharm_targets to conandata
Added individual tests. Still not everything

Contributes to CURA-8827
2022-08-11 18:01:45 +02:00
j.spijker@ultimaker.com
de9d432398 Use new pysavitar as package
Contributes to CURA-8828, CURA-8829 and CURA-8831
2022-08-02 15:47:17 +02:00