Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cura 9365 fix building main #143

Merged
merged 91 commits into from
Jun 30, 2022
Merged

Cura 9365 fix building main #143

merged 91 commits into from
Jun 30, 2022

Conversation

jellespijker
Copy link
Member

Doc to come

jellespijker and others added 30 commits April 26, 2022 15:20
@jellespijker
Merge branch 'release/5.0.0' into CURA-9177_fix_CI_CT
8208edf
@jellespijker
Use the same conan-package workflow as CuraEngine
7ed2512 
Contributes to CURA-9177
@jellespijker
Use the same clang-tidy-review workflow as CuraEngine
e232f55 
Contributes to CURA-9177
@jellespijker
Merge remote-tracking branch 'origin/master' into CURA-9177_fix_CI_CT
4ada655 
# Conflicts:
#	.github/workflows/conan-package.yml
@jellespijker
Disable testing
4faea2e 
Contributes to CURA-9177
@jellespijker
Update README.md
d3a788f 
Contributes to CURA-9177
@jellespijker
Add explination how to consume Arcus downstream
67de916 
Contributes to CURA-9177
@jellespijker
Add clang-tidy and clang-format configs
45a9bf9 
The same once used in CuraEngine

Contributes to CURA-9177
@jellespijker
Run clang-tidy on PR changes to C++ sources
b981e9f 
Contributes to CURA-9177
@jellespijker
Use Arcus specific cache
09078c3 
Contributes to CURA-9177
@jellespijker
Wrong variable naming scheme
412bba1 
To test the clang-tidy Github Action

Contributes to CURA-9177
@jellespijker @github-actions
Apply review comment
9efd8da 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@jellespijker
Merge remote-tracking branch 'origin/CURA-9177_fix_CI_CT' into CURA-9…
018d00e 
…177_fix_CI_CT
@jellespijker
Fixed variable name
e45dec2 
Contributes to CURA-9177
@jellespijker
Removed web-based slicer comment
1372ba3 
Contributes to CURA-9177
@jellespijker
Use CMP0091 new cmake policy
a87159d 
Needed to set the MSVC flags with Conan
@jellespijker
Specify the python_version to build against
12168cd 
options are specific versions or to use the same version as conan.

Setting it like this assures that it is taken
into account when creating the has, making sure
everything links to the same version.

Contributes to CURA-9177
@jellespijker
Use custom layout
d3ec808 
Using the cmake_layout on Windows is giving troubles
probably because it tries to be intelligent when it
detects Visual Studio.

Specifying the folder structure in the conanfile
gives a more reliable outcome over all tree systems

Contributes to CURA-9177
@jellespijker
Don't commit conan artifacts
f066126 
doing a conan install can generate
these files, these should never be
commited

Contributes to CURA-9177
@jellespijker
Update build steps in readme
58cfe7c 
Also added section about the Python module

Contributes to CURA-9177
@jellespijker
Do not set the language
2144b87 
This can cause confusion when compiling
SIP
@jellespijker
Fixed python_version always set to 3.10.4
f3d4cfc 
Contributes to CURA-9338
@jellespijker
Create latest when pushed to this branch
991872f 
This needs to be fixed after the merge to main

Contributes to CURA-9338
@jellespijker
Allow setting the Python_ROOT_DIR with a env variable
9f9585d
@jellespijker
Use CMP0091 new policy for test_package
f9416f6 
Contributes to CURA-9177 and CURA-9365
@jellespijker
Disable LTO by default
e5ce76d 
Contributes to CURA-9177 and CURA-9365
@jellespijker
Fix uneccesarry distinction between local_cache and dev env
ee3dd49 
Contributes to CURA-9177 and CURA-9365
@jellespijker
Export symbols for Windows of Arcus
7f87bf2 
Contributes to CURA-9177 and CURA-9365
@jellespijker
Also build shared on Windows
d44f547 
Contributes to CURA-9177 and CURA-9365
@jellespijker
Use same generator folder as curaengine
0aae5e6 
Contributes to CURA-9177 and CURA-9365
[email protected] and others added 18 commits June 21, 2022 13:50
@jellespijker
Clean the conan cache
74c3bc8 
Due to incomplete packages after the server switch

Contributes to CURA-9365
@jellespijker
Uniform versioning
b217ff3 
Contributes to CURA-9365
@jellespijker
No start and end line characters
8eb252f 
Contributes to CURA-9365
@jellespijker
not regex but glob for the release
4924298 
Contributes to CURA-9365
@jellespijker
Remove release branch trigger
00fdc82 
Contributes to CURA-9365
@jellespijker
use umbase 0.1.1 or higher
1db9a12 
Contributes to CURA-9365
@jellespijker
use alpha for dev branches
c9314e4 
Contributes to CURA-9365
@jellespijker
use alpha for dev branches
7a44cff 
Contributes to CURA-9365
@jellespijker
pin umbase to 0.1.1
7673a48 
Contributes to CURA-9365
@jellespijker
use mpdecimal 2.5.0
6cfc19e 
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
@jellespijker
Trigger workflow on changes to conandata
2c511aa 
Contributes to CURA-9365
@jellespijker
Uniform line ending across OSes
f0f003b 
https://docs.conan.io/en/1.45/versioning/revisions.html#how-it-works

Contributes to CURA-9365
@jellespijker
trigger on change in gitattribute
58231dd 
https://docs.conan.io/en/1.45/versioning/revisions.html#how-it-works

Contributes to CURA-9365
@jellespijker
Added manual dispatch to workflow
4582da5 
Can only be used once merged to main

Contributes to CURA-9365
@jellespijker
Only create alias on pr
6a4f966 
Contributes to CURA-9365
@jellespijker
Don't run on PR
0578a26 
Contributes to CURA-9365
@jellespijker
Don't send notification if binaries shouldn't be created
75d2854 
Contributes to CURA-9365
@jellespijker
Only build protobuf shared
982001c 
This should make sure that CPython builds on most systems.
Which allows it to be used to configure the python module
with CPython instead of the system provided one.

COntributes to CURA-9365
@jellespijker jellespijker linked an issue Jun 25, 2022 that may be closed by this pull request
Missing sipbuild #141
Closed
@jellespijker jellespijker mentioned this pull request Jun 25, 2022
Closed
This was linked to issues Jun 25, 2022
Linking CXX shared library pyArcus.so No such file or directory #140
Closed
Failed to get Python3_SITELIB. Error: when cmake Arcus. #132
Closed
How do I get SIP on Windows? #128
Closed
@jellespijker
CPython should be compiled
dfe25ba 
shared.

Contributes to CURA-9365
@jellespijker
Use system Python for sipbuildtool on Windows
c36198c 
CPython needs to be compiled shared on Windows, but the sip wheel links against python3
Forcing the sipbuild tool to compile sip from source with: `pip install sip==6.5.1 --no-binary :all:`
doesn't work and fails: `LINK : fatal error LNK1104: cannot open file 'python3.lib'`
Due to time constrain leaving it to use the system python version. Since we're not linking against
the system library anyway and we only use it to generate the source code from the sip files

Contributes to CURA-9365
@jellespijker jellespijker marked this pull request as ready for review June 26, 2022 10:32
@jellespijker
Use lib_paths for full path
ae24a26 
Contributes to CURA-9365
@Ghostkeeper Ghostkeeper merged commit ae24a26 into 5.1 Jun 30, 2022
@jellespijker jellespijker deleted the CURA-9365_fix_building_main branch July 11, 2022 09:22
Joeydelarago
Joeydelarago reviewed Jul 12, 2022
View reviewed changes
README.md Show resolved Hide resolved
docs/development/zlib.md Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Joeydelarago Joeydelarago Joeydelarago left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@jellespijker @Joeydelarago @Ghostkeeper @casperlamboo