GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-24 06:39:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,479 Commits 286 Branches 260 Tags
Commit Graph

133 Commits

Author SHA1 Message Date
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
j.spijker@ultimaker.com
e8c9df1794 Add internal build options 
This will add the keyword `internal` to the build metadata such that
it is easier to distinguish between normal Cura builds and internal
builds with private data.
 2022-08-10 12:36:41 +02:00
j.spijker@ultimaker.com
c1ae1872d0 Make sure build and generate steps are present 
Contributes to CURA-8831
 2022-08-03 17:49:13 +02:00
j.spijker@ultimaker.com
cf548613ca Add cura env to Run environments 
Contributes to CURA-8831
 2022-08-03 08:51:41 +02:00
j.spijker@ultimaker.com
f95b22404a fix base_dir for venv when running from source 
Contributes to CURA-8831
 2022-08-03 08:51:41 +02:00
j.spijker@ultimaker.com
e4feae414b Build pyarcus and pysavitar shared 
Contributes to CURA-8828, CURA-8829 and CURA-8831
 2022-08-03 08:51:41 +02:00
j.spijker@ultimaker.com
89de2b1fae Set the Cura Version also when running from source 2022-07-27 12:03:51 +02:00
jspijker
79fe069d20 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 10:34:45 +02:00
j.spijker@ultimaker.com
3609871ba6 Use umbase 0.1.5 
Contributes to CURA-9365
 2022-07-19 10:33:04 +02:00
jspijker
2b4b110b38 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-19 09:54:18 +02:00
j.spijker@ultimaker.com
1c3a46c9e2 Use empty string for channel if channel is undefined 
Contributes to CURA-9365
 2022-07-19 09:52:54 +02:00
j.spijker@ultimaker.com
cd303b4e6f Make sure all dynamic libs are copied to the dist 
Solve it dynamically in the Ultimaker-Cura.spec,
Such that we can copy files manually (OpenSSL shared)
to the bin/Script folder after the cura install step.

Contributes to CURA-9342
 2022-07-18 11:34:21 +02:00
j.spijker@ultimaker.com
8f1ad7e6b4
Use umbase 0.1.4 
Contributes to CURA-9365
 2022-07-14 18:21:55 +02:00
j.spijker@ultimaker.com
3ea7dd8565
Use umbase 0.1.4 
Contributes to CURA-9365
 2022-07-14 18:21:23 +02:00
j.spijker@ultimaker.com
7068c87130
Add copied openssl 1.1.1l binaries to pyinstall binaries 
Contributes to CURA-9342
 2022-07-14 10:38:59 +02:00
j.spijker@ultimaker.com
82904ccd3f Fix version if version is None 
Contributes to CURA-9365
 2022-07-07 20:04:38 +02:00
j.spijker@ultimaker.com
c22999c314 handle local packages correctly 
Contributes to CURA-9365
 2022-07-07 19:49:04 +02:00
j.spijker@ultimaker.com
4d98ba3540 Fixed missing qoutes 
Contributes to CURA-9365
 2022-07-07 07:07:32 +02:00
j.spijker@ultimaker.com
c100f68f58 Add missing info.plist 
2ce60de673/packaging/Info.plist.in (L5)

Contributes to CURA-9365
 2022-07-07 05:58:58 +02:00