Jelle Spijker
9140553e70
Revert "Use latest stable packages"
...
This reverts commit 6c7223f92b13bf54e3a5a7f72dae37313503abe8.
2023-02-23 16:41:24 +01:00
Jelle Spijker
b0cc2f2822
clear the info
2023-02-23 16:41:01 +01:00
jspijker
16a3c3715e
Don't build with conan higher then 1.56
2023-02-23 15:39:17 +01:00
jspijker
6c7223f92b
Use latest stable packages
...
- uranium
- curaengine
- fdm_materials
2023-02-23 15:38:28 +01:00
jspijker
2853d71af8
Pin conan version to 1.56.0 or lower
2023-02-23 15:31:33 +01:00
jspijker
28ab2a98c6
Merge branch '5.3'
2023-02-23 15:26:19 +01:00
Remco Burema
5970524b3a
Merge branch '5.3'
2023-02-23 13:41:00 +01:00
Jelle Spijker
096bdc43e5
Fixed typo
2023-02-23 13:24:30 +01:00
jspijker
04f5aa04b8
Only update po on Windows
2023-02-23 10:57:20 +01:00
jspijker
422fd1a00b
Add po files
2023-02-23 02:07:36 +01:00
jspijker
e3a347f47c
build mo to LC_MESSAGES
2023-02-23 01:41:46 +01:00
jspijker
eec81bf027
using package folder during deploy
2023-02-23 00:57:44 +01:00
jspijker
e03888fd47
don't copy the cura_app during deplo
2023-02-23 00:38:42 +01:00
jspijker
b93c2ce56f
copy cura_appy.py during generation to Script/bin
2023-02-22 23:56:27 +01:00
jspijker
818a00d4b4
copy cura_appy.py during generation to Script/bin
2023-02-22 23:33:09 +01:00
jspijker
adac0c52a2
copy cura_appy.py during generation to bin
2023-02-22 23:20:49 +01:00
jspijker
f2649bc7ce
fix install path
2023-02-22 23:06:47 +01:00
jspijker
4a3c3df892
Fixed mo generating location
2023-02-22 22:14:03 +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
132fbe0e17
Fix building translations
2023-02-22 21:05:05 +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
2c23221a9a
Fix translations missing from build...maybe?
2023-02-22 17:08:58 +01:00
jspijker
89ee82fa82
Move requirements out of conan_data
2023-02-22 13:51:44 +01:00
jspijker
a2358277b1
Set arm64 architecture in UltiMaker-Cura.spec when compiling for M1
...
Contributes to #11841
Co-authored-by: "Justin F. Hallett" <thesin@southofheaven.org>
2023-02-21 07:48:22 +01:00
Casper Lamboo
b9f09e1122
Merge pull request #14340 from Ultimaker/CURA-9814_automate_extracting_strings
...
[CURA-9814] automate extracting strings
2023-02-01 15:08:15 +01:00
jspijker
1c465614d8
Revert "Use Conandata directly"
...
This reverts commit b8c9fa3f5186bfe564c1ed3b3c09e89218080fe9.
2023-02-01 11:06:35 +01:00
jspijker
883caea814
Revert "Use Conandata directly"
...
This reverts commit b8c9fa3f5186bfe564c1ed3b3c09e89218080fe9.
2023-01-31 15:08:58 +01:00
jspijker
b8c9fa3f51
Use Conandata directly
2023-01-31 12:53:19 +01:00
Joey de l'Arago
0f52521be2
Remove source path from extract tool creation. This can be derived from "self" that is being passed in.
...
CURA-9814
2023-01-19 14:02:06 +01:00
Joey de l'Arago
5af1f6e276
Rename extract function to generate to match better with conan style.
...
CURA-9814
2023-01-19 13:32:58 +01:00
Joey de l'Arago
5186b234dc
Remove redundant code for merging po files
...
CURA-9814
2023-01-18 17:33:39 +01:00
Joey de l'Arago
18bfcd60ba
Add the extractTool to the Cura conanfile
...
CURA-9814
2023-01-18 17:20:55 +01:00
Joey de l'Arago
1554f50518
Use app name so that enterprise is in the name
...
CURA-6867
2023-01-16 10:20:06 +01:00
Joey de l'Arago
9ae3bc37dc
Rename MacOs -> MacOS
...
CURA-6867
2023-01-11 13:27:26 +01:00
Joey de l'Arago
db501f5eed
Merge branch 'main' into CURA-6867_pkg_for_macos
...
# Conflicts:
# .github/workflows/cura-installer.yml
2023-01-10 09:19:01 +01:00
Jelle Spijker
1cccbff2e1
Differentiate between Enterprise and Community for app_name
...
Contributes to CURA-9157
2022-12-14 17:20:20 +01:00
Joey de l'Arago
2b12343cd2
Update paths
...
CURA-6867
2022-12-14 10:54:15 +01:00
jspijker
ed6018d4ad
Update pyinstaller scripts using UltiMaker
...
Contributes to CURA-9808
2022-11-28 11:22:11 +01:00
jspijker
772cc0d57f
Update company name in conanfile
...
Contributes to CURA-9808
2022-11-28 08:44:21 +01:00
jspijker
953bb38c92
Update app name to UltiMaker Cura
...
Contributes to CURA-9808
2022-11-28 08:38:09 +01:00
Remco Burema
c9fc171776
Merge pull request #13596 from Ultimaker/boyscout_translations_conan_package
...
Build mo translation files when creating conan package
2022-11-11 13:44:33 +01:00
jspijker
65f7769e58
Fix internal data plugins deployment
...
The conan package from the internal package wasn't deployed,
added the logic for the second list item
2022-11-09 20:15:23 +01:00
Jelle Spijker
50fad9caf4
Only translate when option devtools is set
2022-11-03 07:18:26 +01:00
jelle spijker
fc26413347
Check against str for conf_info bash path
2022-11-02 21:16:18 +01:00
Jelle Spijker
f1936dc37c
Ensure that gettext bin can be found
2022-10-25 02:41:35 +02:00
Jelle Spijker
10710fe838
Update the po files
...
conan install will now update the the po files
2022-10-23 15:55:56 +02:00
Jelle Spijker
e400f04319
Only run gettext in a bash environment
...
Once the msys2 (m4, autoconf, automake) are fixed
we can use the msys2 recipe.
For now people can use their own bash environment
on Windows by setting the tools.microsoft.bash:path
and tools.microsoft.bash:subsystem when needed.
2022-10-23 15:27:50 +02:00
Jelle Spijker
035815b421
Only build mo on Unix
...
Once M4, autoconf and automake are Conan v2 ready this can be reversed
2022-10-21 17:19:55 +02:00
jelle Spijker
96363c652a
Build mo translation files when creating conan package
...
Added a build step which uses the Conan package gettext as a tool_requires
to convert the po files to mo files and store these in the resources folder
When on Windows the msys2 recipe is used to ensure that we have a bash environment
to run gnu gettext
Creating the mo files as part of the conan package will ensures that we no longer
need to store them in the cura-binary-data and generate them manually. This should
result in less risk of human error during the release cycle
2022-10-19 01:45:18 +02:00
