Skip to content
This repository has been archived by the owner on Dec 9, 2022. It is now read-only.

Cura 8640 PyQt6 upgrade #280

Merged
merged 91 commits into from
Apr 14, 2022
Merged

Cura 8640 PyQt6 upgrade #280

merged 91 commits into from
Apr 14, 2022

Conversation

jellespijker
Copy link
Member

@jellespijker jellespijker commented Apr 12, 2022

In order to get this to work on our build-system and working for all three OSes we did a shit tons of boy scouting in our cmake. We removed old methods with variables and try to be consisted in a target-based approach. The idea is that we don't patch stuff down the line, but that the install should place everything with desired rpaths for each project.

Most of the changes had to do with how dependency targets were named and to make sure that external projects weren't downloaded automatically.

The biggest change for this repo is that we no longer us cura-build. The original split was because we wanted tom conserve time for daily builds. Because we now use Conan and handle our own dependencies a bit different the benefit using a two step repository is no longer such profound. Basically non-existence anymore.

By removing this repository we greatly reduced complexity and maintainability in our build process. The next step is to remove the need for cura-build-environment as well but should be tackled once we completely switch to Conan for our dependencies and use pipelines CURA-8589

Part of

Fixes

Todo

  • Update Readme and state that this repository is deprecated and no longer used since 5.0
  • Delete everything except the readme

evtrados and others added 30 commits January 25, 2022 20:23
In Qt6 we're now using the Pip package so maybe it's easier this time.

Contributes to issue CURA-8640.
It no longer exists.

Contributes to issue CURA-8640.
After all, Sip should only be necessary during building, not during runtime.

Contributes to issue CURA-8640.
Contributes to issue CURA-8640.
The location is useful for system integration.

Contributes to issue CURA-8640.
The location is useful for system integration.

Contributes to issue CURA-8640.
Try to set it to the mingw version, not the MSVC compiled version of that lib (since currently CuraEngine is also build with mingw).

part of CURA-7924
You know what? For multi-line: Do with the opening bracket what you will, as long as you're somewhat consistant. Just please also put the closing bracket on a newline.

part of CURA-7924
Though maybe we need to make it all into forward slashes in order for g++to understand it.

part of CURA-7924
It produces ones without the architecture label as well, but those are presumed to be static and don't work in any case. Yet those where the ones that got installed.

part of CURA-7924
There is still an Arcus.so which seems to be a wrongly linked one, but I don't know why it's being put there. Let's see if this works though.

Contributes to issue CURA-7924.
It should be next to the rest of the Python imports.

Contributes to issue CURA-7924.
Because it refuses to fill that in for me.

Contributes to issue CURA-7924.
Contributes to issue CURA-7924.
Not entirely sure why this needs to happen still, but it's the one that works.

Contributes to issue CURA-7924.
Try without pynest2d for now.

part of CURA-7924
part of CURA-7924
It should find the correct files to copy, without manually specifying where they are. Let's hope. Otherwise we'd need to find the files on the image.

Contributes to issue CURA-7924.
Also, use Qt6 while we're at it. Qt5 doesn't exist anyway so this was 100% doomed to fail. Now at least it'll be 99.9% doomed to fail.

Contributes to issue CURA-7924.
Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
Don't spread out responsibility.
The CMakeLists.txt of CuraEngine should ensure that the output
is expected when the install command is done.

Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
It will otherwise use the system site-packages, or in the case
of the build server, the site-packages location in the cura-build-environment

Contributes to CURA-8640
Contributes to CURA-8640
Somehow Cura is installed lib/Python.

Contributes to CURA-8640
@jellespijker jellespijker changed the title [WIP] Cura 8640 PyQt6 upgrade Cura 8640 PyQt6 upgrade Apr 12, 2022
@Ghostkeeper Ghostkeeper merged commit 4c4d1a9 into 5.0 Apr 14, 2022
@Ghostkeeper Ghostkeeper deleted the CURA-8640_PyQt6_upgrade branch May 10, 2022 12:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants