GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,696 Commits 286 Branches 260 Tags
Commit Graph

360 Commits

Author SHA1 Message Date
j.spijker@ultimaker.com
87a521159e Add osx_bundle_identifier 
Contributes to CURA-9365
 2022-07-01 06:52:19 +02:00
j.spijker@ultimaker.com
f3ebf98440 Only use upx on Windows 
Contributes to CURA-9365
 2022-07-01 06:37:34 +02:00
j.spijker@ultimaker.com
3fe0f26e94 explicit cast from Path to str 
Contributes to CURA-9365
 2022-07-01 06:33:50 +02:00
j.spijker@ultimaker.com
2ea78a3ef6 use package resource folder 
Contributes to CURA-9365
 2022-07-01 06:20:26 +02:00
j.spijker@ultimaker.com
dc8c9bb276 Moved MacOS dmg to dedicated folder 
Contributes to CURA-9365
 2022-07-01 05:39:22 +02:00
j.spijker@ultimaker.com
e9cbad1164 Allow for pyinstaller to sign the files on MacOS 
Contributes to CURA-9365
 2022-07-01 05:34:52 +02:00
j.spijker@ultimaker.com
cc8f0d3001 Add conan binaries to binaries 
Contributes to CURA-9365
 2022-07-01 05:25:25 +02:00
Jelle Spijker
7dc4266b09
single qoutes 2022-07-01 00:29:15 +02:00
Jelle Spijker
36bcb97dbb
place qoutes around path 2022-07-01 00:09:22 +02:00
j.spijker@ultimaker.com
6047c101ed map binaries to root 
Contributes to CURA-9365
 2022-06-30 23:50:10 +02:00
j.spijker@ultimaker.com
c4aee2a6b6 Fixed Ultimaker-Cura spec 
Contributes to CURA-9365
 2022-06-30 23:26:22 +02:00
j.spijker@ultimaker.com
21e69a8c67 Use bindirs instead of paths 
Contributes to CURA-9365
 2022-06-30 22:55:42 +02:00
j.spijker@ultimaker.com
cf1e2bd7af Add conan_binaries to pyinstaller 
Contributes to CURA-9365
 2022-06-30 17:57:42 +02:00
j.spijker@ultimaker.com
77a72fce25 Use correct paths 
Contributes to CURA-9365
 2022-06-30 16:55:56 +02:00
j.spijker@ultimaker.com
b4f3d5cbab Use correct paths 
Contributes to CURA-9365
 2022-06-30 16:40:24 +02:00
j.spijker@ultimaker.com
2739057a97 Copy all shared libs 
Contributes to CURA-9365
 2022-06-30 16:36:09 +02:00
j.spijker@ultimaker.com
a2da68d806 Updated mapping of pyinstaller metadata 
Contributes to CURA-9365
 2022-06-30 14:49:07 +02:00
j.spijker@ultimaker.com
d07c9d64cc Fixed empty source 
Contributes to CURA-9365
 2022-06-30 11:58:57 +02:00
j.spijker@ultimaker.com
d20976d459 Moved pyinstaller, cura_version generate function 
This is used both in source, generate and deploy

Contributes to CURA-9365
 2022-06-30 09:49:22 +02:00
j.spijker@ultimaker.com
6b51753973 Renamed folder structure to venv structure 
Contributes to CURA-9365
 2022-06-30 09:39:21 +02:00
j.spijker@ultimaker.com
d47635c0f9 Removed requirement install from deploy steps. 
I'm gonna repurpose the VirtualPythonEnv for this

Contributes to CURA-9365
 2022-06-30 09:37:17 +02:00
j.spijker@ultimaker.com
a837827bf3 Added extra Uranium cases 
Contributes to CURA-9365
 2022-06-29 15:56:18 +02:00
j.spijker@ultimaker.com
1bb1efd429 Store generators in build folder 
Contributes to CURA-9365
 2022-06-29 15:32:24 +02:00
j.spijker@ultimaker.com
5062d704c2 Add deploy functionality 
Contributes to CURA-9365
 2022-06-29 15:12:51 +02:00
j.spijker@ultimaker.com
32ed0619b0 Set the runenv for deploy 
Contributes to CURA-9365
 2022-06-29 04:53:26 +02:00
j.spijker@ultimaker.com
5a61c4ea38 Fix uranium deploy 
Contributes to CURA-9365
 2022-06-28 16:57:54 +02:00
j.spijker@ultimaker.com
cdc8fd759b Don't use CuraVersion.py options to calc package_id 
The following options shouldn't be used to determine the hash, since these are only used to set the CuraVersion.py
which will als be generated by the deploy method during the `conan install cura/5.1.0@_/_`

Contributes to CURA-9365
 2022-06-28 15:08:07 +02:00
j.spijker@ultimaker.com
0cea013e2f Move venv creation to UMBaseConanfile 
Contributes to CURA-9365
 2022-06-28 15:07:01 +02:00
j.spijker@ultimaker.com
da00707ead Add requirements.txt as user_info 
Something similar should be done for Uranium

Contributes to CURA-9365
 2022-06-28 07:43:00 +02:00
j.spijker@ultimaker.com
705231d56a Copy resources to to correct paths 
Still WIP, but needs to be committed due to not copying sources (1gb saving)

Contributes to CURA-9365
 2022-06-28 07:43:00 +02:00
j.spijker@ultimaker.com
62aacc5946 Initial set-up of deploy functionality 
Contributes to CURA-9365
 2022-06-27 13:51:50 +02:00
j.spijker@ultimaker.com
815160f45f
Build CPython shared 
Contributes to CURA-9365
 2022-06-25 18:56:13 +02:00
j.spijker@ultimaker.com
5f6d59c63d
Only build Arcus, Savitar and pynest2d shared 
Contributes to CURA-9365
 2022-06-25 18:40:27 +02:00
j.spijker@ultimaker.com
30135072de Compile cpython dependencies statically 
Contributes to CURA-9365
 2022-06-23 12:58:09 +02:00
j.spijker@ultimaker.com
803858c4e9 Cheating with Arcus 
Contributes to CURA-9365
 2022-06-22 11:04:12 +02:00
j.spijker@ultimaker.com
ee87a2e3a4 use umbase 0.1.1 or higher 
Contributes to CURA-9365
 2022-06-22 09:28:52 +02:00
j.spijker@ultimaker.com
a31124673b Compile libffi and mpdecimal statically on Windows 
Contributes to CURA-9365
 2022-06-19 19:08:24 +02:00
j.spijker@ultimaker.com
05191af96f set mpdecimal cxx option to false on windows 
the combination of compiling it shared and with cxx is invalid
on Windows. We don't use the cxx capabilities of mpdecimal

Contributes to CURA-9365
 2022-06-19 14:34:26 +02:00
j.spijker@ultimaker.com
ac6f939db3 Use Conan CPython package 
Now all our deps are compiled with the same flags.
This should help to make it more agnostic over the
systems.

Contributes to CURA-9365
 2022-06-18 16:44:07 +02:00
j.spijker@ultimaker.com
29ddfe1352 Make the entrypoint and icon path relative from source 
Contributes to CURA-9365
 2022-06-18 11:39:49 +02:00
j.spijker@ultimaker.com
dfc0f9b31f Use UMBaseConanfile for reusable functions 
Added a recipe in the conan-ultimaker-index repo,
which contains a conanrecipe that can be loaded
as a python_requires.

This allows us to reuse python code over multiple
recipes, see: https://docs.conan.io/en/latest/extending/python_requires.html

Contributes to CURA-9365
 2022-06-18 11:35:20 +02:00
j.spijker@ultimaker.com
eb8e119e5c Using node-semver to validate version in conandata 
Still not sure if this is the best approach.

Contributes to CURA-9365
 2022-06-18 00:29:15 +02:00
j.spijker@ultimaker.com
aaed543a22 Add entrypoint info to conandata 
With the new PyCharmRunEnv generate conan
should automatically create a pycahrm run
target, setting the paths correctly.

Usage as: `conan instal ....... -g PyCharmRunEnv`

Contributes to CURA-9365
 2022-06-17 18:12:22 +02:00
j.spijker@ultimaker.com
f9447edf47 Remove materials before import 
This ensures that there won't be any old materials present
if they're deleted between versions.

Contributes to CURA-9365
 2022-06-17 08:22:30 +02:00
j.spijker@ultimaker.com
e6bfea7c81 import fdm_materials 
Contributes to CURA-9365
 2022-06-17 07:59:05 +02:00
j.spijker@ultimaker.com
2044ff2d6a import the fdm_materials 
Contributes to CURA-9365
 2022-06-17 07:32:18 +02:00
j.spijker@ultimaker.com
6cbc9aaa38 Use only pip in conan requirements 
No longer download and mess with sources from
other repo's.

Created Conan packages for cura-binary-data,
fdm_materials and uranium.

Charon is installed with pip. I had to create
a separate requirement file for that since
you can't mix and match git and hashes.

Contributes to CURA-9365
 2022-06-16 19:55:56 +02:00
j.spijker@ultimaker.com
ffca22971e Use different icon formats depending on OS 
Contributes to CURA-9365
 2022-06-14 11:37:43 +02:00
j.spijker@ultimaker.com
3e67566aad Use relative path for the entrypoint 
Contributes to CURA-9365
 2022-06-14 09:18:08 +02:00
j.spijker@ultimaker.com
4ac4190eae Make VirtualPythonEnv optional 
Contributes to CURA-9365
 2022-06-14 07:41:16 +02:00