Fix issues with resource.dat generation on Windows. #740
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The latest version of cairosvg on pip seems to have an undocumented dependency that either cairo or GTK is installed and available on the PATH. Therefore, we roll back to the old cairosvg 1.x on all Python versions. This version of cairosvg using pycairo as a backend and works correctly, without hidden surprises.
There were two bad assumptions that could lead to failure: - Python is available on the PATH or in the CWD. Its executable is named exactly `python`. In the case of multi-install python on Linux or applications embedding Python, this may be false. - When building an external client, the program pngcrush is always available. This also makes using both pngcrush itself and its bruteforce mode optional. Bruteforce seems to yield minimal gains for a significant time penalty.
Merged
Deledrius
requested changes
Dec 17, 2020
Deledrius
approved these changes
Dec 17, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes our cairosvg dependency such that
pip install -r requirements.txtworks without undocumented dependencies. Further, some invalid assumptions have been corrected in makeres.py. Namely that: the python executable is named exactlypythonand thatpngcrushis available when building an external client. This should also fix an issue where CMake would error ifCMAKE_RUNTIME_OUTPUT_DIRECTORYis a generator expression.