| Age | Commit message (Collapse) | Author |
|---|
|
Should fix USB printing not working
|
|
Note: This will work correctly when all the requirements
are also merged
Contributes to CURA-9365
|
|
This reverts commit 253e61cd4e0f40c69e5a58f561ae9d5dd9e0a11f.
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Needed by the dist
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Still need to fix the mappings and hidden imports
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Some paths in dependencies were moved around due to the new deploy functionality
this should fix it.
Contributes to CURA-9365
|
|
Fixes #10696
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
The Python recipe has some problems with version 2.5.1
https://github.com/conan-io/conan-center-index/blob/fff8ccc29b8d65f899bdae8df876f4d8086c17e0/recipes/cpython/all/conanfile.py#L187
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Even though we had to patch these recipes, the user/channel
shouldn't be necesary any more because of the order in which
our remotes are defined in the conan-config repo. It will
first look into our own remotes, before going over to
conan-center-index.
Once the packages upstream are fixed for us, then we can use
the conan-center-index packages again, without changing the
code.
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
Once upstream recipes are fixed these can be removed again.
export the changes for now
```
# Export patched conan-center-index recipes, I will open PR's for all of those
git clone https://github.com/jellespijker/conan-center-index.git
pushd .
cd conan-center-index
git checkout fix_tcl_recipe_env_info
conan export recipes/tcl/all tcl/8.6.10@ultimaker/testing
git checkout fix_tk_recipe_env_info
conan export recipes/tk/all tk/8.6.10@ultimaker/testing
git checkout fix_mpdecimale_recipe_not_use_msys
conan export recipes/mpdecimal/2.5.x mpdecimal/2.5.1@ultimaker/testing
git checkout add_3_10_4_version_cpython
conan export recipes/cpython/all cpython/3.10.4@ultimaker/testing
```
Contributes to CURA-9365
|
|
See branch in fork conan-center-index
https://github.com/jellespijker/conan-center-index/tree/add_3_10_4_version_cpython
Contributes to CURA-9365
|
|
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
|
|
Contributes to CURA-9365
|
|
Still not sure if this is the best approach.
Contributes to CURA-9365
|
|
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
|
|
Contributes to CURA-9365
|
|
https://docs.conan.io/en/latest/versioning/version_ranges.html
It won't match build metadata otherwise.
The order of search for matching versions is as follows:
First, the local conan storage is searched for matching versions, unless the --update flag is provided to conan install.
If a matching version is found, it is used in the dependency graph as a solution.
If no matching version is locally found, it starts to search in the remotes, in order. If some remote is specified with -r=remote, then only that remote will be used.
If the --update parameter is used, then the existing packages in the local conan cache will not be used, and the same search of the previous steps is carried out in the remotes. If new matching versions are found, they will be retrieved, so subsequent calls to install will find them locally and use them.
Contributes to CURA-9365
|
|
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
|
|
Contributes to CURA-9365
|
|
Contributes to CURA-9365
|
|
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
|
|
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
|
|
Contributes to CURA-9365
|
