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
31,579 Commits 287 Branches 260 Tags
Commit Graph

151 Commits

Author SHA1 Message Date
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
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
Jelle Spijker
48ea4cee9f Merge branch '5.2' 
# Conflicts:
#	conanfile.py
 2022-10-10 10:23:01 +02:00
jelle spijker
6ae88f1181 Also set build tag if not internal 
Contributes to CURA-9711
 2022-10-05 14:43:31 +02:00
jelle spijker
67e99cd4ce Set version number for CuraVersion.py 
If you want custom version use the Conan Configuration:
`user.cura:version`

Contributes to CURA-9711
 2022-10-05 14:33:05 +02:00
jelle spijker
8cf475694f Filter on specific extensions 
Contributes to CURA-9711
 2022-10-05 13:47:09 +02:00
jelle Spijker
e2cf889f7f Don't check for shared 
Contributes to CURA-9711
 2022-10-05 11:08:53 +02:00
jelle Spijker
ad65ffa76c Fix check if option exist 
Contributes to CURA-9711
 2022-10-05 10:56:53 +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
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
e854ee6a3c
Fix reference to version properties that don't exist. 
version.prerelease does not exist, swapped this out for version.pre. 

There is no "+" inside prerelease (ie "-alpha"), this was probably being confused with the build version ( ie. +testing_120). Both "+" and "-" are removed from these values so I have prepended "_internal" to the build number instead.
 2022-10-03 11:35:46 +02:00
Joey de l'Arago
ed48fd2e82
Update conanfile.py 2022-10-03 10:58:50 +02:00
Remco Burema
6953ff9019 Not building with prerelease-string if none present. 2022-09-28 17:56:49 +02:00
Remco Burema
237b671e0c Prevent building with prerelease-string if none present. 2022-09-28 17:21:31 +02:00
Remco Burema
a94bd91085 Able to force 'prerelease'-version information. 2022-09-23 17:49:50 +02:00
jelle Spijker
25aabfb031 Allow specifying version with conan conf 
By setting the `user.cura:version` in the
configuration of Conan that version string
is used preferred over the actual version

This should be usefully for releases

Contributes to CURA-8831
 2022-09-07 07:49:38 +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
joeydelarago
3413caab62 Set latest.json location back to ultimaker website. 
CURA-9272
 2022-08-22 16:29:08 +02:00
joeydelarago
1f701c267a Merge branch 'main' into CURA-9272_semver_postfix 2022-08-22 09:04:03 +02:00
Joey de l'Arago
0e99a0029d
Update minimum conan version 2022-08-19 12:52:40 +02:00
joeydelarago
a20e7bf8d9 Add cura latest.json url to template so it can be set from the conanfile. 
CURA-9272
 2022-08-15 15:59:08 +02:00
j.spijker@ultimaker.com
830adcea1b Fix not internal builds 
Contributes to CURA-9528
 2022-08-12 18:00:16 +02:00
j.spijker@ultimaker.com
1d4ee4dd96 Fix not internal builds 
Contributes to CURA-9528
 2022-08-12 17:47:28 +02:00
j.spijker@ultimaker.com
37077a7823 Fix not internal builds 
Contributes to CURA-9528
 2022-08-12 17:08:25 +02:00
j.spijker@ultimaker.com
d92fd3d1e3 Make internal resources requirements 
Contributes to CURA-9528
 2022-08-12 16:38:17 +02:00
Jelle Spijker
00d99d10b9
Merge pull request #13003 from Ultimaker/CURA-8792_update_pycharm_run_config 
[CURA-8792] Move run configuration templates out of conan-config into this repo.
 2022-08-11 18:09:05 +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
joeydelarago
a0f32c403d Move run configuration templates out of conan-config into this repo. 
Add extra test run configuration.

CURA-8792
 2022-08-11 16:44:07 +02:00