268 Commits

Author SHA1 Message Date
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
j.spijker@ultimaker.com
3ff1dec631 Use dev version as no version is set
Contributes to CURA-9365
2022-06-14 07:23:15 +02:00
j.spijker@ultimaker.com
f193a7ce1f Don't use buildmetadata for conandata version
Contributes to CURA-9365
2022-06-13 19:15:27 +02:00
j.spijker@ultimaker.com
9ec39a9c7e Moved handling of the sources to the generate function
When running `conan source .` on ubuntu the `.git` folder
was removed, happens with cona 1.47 ... 1.49
This seems to be a bug in Conan, I will try to reproduce
it and create an issue in their repo.

Contributes to CURA-9365
2022-06-13 17:03:41 +02:00
j.spijker@ultimaker.com
5190742850 Add relative uranium, libcharon and cura to PYTHONPATH
Needed because not everything is a conan package yet

Contributes to CURA-9365
2022-06-13 15:46:10 +02:00
j.spijker@ultimaker.com
22e17dd040 Generate the pyinstaller spec file
This will be generated if you do a conan install with devtools

It assumes that the projects `cura-binary-data`, `fdm_materials`,
`uranium`, `libcharon` are installed along side the `cura` project.

It will automatically install the fdm_materials when running
conan source.

The pyinstall dist can be created with:

```
# Windows Powershell
conan install . -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update -o cura:devtools=True
conan source .
.\venv\Scripts\Activate.ps1
pyinstaller Ultimaker-Cura.spec
```

```
# bash
conan install . -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update -o cura:devtools=True
conan source .
source venv\bin\activate
pyinstaller Ultimaker-Cura.spec
```

Contributes to CURA-9365
2022-06-13 15:15:09 +02:00
j.spijker@ultimaker.com
04f16bfcad Use dev as development version
Since we're no longer running from `master` branch
It is more fitting to rename it to either dev or
main. This version is only used when running from
source when the CURA_VERSION variable isn't set
while performing the `conan install`

Contributes to CURA-9365
2022-06-13 15:08:00 +02:00
j.spijker@ultimaker.com
8d7732353f Allow using lower case true, false options
Workaround for Github Actions passing a lowercase boolean as a string

Contributes to CURA-9365
2022-06-12 23:54:50 +02:00
j.spijker@ultimaker.com
2cab988c63 Manage deps with the conan_data
Contributes to CURA-9365
2022-06-12 20:18:41 +02:00
j.spijker@ultimaker.com
5d740d7368 Set the CuraVersion with the conan options
Contributes to CURA-9365
2022-06-12 19:09:22 +02:00
j.spijker@ultimaker.com
e1c384cd92 Add a conanfile
This file should take care of downloading the C++ and Python binding
dependencies. It uses the PythonVirtualRunEnv to generate a Virtual
Python Environment, setting the Paths and installing the requirements
specified in the requirements.txt

Contributes to CURA-9365
2022-06-12 17:30:38 +02:00